diff options
Diffstat (limited to 'net-analyzer')
1648 files changed, 26257 insertions, 39188 deletions
diff --git a/net-analyzer/2ping/2ping-4.3.ebuild b/net-analyzer/2ping/2ping-4.3.ebuild deleted file mode 100644 index 98a0f53291f4..000000000000 --- a/net-analyzer/2ping/2ping-4.3.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="A bi-directional ping utility" -HOMEPAGE="https://www.finnie.org/software/2ping/" -SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" -IUSE="server" - -src_install() { - distutils-r1_src_install - doman doc/2ping.1 - dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} - use server && { - doinitd "${FILESDIR}"/2pingd - newconfd "${FILESDIR}"/2pingd.conf 2pingd - } -} diff --git a/net-analyzer/2ping/2ping-4.2.ebuild b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild index 71c1f09691ce..e26ab3b49f42 100644 --- a/net-analyzer/2ping/2ping-4.2.ebuild +++ b/net-analyzer/2ping/2ping-4.5.1-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) +inherit bash-completion-r1 distutils-r1 DESCRIPTION="A bi-directional ping utility" HOMEPAGE="https://www.finnie.org/software/2ping/" @@ -13,13 +13,20 @@ SRC_URI="https://www.finnie.org/software/2ping/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~riscv ~x86" IUSE="server" +distutils_enable_tests pytest + src_install() { distutils-r1_src_install + doman doc/2ping.1 dodoc doc/{2ping-protocol-examples.py,2ping-protocol.md} + + newbashcomp 2ping.bash_completion 2ping + dosym 2ping $(get_bashcompdir)/2ping6 + use server && { doinitd "${FILESDIR}"/2pingd newconfd "${FILESDIR}"/2pingd.conf 2pingd diff --git a/net-analyzer/2ping/Manifest b/net-analyzer/2ping/Manifest index 199e8490f77c..8bb597955867 100644 --- a/net-analyzer/2ping/Manifest +++ b/net-analyzer/2ping/Manifest @@ -1,2 +1 @@ -DIST 2ping-4.2.tar.gz 70054 BLAKE2B 01759c9f0d2eb2bf08e92155a74e11aaf7bb83adb43942be70b8e525486bba6608ad021bb149376f246bdcb066958c7d9886a1e5ea63094d715c8b25fa2b9784 SHA512 8c6e9b4cefd92929e8d5247f2c4caecdfc281548596f96fbfe52f99dc122dd1d53470c303e85bc469f0a7910937085ad36c7f928cb295c8f3fce5f3455dec3d9 -DIST 2ping-4.3.tar.gz 70386 BLAKE2B 7a73508bdf5fef0d6ef99d1d6b8bfdee65740277ef0e17913e2070503c20bd4d9598a7d7353eb68dbe5c7380e49e465ddd49adba4899f95daead36bbc8514f69 SHA512 f7186fe5bed2f12593d62f85fe364c9dc571f8b0ad10f6766515470ea8f8ed32d439e580003e78494b4742a8224e2b30cc454f8275a4877d432eb76646334e77 +DIST 2ping-4.5.1.tar.gz 77053 BLAKE2B e1255264dde4e0deb2d064e0acbaf96270e64a057334a0c0eea4e413e472cd52ffdf2181718dca4309eb8843791ef2bef866b7cf5642f9ff41e9916c3d7180e0 SHA512 13ab8c34d6b4e8d53bc0f1c33afa1c71bf61313d29350d2211a44557b244062cb090cf5d66cc6eed58f9f4c41a667bb24a8c1155243864e8343c741770b60cd6 diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml index 94525d10a811..6a2729c60132 100644 --- a/net-analyzer/2ping/metadata.xml +++ b/net-analyzer/2ping/metadata.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <longdescription> - A bi-directional ping utility - </longdescription> + <!-- maintainer-needed --> <use> <flag name="server">Install the server init scripts.</flag> </use> + <stabilize-allarches/> + <upstream> + <remote-id type="github">rfinnie/2ping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/alive/Manifest b/net-analyzer/alive/Manifest index f4bb81d3f630..bb460f83ecf4 100644 --- a/net-analyzer/alive/Manifest +++ b/net-analyzer/alive/Manifest @@ -1 +1 @@ -DIST alive-2.0.2.tar.xz 174936 BLAKE2B f3998d1cbf81d77be449cf1157bc570837b87fd15a860041273059de69536ff9cab8d00b8cb1191b2d6d692b41fb3fa5863248267a86ad542326f48c8ab43730 SHA512 7e9c88f62ab5c0248d1e42b81e2106f43fc9587543782623e8a564ab99fd1d4a55058a175dc46d25520454c07f732101c7e62248ce992d1a8a615f531b1c090e +DIST alive-2.0.5.tar.lz 186304 BLAKE2B 8528d7b86030ff0b54cd391a7cd7b42be974d5f605c66c6340468855959d2adf31940312d6693580839e9180813a3e96c2fe86a3842f3abd00af0e08b7f301ee SHA512 f760f9386019ddeac8690eec9119d557d4e288cc8698ce69adc8d9915eb0bc27fcf4015e9c4710411321d21c11731e61be754e9b827dceceab6463e531ed4240 diff --git a/net-analyzer/alive/alive-2.0.2-r1.ebuild b/net-analyzer/alive/alive-2.0.2-r1.ebuild deleted file mode 100644 index 9ee866d5fd4c..000000000000 --- a/net-analyzer/alive/alive-2.0.2-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="a periodic ping program" -HOMEPAGE="https://www.gnu.org/software/alive/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" - -COMMON_DEPEND=" - net-misc/iputils -" -DEPEND=" - app-arch/xz-utils - ${COMMON_DEPEND} -" -RDEPEND=" - dev-scheme/guile - ${COMMON_DEPEND} -" -PATCHES=( - "${FILESDIR}"/${P}-ping-test.patch -) - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/alive/alive-2.0.5-r1.ebuild b/net-analyzer/alive/alive-2.0.5-r1.ebuild new file mode 100644 index 000000000000..bfa83a170f30 --- /dev/null +++ b/net-analyzer/alive/alive-2.0.5-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools unpacker + +DESCRIPTION="Periodic ping program" +HOMEPAGE="https://www.gnu.org/software/alive/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" + +DEPEND="dev-scheme/guile" +RDEPEND="${DEPEND} + dev-scheme/xdgdirs + net-misc/iputils" +BDEPEND="$(unpacker_src_uri_depends)" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.2-ping-test.patch +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml index 74c2baebb4ec..69f19320e112 100644 --- a/net-analyzer/alive/metadata.xml +++ b/net-analyzer/alive/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="savannah">alive</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest deleted file mode 100644 index df01ea68a292..000000000000 --- a/net-analyzer/amap/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST amap-5.4.tar.gz 263331 BLAKE2B 683bcdd1ebb22dcd74c2ac20147ec5e5fe2bafb2452abda22a9a95c4d8fe1955394067b9a3765344674b48979cd56a99251d6359cd0247ac623da756a017a220 SHA512 e1a9f03940eded3eedad0028786f4ea6c18077072d52eb2f843ef0b4ff736bf1766c4bdb4eff52d3a8f6038d8f795e39be1c15bcae8283ddae8f40a7fff8647d diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild deleted file mode 100644 index 9848a4c18f2d..000000000000 --- a/net-analyzer/amap/amap-5.4-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A network scanning tool for pentesters" -HOMEPAGE="https://www.thc.org/thc-amap/" -SRC_URI="https://www.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="libressl ssl" - -DEPEND=" - dev-libs/libpcre - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -RDEPEND=" - ${DEPEND} - !sci-biology/amap -" - -src_prepare() { - rm -r pcre-3.9 || die - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die - # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die - sed -i 's:/usr/local:/usr:' amap.h || die - # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - - epatch "${FILESDIR}"/4.8-system-pcre.patch -} - -src_configure() { - # non-autotools configure script - ./configure || die - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - -e "/^CC=/d" \ - Makefile || die - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ - -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die - fi - sed -i Makefile \ - -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - dobin amap amapcrap - insinto /usr/share/amap - doins appdefs.* - - doman ${PN}.1 - dodoc README TODO CHANGES -} diff --git a/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild deleted file mode 100644 index ef97cd2aec15..000000000000 --- a/net-analyzer/amap/amap-5.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A network scanning tool for pentesters" -HOMEPAGE="https://www.thc.org/thc-amap/" -SRC_URI="https://www.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="ssl" - -DEPEND=" - dev-libs/libpcre - ssl? ( >=dev-libs/openssl-0.9.6j ) -" -RDEPEND=" - ${DEPEND} - !sci-biology/amap -" - -src_prepare() { - rm -r pcre-3.9 || die - sed -i -e "s:etc/:share/amap/:g" amap-lib.c || die - # Above change requires below change. See sources... - sed -i '/strlen(AMAP_PREFIX/s: 5 : 12 :' amap-lib.c || die - sed -i 's:/usr/local:/usr:' amap.h || die - # Files to be updated are at different location, bug 207839. - sed -i '/AMAP_RESOURCE/s:www:freeworld:' amap.h || die - - sed -i '/DATADIR/s:/etc:/share/amap:' Makefile.am || die - - epatch "${FILESDIR}"/4.8-system-pcre.patch -} - -src_configure() { - # non-autotools configure script - ./configure || die - sed -i \ - -e '/^XDEFINES=/s:=.*:=:' \ - -e '/^XLIBS=/s:=.*:=:' \ - -e '/^XLIBPATHS/s:=.*:=:' \ - -e '/^XIPATHS=/s:=.*:=:' \ - -e "/^CC=/d" \ - Makefile || die - if use ssl ; then - sed -i \ - -e '/^XDEFINES=/s:=:=-DOPENSSL:' \ - -e '/^XLIBS=/s:=:=-lcrypto -lssl:' \ - Makefile || die - fi - sed -i Makefile \ - -e '/-o amap/{s|(OPT) |(OPT) $(LDFLAGS) |g}' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) OPT="${CFLAGS}" -} - -src_install() { - dobin amap amapcrap - insinto /usr/share/amap - doins appdefs.* - - doman ${PN}.1 - dodoc README TODO CHANGES -} diff --git a/net-analyzer/amap/files/4.8-system-pcre.patch b/net-analyzer/amap/files/4.8-system-pcre.patch deleted file mode 100644 index 097bfbf45eb5..000000000000 --- a/net-analyzer/amap/files/4.8-system-pcre.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --exclude='*~' -urN amap-4.8.orig/amap-inc.h amap-4.8/amap-inc.h ---- amap-4.8.orig/amap-inc.h 2005-02-21 21:47:47.251638320 -0500 -+++ amap-4.8/amap-inc.h 2005-02-21 21:48:27.774477912 -0500 -@@ -20,7 +20,7 @@ - #include <errno.h> - #include <sys/resource.h> - #include <sys/wait.h> --#include "pcre-3.9/pcre.h" -+#include <pcre.h> - #ifdef OPENSSL - #include <openssl/ssl.h> - #include <openssl/err.h> -diff --exclude='*~' -urN amap-4.8.orig/configure amap-4.8/configure ---- amap-4.8.orig/configure 2005-02-21 21:47:47.240639992 -0500 -+++ amap-4.8/configure 2005-02-21 21:48:41.379409648 -0500 -@@ -13,10 +13,6 @@ - exit 0 - fi - --cd pcre-3.9 || exit 1 --./configure || exit 1 --cd .. -- - echo - echo - echo "Starting amap auto configuration ..." -diff --exclude='*~' -urN amap-4.8.orig/Makefile.am amap-4.8/Makefile.am ---- amap-4.8.orig/Makefile.am 2005-02-21 21:47:47.242639688 -0500 -+++ amap-4.8/Makefile.am 2005-02-21 21:49:16.070135856 -0500 -@@ -1,5 +1,5 @@ - CC=gcc --LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/ -+LIB=-lpcre - OPT=-O2 - OPT_DEBUG=-ggdb -Wall -lefence - BINDIR=/bin -@@ -7,7 +7,7 @@ - MANDIR=/man/man1 - SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc - MANPAGE=amap.1 --all: pcre strip -+all: amap amapcrap - - pcre: - cd pcre-3.9 && make diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/amap/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest deleted file mode 100644 index 7b9db686f0fe..000000000000 --- a/net-analyzer/angst/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST angst-0.4b.tar.gz 13909 BLAKE2B f08b9e489eaec5e2006ad8d84dc7586c6fb57c3d8585fb5cd769591ed56f4e5a4c2e0bdaf0ba02b40370ea99146ebfa02611d64b043949b27f6dfcbbdd2b16e5 SHA512 5584b1dd01d781cd34b594fcc8970764874599a1f15b1185066ee21c11cde23af148270c178d6a0b3436d71955aaf1cd904703f9dfb0c75d0b70c04d394fb449 diff --git a/net-analyzer/angst/angst-0.4b-r2.ebuild b/net-analyzer/angst/angst-0.4b-r2.ebuild deleted file mode 100644 index f06986f35421..000000000000 --- a/net-analyzer/angst/angst-0.4b-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="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" - -DEPEND="net-libs/libpcap - net-libs/libnet:1.0" -RDEPEND="${DEPEND}" - -src_prepare() { - cp -av Makefile.linux{,.orig} - epatch "${FILESDIR}"/${PV}-libnet-1.0.patch - sed -i Makefile.linux \ - -e 's|^CC =|CC ?=|g' \ - -e '/ -o angst /s|$(OBJS)|$(LDFLAGS) &|g' \ - || die -} - -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/angst-0.4b-r3.ebuild b/net-analyzer/angst/angst-0.4b-r3.ebuild deleted file mode 100644 index 8054d460f586..000000000000 --- a/net-analyzer/angst/angst-0.4b-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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 -) - -src_configure() { - append-cflags -fcommon - use debug && append-cppflags -DDEBUG -} - -src_compile() { - emake \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - CC="$(tc-getCC)" \ - -f Makefile.linux -} - -src_install() { - dosbin angst - doman angst.8 - dodoc README TODO ChangeLog -} diff --git a/net-analyzer/angst/files/0.4b-flags.patch b/net-analyzer/angst/files/0.4b-flags.patch deleted file mode 100644 index 1021faa5b539..000000000000 --- a/net-analyzer/angst/files/0.4b-flags.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -5,7 +5,7 @@ - # - # $Id: Makefile.linux,v 1.6 2001/02/08 13:44:12 argp Exp $ - --CC = gcc -+CC ?= gcc - INSTALL_DIR = /usr/bin/install -c -o root -g bin - INSTALL_SBIN = /usr/bin/install -c -s -o root -g bin -m 555 - INSTALL_MAN = /usr/bin/install -c -o root -g bin -m 444 -@@ -21,7 +21,7 @@ - all: angst - - angst: $(OBJS) -- $(CC) $(CFLAGS) -o angst $(DEFINE) $(OBJS) $(INCLUDE) $(LIBS) -+ $(CC) $(CFLAGS) -o angst $(DEFINE) $(LDFLAGS) $(OBJS) $(INCLUDE) $(LIBS) - - clean: - rm -f angst *.o missing/*.o *.core core diff --git a/net-analyzer/angst/files/0.4b-libnet-1.0.patch b/net-analyzer/angst/files/0.4b-libnet-1.0.patch deleted file mode 100644 index a2bcf1a18696..000000000000 --- a/net-analyzer/angst/files/0.4b-libnet-1.0.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -14,2 +14,2 @@ --LIBS = -L/usr/local/lib `libnet-config --libs` -lpcap --DEFINE = `libnet-config --defines` -DLINUX #-DDEBUG -+LIBS = -L/usr/local/lib `libnet-1.0-config --libs` -lpcap -+DEFINE = `libnet-1.0-config --defines` -DLINUX #-DDEBUG ---- a/angst.h -+++ b/angst.h -@@ -12 +12 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml deleted file mode 100644 index 8064bf27c79f..000000000000 --- a/net-analyzer/angst/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <longdescription>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription> - <upstream> - <remote-id type="sourceforge">angst</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/apinger/Manifest b/net-analyzer/apinger/Manifest index adcaf6163bc0..650ea64a3ae2 100644 --- a/net-analyzer/apinger/Manifest +++ b/net-analyzer/apinger/Manifest @@ -1 +1 @@ -DIST apinger-0.4.1.tar.gz 26328 BLAKE2B 72eb19c043642dc00e02f24bfd8f3f9f704cc8a2fb5b5937756706db561dd7dc5173706c7ede73dde778964a516b7b138fe664c243db5351ac440fc80244c843 SHA512 b8a67149f43da5b6e240dee97315c31a3e6257f1de70da81a6aa63d1e1d7d5bff0b54abe5085a57e90eb7789b7fa8b83c09a51411a6247a81b6f99de3d83120f +DIST apinger-0.6.1.tar.gz 134127 BLAKE2B 8f54d5514a5410973b5f44166741582fc16a2b0b1398eab001943e2924704ae5400e2c0ce4ca1694cadfc6fa3e47d395aa3d6affd7e4873fb172bf027c26c251 SHA512 eca6cee186d538200619188d9481154114ef9d7eae4f11f389eb61382f507d108bc64622fe99b1bae17ecc3ca7b2bc4ff4d0a3156ebf2913803e7be24b0d3f94 diff --git a/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild deleted file mode 100644 index 2d71fd4dccf5..000000000000 --- a/net-analyzer/apinger/apinger-0.4.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools - -# Switch to ^^ when we switch to EAPI=6. -#MY_PN="${PN^^}" -MY_PN="APINGER" -MY_P="${MY_PN}_${PV//./_}" - -DESCRIPTION="Alarm Pinger" -HOMEPAGE="https://github.com/Jajcus/apinger/" -SRC_URI="https://github.com/Jajcus/apinger/archive/${MY_P}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND=" - sys-devel/flex - virtual/yacc -" - -S="${WORKDIR}/${PN}-${MY_P}" - -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_prepare() { - sed -i -e 's|\\$||g' acinclude.m4 || die - eautoreconf -} - -src_compile() { - emake -C src/ cfgparser1.h - default -} - -src_install() { - default - insinto /etc - doins src/${PN}.conf -} diff --git a/net-analyzer/apinger/apinger-0.4.1-r1.ebuild b/net-analyzer/apinger/apinger-0.6.1.ebuild index 9126a208502a..98e7484f48b9 100644 --- a/net-analyzer/apinger/apinger-0.4.1-r1.ebuild +++ b/net-analyzer/apinger/apinger-0.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,22 +6,23 @@ inherit autotools DESCRIPTION="Alarm Pinger" HOMEPAGE="https://github.com/Jajcus/apinger/" -SRC_URI="https://github.com/Jajcus/apinger/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz +" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" DEPEND=" - sys-devel/flex - virtual/yacc + app-alternatives/lex + app-alternatives/yacc " DOCS=( AUTHORS ChangeLog NEWS README TODO ) PATCHES=( "${FILESDIR}"/${PN}-0.4.1-fno-common.patch "${FILESDIR}"/${PN}-0.4.1-stray-backslash.patch ) -S="${WORKDIR}/${PN}-${PN^^}_${PV//./_}" src_prepare() { default diff --git a/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch index 61db76fb9232..3c5d5158563a 100644 --- a/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch +++ b/net-analyzer/apinger/files/apinger-0.4.1-stray-backslash.patch @@ -1,4 +1,4 @@ ---- acinclude.m4 +--- a/acinclude.m4 +++ b/acinclude.m4 @@ -39,8 +39,8 @@ [$jk_inet_includes diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml index 6aec7233ff54..a74dc89a2dab 100644 --- a/net-analyzer/apinger/metadata.xml +++ b/net-analyzer/apinger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/argus-clients/Manifest b/net-analyzer/argus-clients/Manifest index e7263143904e..e8b59fc9f84c 100644 --- a/net-analyzer/argus-clients/Manifest +++ b/net-analyzer/argus-clients/Manifest @@ -1,2 +1 @@ -DIST argus-clients-3.0.8.2.tar.gz 2776072 BLAKE2B 429a12d63f38ce1c5dae343be28543f3c8b6dd746661a893a0108db100762d60dec619cdccfff525b84c0843f0bb61c7e5d96df561a369e6df0d1e6a821d938a SHA512 20aac16bd6474b8f98c8fc86b21ad0b43aca62264c6de2f7f26eea876a90f7276cdaf2241a510a19ae445f40f5d0d05ec6a5869980b6889e6eb5937dbff0f855 -DIST argus-clients-3.0.8.tar.gz 2627515 BLAKE2B e7753ce1a65f24639c0c36d694033b038abb7cf835b89a1020edf72829f9196cad2a1be5958a28a51884c169ff7b4e295381501e61cf1e1eb1ee1557fccb6d8f SHA512 79022b3c3e472ebc526b27c20c25ae97abdb9a363a91ebbe3baf405f2aba9bdd80fbc0250b444d3d7ab4488e3c1325389a4719e92d9aded7598a91c3309369c2 +DIST argus-clients-3.0.8.4.tar.gz 2773840 BLAKE2B 0b5a24bc6a5c3163a0ac19a3a354e6573491e130c4b854bc4c9b19e6dfa1d27acea8338a88e589043b839994182756b04e205d9ef6815b2f7dc347fb51405c88 SHA512 5b6a03528c31b534d56370b4b8189d223691bb0d8f465349e7850bf54b4663e9851bddb54060a8bc263be3b80f4eab829413a7ff4da312e6640e2f7191d65473 diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild deleted file mode 100644 index d87060d87bec..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -ARGUS_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - net-libs/libtirpc:= - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( dev-db/mysql-connector-c:0= ) - sasl? ( dev-libs/cyrus-sasl ) -" -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-ar.patch - "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - tc-export AR RANLIB - - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql mysql /usr) -} - -src_compile() { - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild deleted file mode 100644 index d16c7f6422a6..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses:= - sys-libs/readline:= - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild index 637ef50ad05a..e86bfbb510dd 100644 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.2-r3.ebuild +++ b/net-analyzer/argus-clients/argus-clients-3.0.8.4.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools toolchain-funcs DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" +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" +KEYWORDS="amd64 ~ppc x86" IUSE="debug ft geoip mysql sasl tcpd" -ARGUS_CDEPEND=" +RDEPEND=" net-analyzer/rrdtool[perl] net-libs/libpcap net-libs/libtirpc:= @@ -25,22 +27,21 @@ ARGUS_CDEPEND=" mysql? ( dev-db/mysql-connector-c:0= ) sasl? ( dev-libs/cyrus-sasl ) " -RDEPEND=" - ${ARGUS_CDEPEND} -" -DEPEND=" - ${ARGUS_CDEPEND} - sys-devel/bison - sys-devel/flex +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex virtual/pkgconfig " + PATCHES=( "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch "${FILESDIR}"/${PN}-3.0.8.2-ar.patch "${FILESDIR}"/${PN}-3.0.8.2-curses-readline.patch "${FILESDIR}"/${PN}-3.0.8.2-my_bool.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch + "${FILESDIR}"/${PN}-3.0.8.3-configure-clang16.patch + "${FILESDIR}"/${PN}-3.0.8.4-autoconf-2.70.patch ) src_prepare() { @@ -64,7 +65,7 @@ src_configure() { src_compile() { emake \ CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ + RANLIB="$(tc-getRANLIB)" \ CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" } diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild deleted file mode 100644 index 742c6cbebee7..000000000000 --- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -DESCRIPTION="Clients for net-analyzer/argus" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://qosient.com/argus/dev/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug ft geoip mysql sasl tcpd" - -MY_CDEPEND=" - net-analyzer/rrdtool[perl] - net-libs/libpcap - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib - ft? ( net-analyzer/flow-tools ) - geoip? ( dev-libs/geoip ) - mysql? ( virtual/mysql ) - sasl? ( dev-libs/cyrus-sasl ) -" - -RDEPEND=" - ${MY_CDEPEND} -" - -DEPEND=" - ${MY_CDEPEND} - sys-devel/bison - sys-devel/flex - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.0.4.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.7.21-curses-readline.patch - - sed -i -e 's| ar | $(AR) |g' common/Makefile.in || die - tc-export AR RANLIB - - eautoreconf -} - -src_configure() { - use debug && touch .debug - econf \ - $(use_with ft libft) \ - $(use_with geoip GeoIP /usr/) \ - $(use_with sasl) \ - $(use_with tcpd wrappers) \ - $(use_with mysql) -} - -src_compile() { - # racurses uses both libncurses and libtinfo, if present - emake \ - CCOPT="${CFLAGS} ${LDFLAGS}" \ - RANLIB=$(tc-getRANLIB) \ - CURSESLIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" -} - -src_install() { - dobin bin/ra* - dodoc ChangeLog CREDITS README CHANGES - doman man/man{1,5}/* -} diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch deleted file mode 100644 index e140fa96b2a3..000000000000 --- a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -40,6 +40,7 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - AC_PROG_YACC -+PKG_PROG_PKG_CONFIG - - AC_CHECK_PROGS(V_RANLIB, ranlib, @true) - AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) -@@ -82,6 +83,12 @@ - AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h]) - AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h]) - -+PKG_CHECK_MODULES(libtirpc, libtirpc, -+ [LIBS="${LIBS} ${libtirpc_LIBS}"], -+[AC_CHECK_HEADER([rpc/types.h],, -+ [AC_MSG_ERROR([Cannot find <rpc/types.h>])])] -+) -+ - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST - AC_C_INLINE ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -48,7 +48,7 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ -+INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@ - DEFS = @DEFS@ -DARGUS_SYSLOG - - # Standard CFLAGS diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..ac974dbdf395 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/clients/pull/7 + +From 00264608bad9655d72927f31a2b2744b5e2e2e31 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -6711,8 +6711,10 @@ else + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch new file mode 100644 index 000000000000..b6a322fb6913 --- /dev/null +++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.4-autoconf-2.70.patch @@ -0,0 +1,55 @@ +https://sources.debian.org/patches/argus-clients/1:3.0.8.2-6.1/0007-Fix-autoconf-2.70-build.patch/ +https://bugs.gentoo.org/808861 + +From: Boyuan Yang <byang@debian.org> +Date: Fri, 1 Oct 2021 16:13:38 -0400 +Subject: Fix autoconf 2.70 build + +Bug-Debian: https://bugs.debian.org/978769 +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -715,13 +715,13 @@ AC_DEFUN([AC_QOSIENT_READLINE], [ + esac + fi + +- AC_CHECK_HEADERS(readline/readline.h, +- AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , +- [ ++ AC_CHECK_HEADERS([readline/readline.h], ++ [AC_CHECK_DECLS([rl_event_hook, rl_catch_signals, rl_done, rl_set_keyboard_input_timeout, rl_replace_line, rl_delete_text, rl_resize_terminal, rl_save_prompt ], [] , [] , ++ [[ + #include <stdlib.h> + #include <stdio.h> + #include <readline/readline.h> +- ]), ac_cv_found_readline=no) ++ ]])], [ac_cv_found_readline=no]) + + if test "$ac_cv_found_readline" != no; then + $1="-lreadline" +--- a/configure.ac ++++ b/configure.ac +@@ -41,17 +41,17 @@ AC_PROG_INSTALL + AC_PROG_RANLIB + AC_PROG_YACC + +-AC_CHECK_PROGS(V_RANLIB, ranlib, @true) +-AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_) ++AC_CHECK_PROGS([V_RANLIB], [ranlib], [@true]) ++AC_QOSIENT_LEX_AND_YACC([V_LEX], [V_YACC], [argus_]) + + # Checks for libraries. +-AC_QOSIENT_READLINE(V_READLINE, V_INCLS) ++AC_QOSIENT_READLINE([V_READLINE], [V_INCLS]) + +-CMU_SASL2(V_INCLS) ++CMU_SASL2([V_INCLS]) + AC_CMU_MYSQL + +-AC_CHECK_HEADERS(zlib.h, [AC_CHECK_LIB(z, uncompress, ZLIB="-lz")]) +-AC_QOSIENT_FLOWTOOLS(V_FLOWTOOLS, V_INCLS) ++AC_CHECK_HEADERS([zlib.h], [AC_CHECK_LIB([z], [uncompress], [ZLIB="-lz"])]) ++AC_QOSIENT_FLOWTOOLS([V_FLOWTOOLS], [V_INCLS]) + + if test ! -z "$V_FLOWTOOLS"; then + AC_DEFINE([ARGUS_FLOWTOOLS], [], [Using Flow Tools library]) + diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml index f94ded5e56fe..08109ceb82f0 100644 --- a/net-analyzer/argus-clients/metadata.xml +++ b/net-analyzer/argus-clients/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use><flag name="ft">Enable support for flow packets through -<pkg>net-analyzer/flow-tools</pkg></flag></use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="ft">Enable support for flow packets through <pkg>net-analyzer/flow-tools</pkg></flag> + </use> + <upstream> + <remote-id type="github">openargus/clients</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest index 17d6ac24042c..196e3c621939 100644 --- a/net-analyzer/argus/Manifest +++ b/net-analyzer/argus/Manifest @@ -1 +1 @@ -DIST argus-3.0.8.2.tar.gz 524749 BLAKE2B 4d93fd8acd71b198da712961d75f0e813f5ed3fde841e77b8a10c3a9b89571902b7597969a4be12437c97ffc69ba5ebefaee8b684c5d2d4ce4f1309c1cfd1199 SHA512 146795880d8697e065ed23d2fbab226846d55db0b71945c5a4cab2896e48ceb6e1671ccb4e00dc3b0f984525bac4ced3773f3b9e70c3ea5f7c6972fe9bd94313 +DIST argus-3.0.8.3.tar.gz 524549 BLAKE2B f905784c12d28d4440a7a6954441ce4f0865125a87e3d740edd5785e729f8b5b45967d97aef4f72802d2166b76176e15c6f15ec99b87ae1d14849ae92c65ad76 SHA512 f66db5b3bb1305825b76a7eda413d5805d65182aabef647e27716cfd629327b3aab8c299bc8af419199ac655cef4ac3bfcb83c059080e98b042e09f79f01d82a diff --git a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild b/net-analyzer/argus/argus-3.0.8.2-r1.ebuild deleted file mode 100644 index f77fe6f2fe10..000000000000 --- a/net-analyzer/argus/argus-3.0.8.2-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils user - -DESCRIPTION="network Audit Record Generation and Utilization System" -HOMEPAGE="https://www.qosient.com/argus/" -SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug +libtirpc sasl tcpd" - -RDEPEND=" - net-libs/libnsl:= - net-libs/libpcap - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - sasl? ( dev-libs/cyrus-sasl ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) -" - -DEPEND=" - ${RDEPEND} - >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 -" - -S=${WORKDIR}/${P/_rc/.rc.} - -src_prepare() { - find . -type f -execdir chmod +w {} \; #561360 - sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ - -i argus/argus.c \ - -i support/Config/argus.conf \ - -i man/man8/argus.8 \ - -i man/man5/argus.conf.5 || die - - sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ - -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ - -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ - -i support/Config/argus.conf || die - epatch \ - "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch \ - "${FILESDIR}"/${PN}-3.0.5-Makefile.patch \ - "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch \ - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - - epatch_user - eautoreconf -} - -src_configure() { - use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) -} - -src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" -} - -src_install () { - doman man/man5/*.5 man/man8/*.8 - - dosbin bin/argus{,bug} - - dodoc ChangeLog CREDITS README - - insinto /etc/argus - doins support/Config/argus.conf - - newinitd "${FILESDIR}/argus.initd" argus - keepdir /var/lib/argus -} - -pkg_preinst() { - enewgroup argus - enewuser argus -1 -1 /var/lib/argus argus -} - -pkg_postinst() { - elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" - elog "possible that the init script will fail to work." -} diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild index 73a6fd17e88f..c366c9a7af03 100644 --- a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild +++ b/net-analyzer/argus/argus-3.0.8.3-r2.ebuild @@ -1,46 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools user +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="network Audit Record Generation and Utilization System" HOMEPAGE="https://openargus.org/" SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" +S="${WORKDIR}"/${P/_rc/.rc.} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="debug +libtirpc sasl tcpd" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="debug sasl tcpd" -RDEPEND=" +DEPEND=" net-libs/libnsl:= net-libs/libpcap + net-libs/libtirpc sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) sasl? ( dev-libs/cyrus-sasl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) " - -DEPEND=" - ${RDEPEND} +RDEPEND=" + acct-group/argus + acct-user/argus + ${DEPEND} +" +BDEPEND=" >=sys-devel/bison-1.28 - >=sys-devel/flex-2.4.6 + app-alternatives/lex " PATCHES=( "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch "${FILESDIR}"/${PN}-3.0.5-Makefile.patch "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch - "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch - "${FILESDIR}"/${PN}-3.0.8.2-fno-common.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.} - -pkg_setup() { - enewgroup argus - enewuser argus -1 -1 /var/lib/argus argus -} src_prepare() { find . -type f -execdir chmod +w {} \; #561360 @@ -60,15 +59,27 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861146 + # https://github.com/openargus/argus/issues/8 + append-flags -fno-strict-aliasing + filter-lto + use debug && touch .debug # enable debugging - econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) + + econf \ + $(use_with sasl) \ + $(use_with tcpd wrappers) } src_compile() { - emake CCOPT="${CFLAGS} ${LDFLAGS}" + emake \ + CCOPT="${CFLAGS} ${LDFLAGS}" \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" } -src_install () { +src_install() { doman man/man5/*.5 man/man8/*.8 dosbin bin/argus{,bug} @@ -82,11 +93,6 @@ src_install () { keepdir /var/lib/argus } -pkg_preinst() { - enewgroup argus - enewuser argus -1 -1 /var/lib/argus argus -} - pkg_postinst() { elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" elog "possible that the init script will fail to work." diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch deleted file mode 100644 index 66f950d0c04d..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/include/argus/bootp.h -+++ b/include/argus/bootp.h -@@ -45,6 +45,8 @@ - unsigned char bp_vend[64]; /* vendor-specific area */ - }; - -+extern struct bootp *bp; -+ - /* - * UDP port numbers, server and client. - */ ---- a/argus/ArgusUdp.c -+++ b/argus/ArgusUdp.c -@@ -40,9 +40,6 @@ - #include <argus_compat.h> - #include <ArgusModeler.h> - --#include <argus/bootp.h> --struct bootp *bp; -- - void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *); - - void ---- a/argus/ArgusUdt.c -+++ b/argus/ArgusUdt.c -@@ -40,9 +40,6 @@ - #include <argus_compat.h> - #include <ArgusModeler.h> - --#include <argus/bootp.h> --struct bootp *bp; -- - struct ArgusSystemFlow * - ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) - { ---- a/argus/ArgusModeler.c -+++ b/argus/ArgusModeler.c -@@ -43,7 +43,6 @@ - - #include <argus.h> - --#include <argus/bootp.h> - #include <signal.h> - - #include <sched.h> diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch deleted file mode 100644 index 96af0caf140e..000000000000 --- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/common/Makefile.in -+++ b/common/Makefile.in -@@ -35,12 +35,12 @@ - - CC = @CC@ - CCOPT = @V_CCOPT@ --INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include -I$(srcdir)/../argus -+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include -I$(srcdir)/../argus - DEFS = @DEFS@ - - # Standard CFLAGS - CFLAGS = $(CCOPT) $(INCLS) $(DEFS) --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ @RPC_LIBS@ - - INSTALL = @INSTALL@ - RANLIB = @V_RANLIB@ ---- a/configure.ac -+++ b/configure.ac -@@ -120,6 +120,25 @@ - AC_CHECK_FUNCS(floorf remainderf) - AC_CHECK_FUNCS(timegm) - -+AC_ARG_WITH([libtirpc], -+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]), -+ [], [ with_libtirpc=no ]) -+ -+AS_IF([test "x$with_libtirpc" != xno], -+ [PKG_CHECK_MODULES([TIRPC], -+ [libtirpc], -+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;], -+ [AC_MSG_ERROR([libtirpc requested, but library not found.])] -+ )], -+ [AC_CHECK_HEADER(rpc/rpc.h, -+ [RPC_CFLAGS=""; RPC_LIBS="";], -+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])] -+ )] -+) -+ -+AC_SUBST(RPC_CFLAGS) -+AC_SUBST(RPC_LIBS) -+ - AC_CHECK_FUNCS(xdrmem_create) - if test "$ac_cv_func_xdrmem_create" = yes ; then - AC_DEFINE([HAVE_XDR], [], [Using system XDR library]) diff --git a/net-analyzer/argus/files/argus-3.0.8.3-ar.patch b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch new file mode 100644 index 000000000000..d17a1d3ff06f --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.3-ar.patch @@ -0,0 +1,11 @@ +--- a/common/Makefile.in ++++ b/common/Makefile.in +@@ -87,7 +87,7 @@ + all: $(LIBS) + + @INSTALL_LIB@/argus_common.a: $(COMMONOBJ) +- rm -f $@; ar qc $@ $(COMMONOBJ) ++ rm -f $@; $(AR) qc $@ $(COMMONOBJ) + -$(RANLIB) $@ + + scanner.c: scanner.l diff --git a/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch new file mode 100644 index 000000000000..b9616d305e01 --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.3-as-needed.patch @@ -0,0 +1,11 @@ +--- a/argus/Makefile.in ++++ b/argus/Makefile.in +@@ -85,7 +85,7 @@ + + OBJ = $(SRC:.c=.o) + +-LIB = @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) ../lib/argus_common.a -lm ++LIB = ../lib/argus_common.a @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(XDRLIBS) $(COMPATLIB) -lm + + HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \ + ethertype.h gencode.h gnuc.h diff --git a/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch new file mode 100644 index 000000000000..2e9720c04326 --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.3-configure-clang16.patch @@ -0,0 +1,41 @@ +https://github.com/openargus/argus/pull/5 + +From dd987328bd2b99977a1a686a1a6b36d1a3155ff7 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Fri, 25 Nov 2022 19:03:24 +0100 +Subject: [PATCH] configure (AC_LBL_UNALIGNED_ACCESS): Avoid implicit function + decls + +Implicit function declarations were removed from the C language +in 1999. Include the relevant header files to ensure that the +check still works with future compilers. C99 also requires +to declare the return types of all functions. +--- a/acsite.m4 ++++ b/acsite.m4 +@@ -298,8 +298,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; +--- a/configure ++++ b/configure +@@ -5791,8 +5791,10 @@ else + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[5] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main() { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml index e7da258d5266..3d34f5bdfded 100644 --- a/net-analyzer/argus/metadata.xml +++ b/net-analyzer/argus/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription>network Audit Record Generation and Utilization System</longdescription> -<use> - <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">openargus/argus</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/arp-scan/Manifest b/net-analyzer/arp-scan/Manifest index 54ac63d77097..c8b282d0ff65 100644 --- a/net-analyzer/arp-scan/Manifest +++ b/net-analyzer/arp-scan/Manifest @@ -1,2 +1,2 @@ -DIST arp-scan-1.9.6.tar.gz 462479 BLAKE2B 21383167d83ba1cd9792f0a8d569c51ff196186fb59a2161c00d6963bcedecb706a419b08aeef2956bad72563f56a9a58b4231715b472a8ab083229b333d2e8f SHA512 c2d56ab8c6e1a046919892f6c2750593d6fbb3a539c3e1736184bd37ff7ae6033f84b62a3d2b4f56c0f2cdc1752002cb010ce77f701ee2f87b6f14b2e1753fe6 +DIST arp-scan-1.10.0.tar.gz 653900 BLAKE2B 618a8201a2c7f425dce5b4260857542956caa4beed61fde9d85cf763076c12ef24eb5a059a5d332b739f1e5b2b3d18db922e6299ff46f7e02ddfb54562b3fc3e SHA512 716c7727597bdecf9fd3f064fe1715148c246c223c2adeb01a26417865e4d82b9ca47e7fe4a555e510e0ae65f23f8310f0dbdffdb7c3fd969e3b81d0c6e4ae2a DIST arp-scan-1.9.7.tar.gz 459544 BLAKE2B bd70b2dd9e005096ce80fca07b8f2d8482b1073d25a2a9f82e8f5c1206148dbeab095046292cb46b5823aa18b56c208a5e86d0b7252d8566ddee5cd714b78cc6 SHA512 2aa808521a64cd3e2a6a270c6725f2cffa4cfce5c251e5483053c8ea9f56fb1368dd9aae2afcf8fffe1030fe2fc37723f0701c9eafa7cd1d52df459c07a80870 diff --git a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild index 96432c7a989f..5d4ae629eb22 100644 --- a/net-analyzer/arp-scan/arp-scan-1.9.6.ebuild +++ b/net-analyzer/arp-scan/arp-scan-1.10.0.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools DESCRIPTION="ARP scanning and fingerprinting tool" @@ -10,15 +11,22 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" DEPEND=" net-libs/libpcap + sys-libs/libcap " RDEPEND=" ${DEPEND} dev-lang/perl " +# Needed for _F_S patch +BDEPEND="dev-build/autoconf-archive" + +PATCHES=( + "${FILESDIR}"/${PN}-1.10.0-dont-clobber-fortify-source.patch +) src_prepare() { default diff --git a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild index 96432c7a989f..477073db97b9 100644 --- a/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild +++ b/net-analyzer/arp-scan/arp-scan-1.9.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="https://github.com/royhills/arp-scan/archive/${PV}.tar.gz -> ${P}.tar.g LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/arp-scan/arp-scan-99999.ebuild b/net-analyzer/arp-scan/arp-scan-99999.ebuild deleted file mode 100644 index c0d127582510..000000000000 --- a/net-analyzer/arp-scan/arp-scan-99999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="ARP scanning and fingerprinting tool" -HOMEPAGE="https://github.com/royhills/arp-scan" -EGIT_REPO_URI="https://github.com/royhills/arp-scan" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} - dev-lang/perl -" - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch new file mode 100644 index 000000000000..f933e965893b --- /dev/null +++ b/net-analyzer/arp-scan/files/arp-scan-1.10.0-dont-clobber-fortify-source.patch @@ -0,0 +1,25 @@ +Don't clobber toolchain defaults. + +(TODO: Fix upstream's GCC_FORTIFY_SOURCE macro or just replace it with the +autoconf-archive one (AX_ADD_FORTIFY_SOURCE)). + +https://bugs.gentoo.org/895522 +--- a/configure.ac ++++ b/configure.ac +@@ -37,7 +37,6 @@ if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" + GCC_WEXTRA + GCC_STACK_PROTECT_CC +- GCC_FORTIFY_SOURCE + GCC_FORMAT_SECURITY + dnl Uncomment the line below to compile with additional warnings enabled. + dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs" +@@ -49,6 +48,8 @@ else + fi + AC_PROG_INSTALL + ++AX_ADD_FORTIFY_SOURCE ++ + dnl Checks for libraries. + dnl Solaris 10 needs -lnsl for gethostbyname() and -lsocket for socket(). + dnl Linux, {Free,Open,Net,Dragonfly}BSD and MacOS X do not. diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml index 2c12d90c2aae..b869ec95a57a 100644 --- a/net-analyzer/arp-scan/metadata.xml +++ b/net-analyzer/arp-scan/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild index 773e349fc87b..6b9187db0bbd 100644 --- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild +++ b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils multilib +EAPI=8 + +inherit autotools DESCRIPTION="A swiss knife tool for ARP" HOMEPAGE="http://sid.rstack.org/arp-sk/" SRC_URI="http://sid.rstack.org/arp-sk/files/${P}.tgz" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~riscv x86" DEPEND=">=net-libs/libnet-1.1" RDEPEND="${DEPEND}" DOCS=( ARP AUTHORS CONTRIB ChangeLog README TODO ) +PATCHES=( + "${FILESDIR}"/${P}-libnet1_2.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-libnet1_2.patch + default sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die rm missing || die - epatch_user eautoreconf } @@ -29,5 +34,5 @@ src_install() { default # We don't need libcompat as it has a potential to clash with other packages. - rm -fr "${D}"/usr/$(get_libdir) + rm -r "${ED}"/usr/$(get_libdir) || die } diff --git a/net-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/arp-sk/metadata.xml +++ b/net-analyzer/arp-sk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest index c686cad18446..710a8d7184d9 100644 --- a/net-analyzer/arping/Manifest +++ b/net-analyzer/arping/Manifest @@ -1,3 +1,2 @@ -DIST arping-2.17.tar.gz 174346 BLAKE2B b0a095ff4e39e8f08b25a10db828e4ab9f60299043fbefc353b9df14e5bae839a93be20724ab9758b5bfc830c211e5f9bdfd606e321db508dbce9886b5903b09 SHA512 062026f522ab3d3b96c05c97aa3133995bce808a25a470207359a1236886da0300368ddac7d76568201510c0bcc2ac4ef6b34b2284c8d367c1be41972f0ee1c2 -DIST arping-2.19.tar.gz 177178 BLAKE2B ed8936b5526c02526d3cf0f208be0cbb91034fec861a26ae9f3fa7a865597ae8ba9d9b15418b07e930b7b5d1e766e4a4be4b4b61e5ba313dcca0f1e038373a00 SHA512 7ad242202432d91adc34b049c5511529789cf381ef02e803f8fc61394a5540427b719981946a36f692df9b1b3186e3f39b0f867f583aa42e237ae7f7549822a2 -DIST arping-2.20.tar.gz 48102 BLAKE2B ce08c68e5d76db89f4f9ecb31bcee3316064cfd8ffd9615964677db33f214b856300de0dd2619430ce934b19f260cd38c8fa892636787ae4de82022301274a06 SHA512 c5fac3b43a9be8c63ee7707a7df1cef2d75c6f7944cc6e580450a6558fb7e72b0d97d09b5c9b4a3aa86a59f49faba94b39bd634c93917c11ae20ac59e8635282 +DIST arping-2.22.tar.gz 50152 BLAKE2B 2215773b922219537339550e8034bb6eca82974469ebd0e399c73bd259ef4ff7a4510d9a5ff108cef3dac492477c54fc2517c2dfd4035158d0269f03c0e2a0b5 SHA512 0b36fff2c14c1ff89453ba63eea04de3343fcb19da7dbc1c8749bc926e441c54915cd628d54171d449e66e92663e31f12e057c30a80cd49c4412650e2cd00ef3 +DIST arping-2.23.tar.gz 51911 BLAKE2B 8b0d34522957a83d0a66b47576fa0ecbd1e4fc86537df6d2737510bdb1a4ea3d30feb664077790a8f70be9cf2cdcdc30a648261e9a6a30401ce85274c45ccf12 SHA512 45295fd68717379d18fcff4270c70e0d9df3cae175f0c2a9f1e8e88e3046f5109e7a95bb717be329af8d6002c9a2338efd39831a652c0b425b75058287fa35df diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild deleted file mode 100644 index 349568e67984..000000000000 --- a/net-analyzer/arping/arping-2.17.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-2.19.ebuild b/net-analyzer/arping/arping-2.19.ebuild deleted file mode 100644 index 8c07c531c864..000000000000 --- a/net-analyzer/arping/arping-2.19.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="http://www.habets.pp.se/synscan/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) diff --git a/net-analyzer/arping/arping-2.20.ebuild b/net-analyzer/arping/arping-2.20.ebuild deleted file mode 100644 index 2af28124c81d..000000000000 --- a/net-analyzer/arping/arping-2.20.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools fcaps - -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -CDEPEND=" - net-libs/libpcap - net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" -FILECAPS=( cap_net_raw /usr/sbin/arping ) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - default - eautoreconf -} diff --git a/net-analyzer/arping/arping-2.22.ebuild b/net-analyzer/arping/arping-2.22.ebuild new file mode 100644 index 000000000000..b93acc1ea777 --- /dev/null +++ b/net-analyzer/arping/arping-2.22.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fcaps + +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="GPL-2+" +SLOT="2" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + net-libs/libpcap + net-libs/libnet:1.1 + !net-misc/iputils[arping(+)] +" +DEPEND=" + ${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + ) +" + +FILECAPS=( cap_net_raw usr/sbin/arping ) + +src_prepare() { + default + eautoreconf +} diff --git a/net-analyzer/arping/arping-2.23.ebuild b/net-analyzer/arping/arping-2.23.ebuild new file mode 100644 index 000000000000..0db92a1acf65 --- /dev/null +++ b/net-analyzer/arping/arping-2.23.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools fcaps + +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ThomasHabets/arping" + inherit git-r3 +else + SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${PN}-${P}" +fi + +LICENSE="GPL-2+" +SLOT="2" +IUSE="+seccomp test" +RESTRICT="!test? ( test )" + +RDEPEND="net-libs/libpcap + net-libs/libnet:1.1 + sys-libs/libcap + seccomp? ( sys-libs/libseccomp ) + !net-misc/iputils[arping(+)]" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" + +FILECAPS=( cap_net_raw usr/sbin/arping ) + +PATCHES=( + "${FILESDIR}"/${PN}-2.23-configure.ac-seccomp-disable.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + # Controls whether seccomp is used by default + $(use_enable seccomp) + ) + + # Needed to actually make it optional and not automagic + # (and we want it optional for the non-seccomp arches, like sparc) + export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp) + export ac_cv_header_seccomp_h=$(usex seccomp) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild index 20b7fc882067..4f51c78957d6 100644 --- a/net-analyzer/arping/arping-9999.ebuild +++ b/net-analyzer/arping/arping-9999.ebuild @@ -1,33 +1,56 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools fcaps git-r3 +EAPI=8 -DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it" -HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=arping" -EGIT_REPO_URI="https://github.com/ThomasHabets/arping" +inherit autotools fcaps -LICENSE="GPL-2" +DESCRIPTION="Utility to see if a specific IP is taken and what MAC owns it" +HOMEPAGE="https://www.habets.pp.se/synscan/programs.php?prog=arping" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/ThomasHabets/arping" + inherit git-r3 +else + SRC_URI="https://github.com/ThomasHabets/${PN}/archive/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + + S="${WORKDIR}/${PN}-${P}" +fi + +LICENSE="GPL-2+" SLOT="2" -KEYWORDS="" +IUSE="+seccomp test" +RESTRICT="!test? ( test )" -CDEPEND=" - net-libs/libpcap +RDEPEND="net-libs/libpcap net-libs/libnet:1.1 -" -DEPEND=" - ${CDEPEND} - dev-libs/check -" -RDEPEND=" - ${CDEPEND} - !net-misc/iputils[arping(+)] -" - -FILECAPS=( cap_net_raw /usr/sbin/arping ) + sys-libs/libcap + seccomp? ( sys-libs/libseccomp ) + !net-misc/iputils[arping(+)]" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" + +FILECAPS=( cap_net_raw usr/sbin/arping ) src_prepare() { default + eautoreconf } + +src_configure() { + local myeconfargs=( + # Controls whether seccomp is used by default + $(use_enable seccomp) + ) + + # Needed to actually make it optional and not automagic + # (and we want it optional for the non-seccomp arches, like sparc) + export ac_cv_lib_seccomp_seccomp_init=$(usex seccomp) + export ac_cv_header_seccomp_h=$(usex seccomp) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch new file mode 100644 index 000000000000..53b59da1a961 --- /dev/null +++ b/net-analyzer/arping/files/arping-2.23-configure.ac-seccomp-disable.patch @@ -0,0 +1,31 @@ +https://github.com/ThomasHabets/arping/pull/51 + +From 47622ccc97591f55899f8fff325af241b89df09f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 16 May 2022 06:24:27 +0000 +Subject: [PATCH] configure.ac: make --disable-seccomp work + +The first branch ("[action-if-given]") is taken even if --disable-seccomp +is passed. So, in that branch, check whether the user disabled it or not. + +Without this, we'd get a failure when seccomp is detected but we want +to disable it: +``` +./configure --disable-seccomp +[...] +checking for library containing clock_gettime... none required +configure: error: --enable-seccomp given but seccomp libraries not present +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -35,7 +35,7 @@ AC_CHECK_LIB([pcap], [pcap_open_live], ,[AC_MSG_ERROR([libpcap not found])]) + AC_SEARCH_LIBS([clock_gettime], [rt]) + + AC_ARG_ENABLE([seccomp], [Enable seccomp priv drops by default (-z to turn on, -Z for off)], [ +- if test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then ++ if test x"$enableval" != x"no" && test "$ac_cv_lib_seccomp_seccomp_init" = "no"; then + AC_MSG_ERROR([--enable-seccomp given but seccomp libraries not present]) + fi + AC_DEFINE([DEFAULT_SECCOMP], [1], [Enable seccomp by default]) diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml index 74c2baebb4ec..cac7673fbbfb 100644 --- a/net-analyzer/arping/metadata.xml +++ b/net-analyzer/arping/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">ThomasHabets/arping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest index 2520f6df2d53..ca0599f89acc 100644 --- a/net-analyzer/arpoison/Manifest +++ b/net-analyzer/arpoison/Manifest @@ -1,2 +1 @@ -DIST arpoison-0.6.tar.gz 8646 BLAKE2B 7e9a7aaf9fb184ffed4e69d1d709f3ec242423dd699014e89ce7eaf99cb225299110b3a6fed4059db89c3bbd05b30262d56dec4bf60bed367f01700f40fde883 SHA512 7c14a15b9b85f777e5151fae82dfbdb44dbfc85ce8f632b7d76727bce79ed7f958f725f39348489bc4659cb5e3b7ab5370e88e33c03277e16ab2f9ff00bb4038 DIST arpoison-0.7.tar.gz 8458 BLAKE2B b0050aa6f3246fec9fb4db8bbb3f9f5f1d52b5b6c37851f0c6bec8b6c89fabd7f1811ae40a4c81af6eae16761f38fb749d0f2a58311645ef360d798b6ccbbb50 SHA512 d5af078c8e2c64eb721da75b5d6659ca017267f146d0dca7e0f1ba77bfd93a0f56363428c198e9c46537768d3568d813c150bfbc091430fc355a269f9327108f diff --git a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild deleted file mode 100644 index 628bef5fd8bf..000000000000 --- a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="A utility to poison ARP caches" -HOMEPAGE="http://arpoison.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" - -RDEPEND="net-libs/libnet:1.1" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}" - -src_prepare() { - # respect CFLAGS, LDFLAGS and compiler, bug #337896 - # fix for crosscompilation, bug #375655 - sed -i Makefile \ - -e 's|gcc \(-Wall\)|$(CC) \1 $(CFLAGS) $(LDFLAGS)|' \ - -e "s|libnet-config|${ROOT}usr/bin/libnet-config|g" \ - || die -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dosbin arpoison - doman arpoison.8 - dodoc README TODO -} diff --git a/net-analyzer/arpoison/arpoison-0.7-r1.ebuild b/net-analyzer/arpoison/arpoison-0.7-r1.ebuild new file mode 100644 index 000000000000..9cf32953387a --- /dev/null +++ b/net-analyzer/arpoison/arpoison-0.7-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs edo + +DESCRIPTION="Utility to poison ARP caches" +HOMEPAGE="https://arpoison.sourceforge.net/ http://www.arpoison.net/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ppc ~riscv x86" + +RDEPEND="net-libs/libnet:1.1" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" + +src_compile() { + edo "$(tc-getCC)" "${PN}.c" -o "${PN}" ${CFLAGS} ${LDFLAGS} $("${BROOT}/usr/bin/libnet-config" --cflags --libs) +} + +src_install() { + dosbin arpoison + doman arpoison.8 + dodoc README +} diff --git a/net-analyzer/arpoison/arpoison-0.7.ebuild b/net-analyzer/arpoison/arpoison-0.7.ebuild index 49817cdd9dc7..adb0567ef881 100644 --- a/net-analyzer/arpoison/arpoison-0.7.ebuild +++ b/net-analyzer/arpoison/arpoison-0.7.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="A utility to poison ARP caches" -HOMEPAGE="http://arpoison.sourceforge.net/ http://www.arpoison.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +DESCRIPTION="Utility to poison ARP caches" +HOMEPAGE="https://arpoison.sourceforge.net/ http://www.arpoison.net/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ppc ~riscv x86" RDEPEND=" net-libs/libnet:1.1 diff --git a/net-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml index 22b19a014fbc..31be40099802 100644 --- a/net-analyzer/arpoison/metadata.xml +++ b/net-analyzer/arpoison/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/arpon/Manifest b/net-analyzer/arpon/Manifest index 1ff3b41863a5..6b1fc7d0e9f1 100644 --- a/net-analyzer/arpon/Manifest +++ b/net-analyzer/arpon/Manifest @@ -1 +1 @@ -DIST ArpON-2.7.2.tar.gz 2780607 BLAKE2B 58d7a0db475658d90112441508d4c4d9babd601533a6ab9a22b24f07e037b6f3debcbe0f3c1f09a87b7e0cdf9217a38f52b85431db023d12b0f1ee58765e0bfb SHA512 7518f8f8920817725c9b3e0a6420190dcc101b1c0c7cd9eec50870b3f893fe2322eddc90cb71e9c3c35326b4e1730aa02797ca51775caa9401807da3978628b4 +DIST ArpON-3.0-ng.tar.gz 8795979 BLAKE2B 81b1fe9a426b5b0960911cbbac984482aeea15a957fac72a10e7dd9a45a609da90ca14163957cc008541be4cfaf426f07fa9c64ac4dff933f568b20284c5211d SHA512 e6338018d65f3f8300958e168a9eb6f6be85cba21ae0aee4b03e9838a29a06afbf2448c2f104367aa18389cc549e4489bcf8dad384ad46eadf2884a0908238af diff --git a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild b/net-analyzer/arpon/arpon-2.7.2-r1.ebuild deleted file mode 100644 index f2bc485b6fd2..000000000000 --- a/net-analyzer/arpon/arpon-2.7.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit cmake - -DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" - -MY_PN="ArpON" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://arpon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - dev-libs/libdnet - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.7.2-CFLAGS.patch - "${FILESDIR}"/${PN}-2.7.2-etc.patch -) -DOCS=( AUTHOR CHANGELOG ) -S="${WORKDIR}"/${MY_P} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} -} diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild deleted file mode 100644 index a79e9de5e0fa..000000000000 --- a/net-analyzer/arpon/arpon-2.7.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils readme.gentoo-r1 - -DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" - -MY_PN="ArpON" -MY_P="${MY_PN}-${PV}" -HOMEPAGE="http://arpon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND="dev-libs/libdnet - net-libs/libnet:1.1 - net-libs/libpcap" - -RDEPEND=${DEPEND} - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - sed -i -e "/set(CMAKE_C_FLAGS/d" CMakeLists.txt || die - - DOC_CONTENTS="${PN} now installs an init script. Please edit - the /etc/conf.d/arpon file to match your needs" - - cmake-utils_src_prepare -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - readme.gentoo_create_doc -} diff --git a/net-analyzer/arpon/arpon-3.0.ebuild b/net-analyzer/arpon/arpon-3.0.ebuild new file mode 100644 index 000000000000..d564c5e19b27 --- /dev/null +++ b/net-analyzer/arpon/arpon-3.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_PN="ArpON" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="ArpON (Arp handler inspectiON) is a portable Arp handler" +HOMEPAGE="https://arpon.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}-ng.tar.gz" +S="${WORKDIR}/${MY_P}-ng" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 x86" + +DEPEND=" + dev-libs/libdnet + net-libs/libnet:1.1 + net-libs/libpcap +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-3.0-CFLAGS.patch + "${FILESDIR}"/${PN}-3.0-gentoo.patch +) + +DOCS=( AUTHOR CHANGELOG README THANKS ) + +src_install() { + cmake_src_install + + newinitd "${FILESDIR}"/${PN}.initd-3 ${PN} + newconfd "${FILESDIR}"/${PN}.confd-3 ${PN} + + rm -r "${ED}"/var/{log,run} || die + mv "${ED}"/usr/share/doc/{${PN},${PF}} || die +} diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch deleted file mode 100644 index 525f03740dd9..000000000000 --- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -51,11 +51,9 @@ - if(cmake_build_type_tolower STREQUAL "debug") - message(STATUS "Build Type: Debug") - set(CMAKE_BUILD_TYPE "Debug") -- set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g") - else() - message(STATUS "Build Type: Release") - set(CMAKE_BUILD_TYPE "Release") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror") - endif() - - include_directories( diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch deleted file mode 100644 index 03e80f9d5955..000000000000 --- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/etc/CMakeLists.txt -+++ b/etc/CMakeLists.txt -@@ -14,7 +14,7 @@ - COMPONENT Etcfile) - else(${CMAKE_INSTALL_PREFIX} STREQUAL "/") - install(FILES ${arpon_etc_src} -- DESTINATION ${CMAKE_INSTALL_PREFIX}/etc -+ DESTINATION /etc - PERMISSIONS OWNER_READ GROUP_READ WORLD_READ - COMPONENT Etcfile) - endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") diff --git a/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch b/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch new file mode 100644 index 000000000000..7cc917b305c7 --- /dev/null +++ b/net-analyzer/arpon/files/arpon-3.0-CFLAGS.patch @@ -0,0 +1,17 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -88,12 +88,12 @@ + message(STATUS "Build type: Debug") + + set(CMAKE_BUILD_TYPE "Debug") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -Wformat=2 -Winit-self -Wreturn-type -Wswitch-default -Wswitch-enum -Wunused-parameter -Wuninitialized -Wstrict-aliasing=3 -Wstrict-overflow=5 -Wdeclaration-after-statement -Wundef -Wpointer-arith -Wunsafe-loop-optimizations -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsizeof-pointer-memaccess -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-declaration -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wvariadic-macros -Wvarargs -Wvla -Wdisabled-optimization -Woverlength-strings -O0 -g -ggdb") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wformat=2 -Winit-self -Wreturn-type -Wswitch-default -Wswitch-enum -Wunused-parameter -Wuninitialized -Wstrict-aliasing=3 -Wstrict-overflow=5 -Wdeclaration-after-statement -Wundef -Wpointer-arith -Wunsafe-loop-optimizations -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsizeof-pointer-memaccess -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-declaration -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wlong-long -Wvariadic-macros -Wvarargs -Wvla -Wdisabled-optimization -Woverlength-strings") + else(cmake_build_type_tolower STREQUAL "debug") + message(STATUS "Build type: Release") + + set(CMAKE_BUILD_TYPE "Release") +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wextra -O3 -DNDEBUG") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -DNDEBUG") + endif(cmake_build_type_tolower STREQUAL "debug") + + find_package(Headers) diff --git a/net-analyzer/arpon/files/arpon-3.0-gentoo.patch b/net-analyzer/arpon/files/arpon-3.0-gentoo.patch new file mode 100644 index 000000000000..1deda181acf0 --- /dev/null +++ b/net-analyzer/arpon/files/arpon-3.0-gentoo.patch @@ -0,0 +1,146 @@ +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -31,7 +31,7 @@ + + set(arpon_doc_src "${CMAKE_SOURCE_DIR}/doc/arpon") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + install(DIRECTORY ${arpon_doc_src} + DESTINATION /usr/share/doc + FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ +@@ -41,7 +41,7 @@ + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc + FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ + COMPONENT Doc) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + # + # EOF +--- a/log/CMakeLists.txt ++++ b/log/CMakeLists.txt +@@ -31,7 +31,7 @@ + + set(arpon_log_src "${CMAKE_SOURCE_DIR}/log/arpon.log") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + install(FILES ${arpon_log_src} + DESTINATION /var/log + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ +@@ -41,7 +41,7 @@ + DESTINATION ${CMAKE_INSTALL_PREFIX}/log + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ + COMPONENT Log) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + # + # EOF +--- a/etc/CMakeLists.txt ++++ b/etc/CMakeLists.txt +@@ -31,7 +31,7 @@ + + set(arpon_etc_src "${CMAKE_SOURCE_DIR}/etc/arpon.conf") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + install(FILES ${arpon_etc_src} + DESTINATION /etc + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +@@ -41,7 +41,7 @@ + DESTINATION ${CMAKE_INSTALL_PREFIX}/etc + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + COMPONENT Etc) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + # + # EOF +--- a/run/CMakeLists.txt ++++ b/run/CMakeLists.txt +@@ -31,7 +31,7 @@ + + set(arpon_run_src "${CMAKE_SOURCE_DIR}/run/arpon.pid") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + install(FILES ${arpon_run_src} + DESTINATION /var/run + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ +@@ -41,7 +41,7 @@ + DESTINATION ${CMAKE_INSTALL_PREFIX}/run + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + COMPONENT Run) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + # + # EOF +--- a/man8/CMakeLists.txt ++++ b/man8/CMakeLists.txt +@@ -31,7 +31,7 @@ + + set(arpon_man_src "${CMAKE_SOURCE_DIR}/man8/arpon.8") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + set(ARPON_DOC_FILE + "/usr/share/doc/arpon/index.html") + set(ARPON_ETC_FILE +@@ -49,7 +49,7 @@ + "${CMAKE_INSTALL_PREFIX}/log/arpon.log") + set(ARPON_PID_FILE + "${CMAKE_INSTALL_PREFIX}/run/arpon.pid") +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + file(READ ${arpon_man_src} FILE_CONTENT) + string(REGEX REPLACE "ARPON_DOC" "${ARPON_DOC_FILE}" +@@ -65,7 +65,7 @@ + MODIFIED_FILE_CONTENT4 "${MODIFIED_FILE_CONTENT3}") + file(WRITE ${PROJECT_BINARY_DIR}/man8/arpon.8 "${MODIFIED_FILE_CONTENT4}") + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + install(FILES + ${PROJECT_BINARY_DIR}/man8/arpon.8 DESTINATION /usr/share/man/man8 + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ +@@ -76,7 +76,7 @@ + ${CMAKE_INSTALL_PREFIX}/share/man/man8 + PERMISSIONS OWNER_READ GROUP_READ WORLD_READ + COMPONENT Man) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + # + # EOF +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -29,13 +29,13 @@ + # $ArpON: CMakeLists.txt,v 3.0-ng 01/29/2016 03:07:40 spikey Exp $ + # + +-if(${CMAKE_INSTALL_PREFIX} STREQUAL "/") +- set(ARPON_SBIN /sbin/arpon) ++if(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") ++ set(ARPON_SBIN /usr/sbin/arpon) + set(ARPON_DOC /usr/share/doc/arpon/index.html) + set(ARPON_ETC /etc/arpon.conf) + set(ARPON_LOG /var/log/arpon.log) + set(ARPON_PID /var/run/arpon.pid) +- set(install_prefix /sbin) ++ set(install_prefix /usr/sbin) + else(${CMAKE_INSTALL_PREFIX} STREQUAL "/") + set(ARPON_SBIN ${CMAKE_INSTALL_PREFIX}/sbin/arpon) + set(ARPON_DOC ${CMAKE_INSTALL_PREFIX}/share/doc/arpon/index.html) +@@ -43,7 +43,7 @@ + set(ARPON_LOG ${CMAKE_INSTALL_PREFIX}/log/arpon.log) + set(ARPON_PID ${CMAKE_INSTALL_PREFIX}/run/arpon.pid) + set(install_prefix ${CMAKE_INSTALL_PREFIX}/sbin) +-endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/") ++endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") + + configure_file( + "${PROJECT_SOURCE_DIR}/src/config.h.in" diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd deleted file mode 100644 index d1ce050fa4cb..000000000000 --- a/net-analyzer/arpon/files/arpon.confd +++ /dev/null @@ -1,5 +0,0 @@ -METHOD="--darpi" -IFACE="eth0" -LOGFILE="/var/log/arpon.log" - -ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log" diff --git a/net-analyzer/arpon/files/arpon.confd-3 b/net-analyzer/arpon/files/arpon.confd-3 new file mode 100644 index 000000000000..9508cb644ddf --- /dev/null +++ b/net-analyzer/arpon/files/arpon.confd-3 @@ -0,0 +1,4 @@ +METHOD="--darpi" +IFACE="eth0" + +ARPON_OPTS="${METHOD} --interface ${IFACE}" diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd-3 index dc69135c26e3..0fad4cebb3bf 100644 --- a/net-analyzer/arpon/files/arpon.initd +++ b/net-analyzer/arpon/files/arpon.initd-3 @@ -6,6 +6,8 @@ depend() { } start() { + checkpath -f /var/log/arpon.log + checkpath -f /var/run/arpon.pid ebegin "Starting arpon" start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \ --exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1 diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml index d587671b9bf6..e87be124548c 100644 --- a/net-analyzer/arpon/metadata.xml +++ b/net-analyzer/arpon/metadata.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">arpon</remote-id> - </upstream> +<maintainer type="project"> +<email>netmon@gentoo.org</email> +</maintainer> +<upstream> +<remote-id type="sourceforge">arpon</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild index 44c7fa89a834..6b1d50d07a27 100644 --- a/net-analyzer/arptools/arptools-1.0.2.ebuild +++ b/net-analyzer/arptools/arptools-1.0.2-r1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -DESCRIPTION="a collection of libnet and libpcap based ARP utilities" +DESCRIPTION="Collection of libnet and libpcap based ARP utilities" HOMEPAGE="https://github.com/burghardt/arptools" SRC_URI="http://www.burghardt.pl/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~riscv ~x86" DEPEND=" net-libs/libnet:1.1 diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml index ab242cac92e7..2b6b33a1fea3 100644 --- a/net-analyzer/arptools/metadata.xml +++ b/net-analyzer/arptools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> @@ -8,4 +8,7 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">burghardt/arptools</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest index b42aef07fdc9..53e3f2db8fe8 100644 --- a/net-analyzer/arpwatch/Manifest +++ b/net-analyzer/arpwatch/Manifest @@ -1,3 +1,3 @@ -DIST arpwatch-2.1a15.tar.gz 202729 BLAKE2B b583dea83c57a55b8705f0265c1324de270571468dc9f2e1d5351fd53340f7636f1d00e3de24caa9747384697721e6227e5e6de4b3827e5ac7adef4ce524fffd SHA512 f770b5b7954afe910dafb016e6e886a4e785564bcdc0ea0de9d7b1ca6a9a0b219a9d1b50b6f42a67afc2f836e782e8ff85ba5780583015d62c9694ac53f0bf90 -DIST arpwatch-patchset-0.7.tar.xz 132868 BLAKE2B 502d1493930ad905cd42bc76ec9b92a37811dce9829d69e8703d23039c5ab32a61da3cc1a399464b3edc71a2e020756ce2b9c5a069d10f809c21870add9a7f73 SHA512 2cbfa37acd29c30232da9ad0a742ddc9cd35c228fb786c6798555962841006ba0f47e31097722a3303e25f2e7c665b6e93707e49c02a8a9171b484b56a133e00 -DIST arpwatch-patchset-0.8.tar.xz 131692 BLAKE2B 8db242f7c74c8fee0700e12e8ff028fcaa336e5feb61514b44a892a132779c11d1ca3ce2fabee3cbcbbdcb0dae0ed470daa786a91619c18e24066f11da126bc4 SHA512 3e8f1c043f09fbeacadb40c1db47fb907314ed18bb3fb506c6c510977fd0e6dd9950becc830cf7c10911a7eec97e56e0af8c8c3d7df811e8ab820290973ea0b0 +DIST arpwatch-3.1.tar.gz 117196 BLAKE2B 35afd3dc563ebbc8136000d5c2d53da85b9615df5cbe8a3da5b77f20da7cbee706f6fd404c2bda6f3626aaa496d9ec9439596acbdfd559c01b8c0d01d6703e46 SHA512 2e6f6e388e1828e34626e36356a89f3bc95d268b9242955d6636ac05041bcf533e7625ed73b37b6ea5eab8cfed54b8c483547556c98664efff63c18639efa282 +DIST arpwatch-3.5.tar.gz 117594 BLAKE2B 73b979ec279e5bf5baaeac05949e1bddf08cd9c3c7afcd29b37991ba55ba2bb8968b57b407eb571ec52871017372f479e586ba84b0f1aee67331ce7617309fb8 SHA512 e46b350c483f0e7c873eb177be337f238b2db3d859d8b305df5a74d9d97ca449750f9ed50a99c5d4c51618e22747731d70ceb3f13aae39c39d258b960258fb88 +DIST ethercodes.dat-20200628.xz 239028 BLAKE2B e702b9109ef3ccce73e2637f96126bf19e7dfa533774c0bd623042b3609f147981263b84397ec155a65ae12fa57247c32644e1e7e57c2c749ef768156d853027 SHA512 2edc05d384f387e6b43d07da99038625f9c55c8044b5a48d1bcf9f657df691bf413a97fb9ca915f04dbdafab23f919edd15d906c4ce8bff12be0b255a6717f07 diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild deleted file mode 100644 index fa78f4e10fa9..000000000000 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r11.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user versionator - -PATCH_VER="0.8" -MY_P="${PN}-$(replace_version_separator 2 'a')" - -DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" -HOMEPAGE="https://ee.lbl.gov/" -SRC_URI=" - ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz - https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="selinux" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:* -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-arpwatch ) -" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - # We need to create /var/lib/arpwatch with this group, so it must - # exist during src_install. - enewgroup arpwatch -} - -pkg_postinst() { - # The user, however, is not needed until runtime. - enewuser arpwatch -1 -1 -1 arpwatch -} - -src_prepare() { - local patchdir="${WORKDIR}/arpwatch-patchset" - - eapply "${patchdir}"/*.patch - eapply_user - - cp "${patchdir}"/*.8 ./ || die "failed to copy man pages from ${patchdir}" -} - -src_install () { - dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh - doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 - - insinto /usr/share/arpwatch - doins ethercodes.dat - - insinto /usr/share/arpwatch/awk - doins duplicates.awk euppertolower.awk p.awk e.awk d.awk - - diropts --group=arpwatch --mode=770 - keepdir /var/lib/arpwatch - dodoc README CHANGES - - newinitd "${FILESDIR}"/arpwatch.initd-r1 arpwatch - newconfd "${FILESDIR}"/arpwatch.confd-r1 arpwatch -} - -pkg_postinst() { - # Previous revisions installed /var/lib/arpwatch with the wrong - # ownership. Instead of the intended arpwatch:root, it was left as - # root:root. If we find any such mis-owned directories, we fix them, - # and then set the permission bits how we want them in *this* - # revision. - # - # The "--from" flag ensures that we only fix directories that need - # fixing, and the "&& chmod" ensures that we only adjust the - # permissions if the owner also needed fixing. - chown --from=root:root \ - --no-dereference \ - :arpwatch \ - "${ROOT}"/var/lib/arpwatch && \ - chmod 770 "${ROOT}"/var/lib/arpwatch -} diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild deleted file mode 100644 index e8a073a8aae2..000000000000 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils user versionator - -PATCH_VER="0.7" - -MY_P="${PN}-$(replace_version_separator 2 'a')" -DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings" -HOMEPAGE="https://ee.lbl.gov/" -SRC_URI=" - ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz - https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="amd64 hppa ppc sparc x86" -IUSE="selinux" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:* -" - -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-arpwatch ) -" - -S=${WORKDIR}/${MY_P} - -pkg_preinst() { - enewuser arpwatch -} - -src_prepare() { - EPATCH_SOURCE="${WORKDIR}"/arpwatch-patchset/ EPATCH_SUFFIX="patch" epatch - cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die -} - -src_install () { - dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh - doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 - - insinto /usr/share/arpwatch - doins ethercodes.dat - - insinto /usr/share/arpwatch/awk - doins duplicates.awk euppertolower.awk p.awk e.awk d.awk - - keepdir /var/lib/arpwatch - dodoc README CHANGES - - newinitd "${FILESDIR}"/arpwatch.initd arpwatch - newconfd "${FILESDIR}"/arpwatch.confd arpwatch -} - -pkg_postinst() { - fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch -} diff --git a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild deleted file mode 100644 index c592f5b50ab4..000000000000 --- a/net-analyzer/arpwatch/arpwatch-2.1.15-r9.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user versionator - -PATCH_VER="0.8" -MY_P="${PN}-$(replace_version_separator 2 'a')" - -DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" -HOMEPAGE="https://ee.lbl.gov/" -SRC_URI=" - ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz - https://dev.gentoo.org/~jer/arpwatch-patchset-${PATCH_VER}.tar.xz -" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="selinux" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:* -" -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-arpwatch ) -" - -S=${WORKDIR}/${MY_P} - -pkg_preinst() { - enewuser arpwatch -} - -src_prepare() { - eapply "${WORKDIR}"/arpwatch-patchset/*.patch - eapply_user - - cp "${WORKDIR}"/arpwatch-patchset/*.8 . || die -} - -src_install () { - dosbin arpwatch arpsnmp arp2ethers massagevendor arpfetch bihourly.sh - doman arpwatch.8 arpsnmp.8 arp2ethers.8 massagevendor.8 arpfetch.8 bihourly.8 - - insinto /usr/share/arpwatch - doins ethercodes.dat - - insinto /usr/share/arpwatch/awk - doins duplicates.awk euppertolower.awk p.awk e.awk d.awk - - keepdir /var/lib/arpwatch - dodoc README CHANGES - - newinitd "${FILESDIR}"/arpwatch.initd arpwatch - newconfd "${FILESDIR}"/arpwatch.confd arpwatch -} - -pkg_postinst() { - fowners arpwatch:0 "${ROOT}"/var/lib/arpwatch -} diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild new file mode 100644 index 000000000000..880939a9d30f --- /dev/null +++ b/net-analyzer/arpwatch/arpwatch-3.1-r4.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" +HOMEPAGE="https://ee.lbl.gov/" +LICENSE="BSD GPL-2" +SLOT="0" + +ETHERCODES_DATE=20200628 +SRC_URI=" + https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz +" + +KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86" +IUSE="selinux" + +DEPEND=" + acct-group/arpwatch + net-libs/libpcap + sys-libs/ncurses:= +" + +RDEPEND=" + ${DEPEND} + acct-user/arpwatch + selinux? ( sec-policy/selinux-arpwatch ) + virtual/mta +" + +src_install() { + dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh + doman arpsnmp.8 arpwatch.8 + + insinto /usr/share/arpwatch + newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat + + insinto /usr/share/arpwatch/awk + doins d.awk duplicates.awk e.awk euppertolower.awk p.awk + + diropts --group=arpwatch --mode=770 + keepdir /var/lib/arpwatch + dodoc README CHANGES + + newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch + newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch + + systemd_dounit "${FILESDIR}/arpwatch.service" + systemd_install_serviced "${FILESDIR}/arpwatch.conf" +} + +pkg_postinst() { + # Previous revisions installed /var/lib/arpwatch with the wrong + # ownership. Instead of the intended arpwatch:root, it was left as + # root:root. If we find any such mis-owned directories, we fix them, + # and then set the permission bits how we want them in *this* + # revision. + # + # The "--from" flag ensures that we only fix directories that need + # fixing, and the "&& chmod" ensures that we only adjust the + # permissions if the owner also needed fixing. + chown \ + --from=root:root \ + --no-dereference \ + :arpwatch \ + "${ROOT}"/var/lib/arpwatch && \ + chmod 770 "${ROOT}"/var/lib/arpwatch +} diff --git a/net-analyzer/arpwatch/arpwatch-3.5.ebuild b/net-analyzer/arpwatch/arpwatch-3.5.ebuild new file mode 100644 index 000000000000..8356cbac4ff1 --- /dev/null +++ b/net-analyzer/arpwatch/arpwatch-3.5.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd + +ETHERCODES_DATE=20200628 +DESCRIPTION="An ethernet monitor program that keeps track of ethernet/IP address pairings" +HOMEPAGE="https://ee.lbl.gov/" +SRC_URI=" + https://ee.lbl.gov/downloads/${PN}/${P}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/ethercodes.dat-${ETHERCODES_DATE}.xz +" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc ~riscv sparc x86" +IUSE="selinux" + +DEPEND=" + acct-group/arpwatch + net-libs/libpcap + sys-libs/ncurses:= +" +RDEPEND=" + ${DEPEND} + acct-user/arpwatch + virtual/mta + selinux? ( sec-policy/selinux-arpwatch ) +" + +PATCHES=( + # sent upstream on 2023-12-05 + "${FILESDIR}"/0001-Fix-configure-check-for-time.h.patch + "${FILESDIR}"/0002-Avoid-using-undocumented-internals-for-DNS.patch +) + +src_prepare() { + default + + # Temporary for 0001-Fix-configure-check-for-time.h.patch + eautoreconf +} + +src_install() { + dosbin arp2ethers arpfetch arpsnmp arpwatch bihourly.sh massagevendor.py update-ethercodes.sh + doman arpsnmp.8 arpwatch.8 + + insinto /usr/share/arpwatch + newins "${WORKDIR}"/ethercodes.dat-${ETHERCODES_DATE} ethercodes.dat + + insinto /usr/share/arpwatch/awk + doins d.awk duplicates.awk e.awk euppertolower.awk p.awk + + diropts --group=arpwatch --mode=770 + keepdir /var/lib/arpwatch + dodoc README CHANGES + + newconfd "${FILESDIR}"/arpwatch.confd-r2 arpwatch + newinitd "${FILESDIR}"/arpwatch.initd-r2 arpwatch + + systemd_dounit "${FILESDIR}/arpwatch.service" + systemd_install_serviced "${FILESDIR}/arpwatch.conf" +} + +pkg_postinst() { + # Previous revisions installed /var/lib/arpwatch with the wrong + # ownership. Instead of the intended arpwatch:root, it was left as + # root:root. If we find any such mis-owned directories, we fix them, + # and then set the permission bits how we want them in *this* + # revision. + # + # The "--from" flag ensures that we only fix directories that need + # fixing, and the "&& chmod" ensures that we only adjust the + # permissions if the owner also needed fixing. + chown \ + --from=root:root \ + --no-dereference \ + :arpwatch \ + "${ROOT}"/var/lib/arpwatch && \ + chmod 770 "${ROOT}"/var/lib/arpwatch +} diff --git a/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch b/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch new file mode 100644 index 000000000000..4c6b1466a452 --- /dev/null +++ b/net-analyzer/arpwatch/files/0001-Fix-configure-check-for-time.h.patch @@ -0,0 +1,36 @@ +sent upstream on 2023-12-05 + +From ea63ce2240a9be492086a56921c644533c740924 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 5 Dec 2023 08:39:39 +0000 +Subject: [PATCH 1/2] Fix configure check for time.h + +Otherwise, we get an implicit function declaration warning/error (with Clang 16, +GCC 14) for localtime. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.in ++++ b/configure.in +@@ -21,7 +21,7 @@ fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_PROG_INSTALL + +-AC_CHECK_HEADERS(fcntl.h memory.h) ++AC_CHECK_HEADERS(fcntl.h memory.h time.h) + + dnl + dnl Install rc.d script on FreeBSD +--- a/report.c ++++ b/report.c +@@ -59,7 +59,7 @@ struct rtentry; + #include <stdlib.h> + #include <string.h> + #include <syslog.h> +-#ifdef TIME_WITH_SYS_TIME ++#ifdef HAVE_TIME_H + #include <time.h> + #endif + #include <unistd.h> +-- +2.43.0 + diff --git a/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch b/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch new file mode 100644 index 000000000000..127c46c67abf --- /dev/null +++ b/net-analyzer/arpwatch/files/0002-Avoid-using-undocumented-internals-for-DNS.patch @@ -0,0 +1,35 @@ +sent upstream on 2023-12-05 + +From 957425ec7ca2714a4c31431f4746da7644a7f4e9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 5 Dec 2023 08:40:31 +0000 +Subject: [PATCH 2/2] Avoid using undocumented internals for DNS + +_getshort is a reserved internal function and is deprecated per +glibc's resolv.h at least. + +Use ns_get32 instead as recommended by the deprecation warning. + +This also fixes an implicit function declaration warning/error with +Clang 16 / GCC 14. + +Bug: https://bugs.gentoo.org/829633 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/dns.c ++++ b/dns.c +@@ -115,10 +115,10 @@ gethinfo(char *hostname, char *cpu, int cpulen, char *os, int oslen) + (u_char *)cp, (char *)bp, buflen)) < 0) + break; + cp += n; +- type = _getshort(cp); ++ type = ns_get32(cp); + cp += sizeof(u_short); /* class */ + cp += sizeof(u_short) + sizeof(u_int32_t); +- n = _getshort(cp); ++ n = ns_get32(cp); + cp += sizeof(u_short); + if (type == T_HINFO) { + /* Unpack */ +-- +2.43.0 + diff --git a/net-analyzer/arpwatch/files/arpwatch.conf b/net-analyzer/arpwatch/files/arpwatch.conf new file mode 100644 index 000000000000..070f0edad80b --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.conf @@ -0,0 +1,16 @@ +# Config file for /etc/systemd/system/arpwatch +# see arpwatch.8 for more information + +IFACES=-i eno1 + +# Location of the PID file +PIDFILE=-P /run/arpwatch.pid + +# Additional options to pass to arpwatch. +OPTIONS=-N -p -Q -D + +# Where to store the data (default is /usr/share/arpwatch) +DATA=-f /var/log/arpwatch/eno1.dat + +# Comment this line if you wish arpwatch to run as root user (not recommended) +RUNUSER=-u arpwatch diff --git a/net-analyzer/arpwatch/files/arpwatch.confd b/net-analyzer/arpwatch/files/arpwatch.confd deleted file mode 100644 index 98abe0417740..000000000000 --- a/net-analyzer/arpwatch/files/arpwatch.confd +++ /dev/null @@ -1,11 +0,0 @@ -# Config file for /etc/init.d/arpwatch -# see arpwatch.8 for more information - -#IFACES="eth0 eth1" -IFACES="eth0" - -# Additional options to pass to arpwatch. -OPTIONS="-N -p" - -# Comment this line if you wish arpwatch to run as root user (not recommended) -ARPUSER="arpwatch" diff --git a/net-analyzer/arpwatch/files/arpwatch.confd-r1 b/net-analyzer/arpwatch/files/arpwatch.confd-r2 index a4da503406a2..2937349cdc83 100644 --- a/net-analyzer/arpwatch/files/arpwatch.confd-r1 +++ b/net-analyzer/arpwatch/files/arpwatch.confd-r2 @@ -14,4 +14,5 @@ ARPWATCH_IFACE="lo" # Additional options to pass to arpwatch. +# See arpwatch(8) ARPWATCH_OPTS="-N -p" diff --git a/net-analyzer/arpwatch/files/arpwatch.initd b/net-analyzer/arpwatch/files/arpwatch.initd deleted file mode 100644 index 5569dcee2527..000000000000 --- a/net-analyzer/arpwatch/files/arpwatch.initd +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - for IFACE in ${IFACES} - do - ebegin "Starting arpwatch on ${IFACE}" - DATAFILE=/var/lib/arpwatch/${IFACE}.dat - [ ! -f ${DATAFILE} ] && touch ${DATAFILE} - - if [ -z ${ARPUSER} ]; then - start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ - /usr/sbin/arpwatch -- -i ${IFACE} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS} - else - chown ${ARPUSER} ${DATAFILE} - start-stop-daemon --start --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ - /usr/sbin/arpwatch -- -i $IFACE -u ${ARPUSER} -f ${DATAFILE} -P /var/run/arpwatch.${IFACE}.pid ${OPTIONS} - fi - eend $? - done -} - -stop() { - for IFACE in ${IFACES} - do - ebegin "Stopping arpwatch on ${IFACE}" - start-stop-daemon --stop --quiet --pidfile=/var/run/arpwatch.${IFACE}.pid --exec \ - /usr/sbin/arpwatch - eend $? - done -} diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r1 b/net-analyzer/arpwatch/files/arpwatch.initd-r1 deleted file mode 100644 index ffe165205c6a..000000000000 --- a/net-analyzer/arpwatch/files/arpwatch.initd-r1 +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# Default to "lo" for the interface, so that the init script will work -# out-of-the-box. -: ${ARPWATCH_IFACE:=lo} - -ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat" - -command="/usr/sbin/arpwatch" -pidfile="/run/${RC_SVCNAME}.pid" -command_args="-i ${ARPWATCH_IFACE} - -u arpwatch - -f ${ARPWATCH_DATAFILE} - -P ${pidfile} - ${ARPWATCH_OPTS}" - -depend() { - need "net.${ARPWATCH_IFACE}" -} - -start_pre() { - # The "arpwatch" user must be a member of the "arpwatch" group for - # this to work. - checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}" -} diff --git a/net-analyzer/arpwatch/files/arpwatch.initd-r2 b/net-analyzer/arpwatch/files/arpwatch.initd-r2 new file mode 100644 index 000000000000..93438209e1f1 --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.initd-r2 @@ -0,0 +1,33 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default to "lo" for the interface, so that the init script will work +# out-of-the-box. +: ${ARPWATCH_IFACE:=lo} + +ARPWATCH_DATAFILE="/var/lib/arpwatch/${RC_SVCNAME}.dat" + +command="/usr/sbin/arpwatch" +pidfile="/run/${RC_SVCNAME}.pid" +command_args=" + -i ${ARPWATCH_IFACE} + -f ${ARPWATCH_DATAFILE} + -P ${pidfile} + ${ARPWATCH_OPTS} +" + +depend() { + if [ -f "/proc/net/vlan/${ARPWATCH_IFACE}" ]; then + _if=$(grep -i "device" /proc/net/vlan/${ARPWATCH_IFACE} |awk '{print $2;}') + else + _if=${ARPWATCH_IFACE} + fi + need "net.${_if}" +} + +start_pre() { + # The "arpwatch" user must be a member of the "arpwatch" group for + # this to work. + checkpath --file --owner root:arpwatch --mode 0660 "${ARPWATCH_DATAFILE}" +} diff --git a/net-analyzer/arpwatch/files/arpwatch.service b/net-analyzer/arpwatch/files/arpwatch.service new file mode 100644 index 000000000000..943e3146f8df --- /dev/null +++ b/net-analyzer/arpwatch/files/arpwatch.service @@ -0,0 +1,16 @@ +[Unit] +Description=Ethernet monitoring program that tracks net/IP pairings +Documentation=man:arpwatch(8) +Conflicts= +After=systemd-networkd.service + +PIDFILE=/run/arpwatch.pid + +[Service] +Type=forking +ExecStartPre=/bin/rm -f /run/arpwatch.pid +ExecStart=/usr/sbin/arpwatch $IFACES $PIDFILE $RUNUSER $OPTIONS $DATA +Restart=on-abort + +[Install] +Alias=arpwatchd.service diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml index 45a63182fe02..916a2ab22333 100644 --- a/net-analyzer/arpwatch/metadata.xml +++ b/net-analyzer/arpwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild b/net-analyzer/authforce/authforce-0.9.9-r2.ebuild deleted file mode 100644 index 09d3520a5b40..000000000000 --- a/net-analyzer/authforce/authforce-0.9.9-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="An HTTP authentication brute forcer" -HOMEPAGE="http://www.divineinvasion.net/authforce/" -SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="curl nls" - -RDEPEND="sys-libs/readline:0= - curl? ( net-misc/curl )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -DOCS=( AUTHORS BUGS NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}"/${P}-curl.patch - "${FILESDIR}"/${P}-locale.patch -) - -src_prepare() { - default - gunzip doc/${PN}.1.gz - sed -i -e "s/${PN}.1.gz/${PN}.1/g" \ - -e "s/\/mang/\/man1/g" doc/Makefile* || die -} - -src_configure() { - econf \ - $(use_with curl) \ - $(use_enable nls) \ - --with-path=/usr/share/${PN}/data:. -} - -src_install() { - default - doman doc/${PN}.1 -} diff --git a/net-analyzer/authforce/authforce-0.9.9-r3.ebuild b/net-analyzer/authforce/authforce-0.9.9-r4.ebuild index 183912b43cae..1c3be5b08d76 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-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,10 +9,10 @@ SRC_URI="http://www.divineinvasion.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +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 000000000000..fec77215435c --- /dev/null +++ b/net-analyzer/authforce/files/authforce-0.9.9-Include-stdlib.h-for-free.patch @@ -0,0 +1,16 @@ +From e5e62f92c53f5f8cca9380ad3225c84be5eec04f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 19 Oct 2022 03:33:51 +0100 +Subject: [PATCH] Include <stdlib.h> for free() + +Bug: https://bugs.gentoo.org/871222 +--- a/src/debug.c ++++ b/src/debug.c +@@ -3,6 +3,7 @@ + #include <config.h> + #include <stdio.h> + #include <stdarg.h> ++#include <stdlib.h> + #ifdef MEMWATCH + #include "memwatch.h" + #endif /* MEMWATCH*/ diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml index 2d4f0f870b48..115e9d64a669 100644 --- a/net-analyzer/authforce/metadata.xml +++ b/net-analyzer/authforce/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>m.mairkeimberger@gmail.com</email> - <name>Michael Mair-Keimberger</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest index c81bf30f726e..a539a07a4360 100644 --- a/net-analyzer/barnyard/Manifest +++ b/net-analyzer/barnyard/Manifest @@ -1,2 +1,2 @@ -DIST barnyard-0.2.0-patches.tar.bz2 12911 BLAKE2B 06215ec8cc8c2fb7ff8e57cfd2f02456180263778722001442faf8f32445fc7fa7fc0da5d00644dbf239949d5e02dd76025428c14c6c1bae8b6565ddf6edf08a SHA512 e8e5243d49b71dd76e3274e27116f99ea6c674983cb18499889c9d27a83740a6b17aa6d30c8a9acdb46103da8314679f4eba8bf1cd252d7fb6b8a34afac46b21 +DIST barnyard-0.2.0-patches.tar.xz 13152 BLAKE2B d68aa5298938e50bb1102628cd8ebc0fae55c12fd4094e86306a86aeab3786a096906e4b0612b3dbb0a2de6a8aeba8161fdcfccf3a6915f5492401892eaa8b57 SHA512 9ff4f45e12d12a6b33f22f32be5f258cc9352a53c91d4415c292231ee5e5b03d58ed988011df5d3f13ac0046dd02ff36e0f92b4b0044181f695856118bb9228a DIST barnyard-0.2.0.tar.gz 161543 BLAKE2B 07f5fa6b2e01e1b421ea772b8ea0c72b6c8f66569caf176a57d3f4fce438c2dd4b2a8a61dddc4faf27c85b15d002205f1cc3627fe88d523fd25d716cc78747e7 SHA512 73424acf2e0c620b2f8f2f407d74812f7740234ce523e37557273998108c131311fffb16cfc2cea0f652d6b21072431081bad35b045f5654e2245786d27568e6 diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild index 5d369ae6705d..c937739a33da 100644 --- a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild +++ b/net-analyzer/barnyard/barnyard-0.2.0-r7.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools +inherit autotools toolchain-funcs DESCRIPTION="Fast output system for Snort" HOMEPAGE="https://sourceforge.net/projects/barnyard" SRC_URI=" - mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz - mirror://gentoo/${P}-patches.tar.bz2" + https://downloads.sourceforge.net/barnyard/barnyard-${PV/_/-}.tar.gz + https://dev.gentoo.org/~jsmolic/distfiles/${P}-patches.tar.xz +" SLOT="0" -LICENSE="QPL GPL-2" +LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script KEYWORDS="~amd64 -sparc ~x86" IUSE="mysql postgres sguil" @@ -20,41 +21,44 @@ DEPEND=" net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] ) - sguil? ( dev-lang/tcl:0 )" -RDEPEND="${DEPEND} - net-analyzer/snort" + sguil? ( dev-lang/tcl:0 ) +" +RDEPEND=" + ${DEPEND} + net-analyzer/snort +" -S="${WORKDIR}/${P/_/-}" +S=${WORKDIR}/${P/_/-} DOCS="AUTHORS README docs/*" +PATCHES=( + "${WORKDIR}"/${P}-64bit.patch + "${WORKDIR}"/${P}-canonical-ar.patch + "${WORKDIR}"/${P}-configure-in.patch +) +SGUIL_PATCHES=( + "${WORKDIR}"/${P}-op_plugbase.c.patch + "${WORKDIR}"/${P}-sguil_files.patch +) src_prepare() { + use sguil && PATCHES+=( "${SGUIL_PATCHES[@]}" ) default - eapply "${FILESDIR}/barnyard.64bit.diff" - if use sguil ; then - eapply "${WORKDIR}/${PV}-sguil_files.patch" - eapply "${WORKDIR}/${PV}-configure-in.patch" - cd "${S}/src/output-plugins" || die - eapply "${WORKDIR}/${PV}-op_plugbase.c.patch" - cd "${S}" || die - fi + eautoreconf } src_configure() { - local myconf - if use sguil ; then - myconf="--enable-tcl" - fi + tc-export AR econf \ - ${myconf} \ - --sysconfdir=/etc/snort \ + $(use_enable mysql) \ $(use_enable postgres) \ - $(use_enable mysql) + $(use_enable sguil tcl) \ + --sysconfdir=/etc/snort } -src_install () { +src_install() { default keepdir /var/log/snort diff --git a/net-analyzer/barnyard/files/barnyard.64bit.diff b/net-analyzer/barnyard/files/barnyard.64bit.diff deleted file mode 100644 index f338d291ff1c..000000000000 --- a/net-analyzer/barnyard/files/barnyard.64bit.diff +++ /dev/null @@ -1,81 +0,0 @@ -diff -ur barnyard-0.2.0/src/barnyard.h barnyard-0.2.0.64bit/src/barnyard.h ---- barnyard-0.2.0/src/barnyard.h 2004-05-01 12:43:29.000000000 -0400 -+++ barnyard-0.2.0.64bit/src/barnyard.h 2007-08-11 23:22:53.000000000 -0400 -@@ -34,7 +34,8 @@ - - typedef struct _SnortPktHeader - { -- struct timeval ts; /* packet timestamp */ -+ // struct timeval ts; /* packet timestamp */ -+ struct pcap_timeval ts; /* packet timestamp */ - u_int32_t caplen; /* packet capture length */ - u_int32_t pktlen; /* packet "real" length */ - } SnortPktHeader; -Only in barnyard-0.2.0.64bit/src: barnyard.h~ -diff -ur barnyard-0.2.0/src/event.h barnyard-0.2.0.64bit/src/event.h ---- barnyard-0.2.0/src/event.h 2003-05-02 22:44:12.000000000 -0400 -+++ barnyard-0.2.0.64bit/src/event.h 2007-08-12 00:13:44.000000000 -0400 -@@ -19,6 +19,11 @@ - #include <sys/types.h> - #include <sys/time.h> - -+struct pcap_timeval { -+ u_int32_t tv_sec; /* seconds */ -+ u_int32_t tv_usec; /* microseconds */ -+}; -+ - typedef struct _Event - { - u_int32_t sig_generator; /* which part of snort generated the alert? */ -@@ -30,6 +35,7 @@ - u_int32_t event_reference; /* reference to other events that have gone off, - * such as in the case of tagged packets... - */ -- struct timeval ref_time; /* reference time for the event reference */ -+ // struct timeval ref_time; /* reference time for the event reference */ -+ struct pcap_timeval ref_time; /* reference time for the event reference */ - } Event; - #endif /* __EVENT_H__ */ -Only in barnyard-0.2.0.64bit/src: event.h~ -diff -ur barnyard-0.2.0/src/input-plugins/dp_alert.h barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h ---- barnyard-0.2.0/src/input-plugins/dp_alert.h 2004-02-19 20:59:48.000000000 -0500 -+++ barnyard-0.2.0.64bit/src/input-plugins/dp_alert.h 2007-08-11 23:24:25.000000000 -0400 -@@ -34,7 +34,8 @@ - typedef struct _UnifiedAlertRecord - { - Event event; -- struct timeval ts; /* event timestamp */ -+ // struct timeval ts; /* event timestamp */ -+ struct pcap_timeval ts; /* event timestamp */ - u_int32_t sip; /* src ip */ - u_int32_t dip; /* dest ip */ - u_int16_t sp; /* src port */ -Only in barnyard-0.2.0.64bit/src/input-plugins: dp_alert.h~ -diff -ur barnyard-0.2.0/src/util.c barnyard-0.2.0.64bit/src/util.c ---- barnyard-0.2.0/src/util.c 2004-03-06 17:30:15.000000000 -0500 -+++ barnyard-0.2.0.64bit/src/util.c 2007-08-12 00:14:52.000000000 -0400 -@@ -514,7 +514,8 @@ - - static char tmpbuf[256]; - --int RenderTimeval(struct timeval *tv, char *timebuf, size_t len) -+// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len) -+int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len) - { - struct tm *lt; - time_t timet; -Only in barnyard-0.2.0.64bit/src: util.c~ -diff -ur barnyard-0.2.0/src/util.h barnyard-0.2.0.64bit/src/util.h ---- barnyard-0.2.0/src/util.h 2004-03-06 19:23:50.000000000 -0500 -+++ barnyard-0.2.0.64bit/src/util.h 2007-08-11 23:23:46.000000000 -0400 -@@ -39,7 +39,8 @@ - void ClearDumpBuf(); - void GoDaemon(); - size_t RenderTimestamp(time_t timet, char *timebuf, size_t len); --int RenderTimeval(struct timeval *tv, char *timebuf, size_t len); -+// int RenderTimeval(struct timeval *tv, char *timebuf, size_t len); -+int RenderTimeval(struct pcap_timeval *tv, char *timebuf, size_t len); - int CreatePidFile(char *filename); - int String2Long(char *string, long *result); - int String2ULong(char *string, unsigned long *result); -Only in barnyard-0.2.0.64bit/src: util.h~ diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml index f2d12be5195d..51903ed00c3f 100644 --- a/net-analyzer/barnyard/metadata.xml +++ b/net-analyzer/barnyard/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>Fast output system for Snort</longdescription> <use> <flag name="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag> diff --git a/net-analyzer/barnyard2/Manifest b/net-analyzer/barnyard2/Manifest index 32132ade52b6..f01457705401 100644 --- a/net-analyzer/barnyard2/Manifest +++ b/net-analyzer/barnyard2/Manifest @@ -1,2 +1 @@ DIST barnyard2-1.13-github.tar.gz 435017 BLAKE2B 2bfd6b038f4691cd9b40128c48db89cdb0cdefd9c779cbae4f6a86246507849f8faf73e10c986d9a48d45d608b02cbb8486bd731ebe1c78be115fe65c5a97704 SHA512 b9cf42ff3cb066493a3a6e8d095f6af1c59815ebb19725374a75977294620fe825cdbc6650d3600d3f8525860c39d3580aa1d6ef773cd31fbc28d500d6c75246 -DIST barnyard2-1.9-github.tar.gz 344672 BLAKE2B 720d55170eaf66d2fac7a73990f00dab6faf27c5fcfbcd2f3fa5bad8fa028880fc257a78b60660eaaa5cea3cd8ab04aea2ad173d2135757d7a1f93a80e049d06 SHA512 eb10e4333e862ba6d708e7956b86f9da5da8c52b2756724e821ac5f5ba064791cf84125942bf76e7c563f62c83558aff90219ccc694884e213f6571428849666 diff --git a/net-analyzer/barnyard2/barnyard2-1.13.ebuild b/net-analyzer/barnyard2/barnyard2-1.13.ebuild index 64f00cbb8a96..a6c5e14eee5c 100644 --- a/net-analyzer/barnyard2/barnyard2-1.13.ebuild +++ b/net-analyzer/barnyard2/barnyard2-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,10 +7,11 @@ inherit autotools DESCRIPTION="Parser for Snort unified/unified2 files" HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects" SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz" +S="${WORKDIR}/${PN}-2-${PV}" -SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" +SLOT="0" +KEYWORDS="amd64 x86" IUSE="debug gre mpls mysql odbc postgres sguil" DEPEND=" @@ -24,12 +25,12 @@ RDEPEND=" ${DEPEND} " DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*" -S="${WORKDIR}/${PN}-2-${PV}" PATCHES=( "${FILESDIR}"/${PN}-1.13-free.patch "${FILESDIR}"/${PN}-1.13-libdir.patch "${FILESDIR}"/${PN}-1.13-my_bool.patch "${FILESDIR}"/${PN}-1.13-odbc.patch + "${FILESDIR}"/${PN}-1.13-Werror.patch "${FILESDIR}"/${PN}-1.13-pcap-1.9.0.patch ) @@ -61,7 +62,7 @@ src_configure() { --without-oracle } -src_install () { +src_install() { default newconfd "${FILESDIR}/barnyard2.confd" barnyard2 diff --git a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild b/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild deleted file mode 100644 index e936e8d53c18..000000000000 --- a/net-analyzer/barnyard2/barnyard2-1.9-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Parser for Snort unified/unified2 files" -HOMEPAGE="https://github.com/firnsy/barnyard2 https://firnsy.com/projects" -SRC_URI="https://github.com/firnsy/barnyard2/archive/v2-${PV}.tar.gz -> ${P}-github.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="debug gre mpls mysql odbc postgres static" - -DEPEND="net-libs/libpcap - mysql? ( dev-db/mysql-connector-c:0= ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:*[server] )" -RDEPEND="${DEPEND}" - -DOCS="RELEASE.NOTES etc/barnyard2.conf doc/README* schemas/create_*" - -S="${WORKDIR}/${PN}-2-${PV}" - -src_prepare() { - default - sed -i -e "s:^#config interface:config interface:" \ - "etc/barnyard2.conf" || die - sed -i -e "s:^output alert_fast:#output alert_fast:" \ - "etc/barnyard2.conf" || die - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable debug) \ - $(use_enable gre) \ - $(use_enable mpls) \ - $(use_with mysql) \ - $(use_with odbc) \ - $(use_with postgres postgresql) \ - --disable-ipv6 \ - --disable-prelude \ - --disable-mysql-ssl-support \ - --disable-aruba \ - --without-tcl \ - --without-oracle -} - -src_install () { - default - - newconfd "${FILESDIR}/barnyard2.confd" barnyard2 - newinitd "${FILESDIR}/barnyard2.initd" barnyard2 - - dodir /etc/barnyard2 - keepdir /var/log/barnyard2 - keepdir /var/log/snort/archive - - rm "${D}"/etc/barnyard2.conf || die -} - -pkg_postinst() { - elog "Configuration options can be set in /etc/conf.d/barnyard2." - elog - elog "An example configuration file can be found in /usr/share/doc/${PF}." -} diff --git a/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch b/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch new file mode 100644 index 000000000000..e3b8b9c9ae2a --- /dev/null +++ b/net-analyzer/barnyard2/files/barnyard2-1.13-Werror.patch @@ -0,0 +1,17 @@ +--- a/configure.in ++++ b/configure.in +@@ -12,14 +12,6 @@ + NO_OPTIMIZE="no" + ADD_WERROR="no" + +-# Test for -Werror and sed it out for now since some of the auto tests, +-# for example AC_CHECK_LIB, will fail because of +-# warning: conflicting types for built-in function <func> +-if eval "echo $CFLAGS | grep -e -Werror"; then +- CFLAGS=`echo $CFLAGS | sed -e "s/-Werror//g"` +- ADD_WERROR="yes" +-fi +- + # Disable annoying practice of recursively re-running the autotools + AM_MAINTAINER_MODE + AC_PROG_CC_STDC diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml index d6bf89e69a2c..4bf528f8851c 100644 --- a/net-analyzer/barnyard2/metadata.xml +++ b/net-analyzer/barnyard2/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> @@ -24,6 +20,7 @@ </maintainer> <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc> <bugs-to>mailto:dev@securixlive.com</bugs-to> + <remote-id type="github">firnsy/barnyard2</remote-id> </upstream> <use> <flag name="gre">Enable GRE support</flag> diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest deleted file mode 100644 index df77a02a0176..000000000000 --- a/net-analyzer/bigeye/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST bigeye-0.3-gcc34.diff.bz2 2774 BLAKE2B 51b1c4702b65b3e6b484d17e500b00d26bd137c74a8eb16b8521ffa621263ef89b650f1bdc967c50a8e5200cc857d42597e1f93279ec4acd01efe8ad9802cae0 SHA512 8ed54aa7b95aac8703e2bf99fde985cbbe7e62f7a6b549e58b2b54856336c5560c450a8c6ad9cbcdcd6bf61c842797c1abca001cfca20ff82614d8c328cab4ba -DIST bigeye-0.3-gcc34.patch.xz 2564 BLAKE2B 17508c780f339aa2409616aa2bd4e37c3e9f8ba48626e9a3782ea60da2989d4a8543c8a97cecef34554265385b13019d3bc04a05c8809870e0cba20c72a76bf8 SHA512 c7005975a7b798521f0d8f7b646f168ff215c1b5a760e303f7cad8bb78e2324e8303f77a724bc6902ef7ee525d7e6dd5ccfdf366c39abcc436fc6edf503205af -DIST bigeye-0.3.tgz 32462 BLAKE2B 509e958852d958f5fbb7197e567f8ebd1d7004027e4d8f3fe868d3af6719f76e445890a241d4438609b12695bd403fa246cec03b382a2c339d23c1456aa198e0 SHA512 73a146fd2f5df86a3d16dec05cf3f278393347f341a5cc319feccf6d23e1f2fe9d29070ac154a5b2336ade146843ab163e3545e9aefad1a0fa8903928d9b1ed0 diff --git a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild deleted file mode 100644 index 597005a10170..000000000000 --- a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="network utility dump and simple honeypot utility" -HOMEPAGE="http://violating.us/projects/bigeye/" -SRC_URI="http://violating.us/projects/bigeye/download/${P}.tgz - mirror://gentoo/${P}-gcc34.diff.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -src_prepare() { - epatch \ - "${WORKDIR}"/${P}-gcc34.diff \ - "${FILESDIR}"/${P}-overflow.patch - sed -i README \ - -e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \ - || die "sed README" -} - -src_compile() { - cd src || die - $(tc-getCC) ${CFLAGS} ${LDFLAGS} bigeye.c emulate.c -o bigeye || die -} - -src_install() { - dobin src/bigeye - - insinto /usr/share/bigeye - doins sig.file - doins -r messages - - dodoc README -} diff --git a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild b/net-analyzer/bigeye/bigeye-0.3-r4.ebuild deleted file mode 100644 index b349042d1ded..000000000000 --- a/net-analyzer/bigeye/bigeye-0.3-r4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="network utility dump and simple honeypot utility" -HOMEPAGE="http://violating.us/projects/bigeye/" -SRC_URI=" - http://violating.us/projects/bigeye/download/${P}.tgz - https://dev.gentoo.org/~jer/${P}-gcc34.patch.xz -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -PATCHES=( - "${WORKDIR}"/${P}-gcc34.patch - "${FILESDIR}"/${P}-overflow.patch -) - -src_prepare() { - default - sed -i README \ - -e "s|-- /messages/|-- /usr/share/bigeye/messages/|g" \ - || die "sed README" -} - -src_compile() { - append-cflags -fcommon - $(tc-getCC) ${CFLAGS} ${LDFLAGS} src/bigeye.c src/emulate.c -o src/bigeye || die -} - -src_install() { - dobin src/bigeye - - insinto /usr/share/bigeye - doins sig.file - doins -r messages - - dodoc README -} diff --git a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch b/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch deleted file mode 100644 index 1ca159a65b79..000000000000 --- a/net-analyzer/bigeye/files/bigeye-0.3-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/bigeye.c -+++ b/src/bigeye.c -@@ -787,7 +787,7 @@ - local.sin_family = AF_INET; - local.sin_port = htons(porta); - local.sin_addr.s_addr = INADDR_ANY; -- bzero(&(local.sin_zero),sizeof(local)); -+ memset(&(local.sin_zero), "\0", sizeof(local.sin_zero)); - - if(setsockopt(sock_a, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) { - perror("setsockopt"); diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/bigeye/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest index 52c4ade6d53a..77b3d8d308a9 100644 --- a/net-analyzer/bing/Manifest +++ b/net-analyzer/bing/Manifest @@ -1 +1 @@ -DIST bing_1.1.3.orig.tar.gz 38847 BLAKE2B ba01ff0e9a53fa8e9cd44ee085d78ae8d8891cc5478697a0d8fb13917c9a4104a672dcc7aba0c6c91e7f0084ac4254b6f565cf44486b6162225c5a21cb1614a7 SHA512 df56f93047454a02b305154b12898b063c340e96778db9e11114ac4598446648b3ed5fe4304e0f3e33f612069b0f0e4e231396ee878655683f923ad5418d6242 +DIST bing_1.3.5.orig.tar.gz 81083 BLAKE2B b6d7b9de4181cbe5054e2260482d6d2f6026e433815924fc5a8c74e4bb2d2da465a57e31e588b4d30f7e7b1c577440c4018b463df46278e8dc90f01e9d710ea6 SHA512 187c0dd8aff289943d044402cb072a64f9eb8470295ab4d3e94e78f1f8388c6737929b8ed6c11b551fc866bba4c45c3fbb1aa7b5ca1a6c798f313db9902d003f diff --git a/net-analyzer/bing/bing-1.1.3-r2.ebuild b/net-analyzer/bing/bing-1.3.5.ebuild index 83f643000e81..b3449c8b8071 100644 --- a/net-analyzer/bing/bing-1.1.3-r2.ebuild +++ b/net-analyzer/bing/bing-1.3.5.ebuild @@ -1,21 +1,25 @@ -# Copyright 1999-2018 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" +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 + sed -i -e "s|#COPTIM = -g| COPTIM = ${CFLAGS}|" Makefile || die } src_compile() { diff --git a/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch b/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch new file mode 100644 index 000000000000..424a591c1548 --- /dev/null +++ b/net-analyzer/bing/files/bing-1.3.5-Add-missing-string.h-for-memcpy.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/874057 + +From dafa483ba52e334cdc138a4f9e5999d2d5cc5d9b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 19 Oct 2022 02:58:47 +0100 +Subject: [PATCH] Add missing <string.h> for memcpy + +--- a/bing_probes.c ++++ b/bing_probes.c +@@ -10,6 +10,7 @@ + #include <errno.h> + #include <malloc.h> + #include <stdlib.h> ++#include <string.h> + + /* types.h provides u_short on HPUX10 and Solaris */ + #include <sys/types.h> diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml index 7a38bb900964..115e9d64a669 100644 --- a/net-analyzer/bing/metadata.xml +++ b/net-analyzer/bing/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/bmon/bmon-4.0-r1.ebuild b/net-analyzer/bmon/bmon-4.0-r1.ebuild new file mode 100644 index 000000000000..ce8d5207b86a --- /dev/null +++ b/net-analyzer/bmon/bmon-4.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" + +LICENSE="BSD-2 MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86" + +RDEPEND=" + >=sys-libs/ncurses-5.3-r2:0= + dev-libs/confuse:= + dev-libs/libnl:3 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( ChangeLog NEWS README.md ) + +CONFIG_CHECK="~NET_SCHED" +ERROR_NET_SCHED=" + CONFIG_NET_SCHED is not set when it should be. + Run ${PN} -i proc to use the deprecated proc interface instead. +" + +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" +} diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild index 95e18c2a29a5..d8f7ff125c40 100644 --- a/net-analyzer/bmon/bmon-4.0.ebuild +++ b/net-analyzer/bmon/bmon-4.0.ebuild @@ -1,28 +1,25 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils linux-info toolchain-funcs +EAPI=7 -DESCRIPTION="interface bandwidth monitor" -HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" -SRC_URI=" - https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz -" +inherit autotools linux-info toolchain-funcs + +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" +SRC_URI="https://codeload.github.com/tgraf/${PN}/tar.gz/v${PV} -> ${P}.tar.gz" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="amd64 ~arm hppa ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~riscv ~sparc x86" RDEPEND=" >=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( ChangeLog ) @@ -32,17 +29,15 @@ ERROR_NET_SCHED=" Run ${PN} -i proc to use the deprecated proc interface instead. " -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-3.6-docdir-examples.patch - - eapply_user +PATCHES=( + "${FILESDIR}"/${PN}-3.6-docdir-examples.patch +) +src_prepare() { + default eautoreconf } src_configure() { - econf \ - CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \ - --docdir="/usr/share/doc/${PF}" + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" } diff --git a/net-analyzer/bmon/bmon-999.ebuild b/net-analyzer/bmon/bmon-9999.ebuild index cabc2a781616..8fb8ce7ac06f 100644 --- a/net-analyzer/bmon/bmon-999.ebuild +++ b/net-analyzer/bmon/bmon-9999.ebuild @@ -1,28 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools git-r3 linux-info toolchain-funcs -DESCRIPTION="interface bandwidth monitor" -HOMEPAGE="http://www.infradead.org/~tgr/bmon/ https://github.com/tgraf/bmon/" +DESCRIPTION="Interface bandwidth monitor" +HOMEPAGE="https://github.com/tgraf/bmon/" EGIT_REPO_URI="https://github.com/tgraf/bmon/" LICENSE="BSD-2 MIT" SLOT="0" -KEYWORDS="" RDEPEND=" >=sys-libs/ncurses-5.3-r2:0= dev-libs/confuse:= dev-libs/libnl:3 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -DOCS=( ChangeLog ) +DOCS=( NEWS README.md ) CONFIG_CHECK="~NET_SCHED" ERROR_NET_SCHED=" @@ -39,7 +37,5 @@ src_prepare() { } src_configure() { - econf \ - CURSES_LIB="$( $(tc-getPKG_CONFIG) --libs ncurses)" \ - --docdir="/usr/share/doc/${PF}" + econf CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" } diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml index df5705b8008d..ff3ea4ec8466 100644 --- a/net-analyzer/bmon/metadata.xml +++ b/net-analyzer/bmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/braa/braa-0.82-r1.ebuild b/net-analyzer/braa/braa-0.82-r1.ebuild index c22f36d87117..0e0c7cd4ced5 100644 --- a/net-analyzer/braa/braa-0.82-r1.ebuild +++ b/net-analyzer/braa/braa-0.82-r1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://s-tech.elsat.net.pl/braa/" SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" PATCHES=( "${FILESDIR}"/${PN}-0.8-gentoo.diff diff --git a/net-analyzer/braa/braa-0.82.ebuild b/net-analyzer/braa/braa-0.82.ebuild deleted file mode 100644 index 574816f9353c..000000000000 --- a/net-analyzer/braa/braa-0.82.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs eutils - -DESCRIPTION="Quick and dirty mass SNMP scanner" -HOMEPAGE="http://s-tech.elsat.net.pl/braa/" -SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.8-gentoo.diff - sed -i braa.c -e 's|0.81|0.82|g' || die - tc-export CC -} - -src_install() { - dobin braa - dodoc README -} diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/braa/metadata.xml +++ b/net-analyzer/braa/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild index 67fb9f200db9..6837e519f3ca 100644 --- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild +++ b/net-analyzer/bwbar/bwbar-1.2.3.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="The kernel.org \"Current bandwidth utilization\" bar" HOMEPAGE="https://www.kernel.org/pub/software/web/bwbar/" @@ -15,9 +14,9 @@ KEYWORDS="amd64 x86" RDEPEND=">=media-libs/libpng-1.2" DEPEND="${RDEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${P}-libpng15.patch -} +PATCHES=( + "${FILESDIR}"/${P}-libpng15.patch +) src_install() { dobin bwbar diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/bwbar/metadata.xml +++ b/net-analyzer/bwbar/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest index ce662ef5c6e8..76957d9f40c0 100644 --- a/net-analyzer/bwm-ng/Manifest +++ b/net-analyzer/bwm-ng/Manifest @@ -1 +1 @@ -DIST bwm-ng-0.6.1.tar.gz 162620 BLAKE2B 28e201ac681fcb1d79afead8a7d2c31d52bfa9ee1ebc132d3cd1080a7edd8ddcc8c0cd6df1897d23a1c79a4a5d9157214a8f3224bd5f8f2c1a12cad96ec188bd SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd +DIST bwm-ng-0.6.3.tar.gz 70094 BLAKE2B bfc5007470a2e4d7f50dc43dc33898f5bcb34a0eaeeb0f53ed74029299ac2b732d343eaf725144a05b778ad8a204c5d546f0ea0b6aaf997995e2e7a6bc3c6cf6 SHA512 85ce29e6ffa9643b4e7c1d731f4e928ddca8cfdc71c86b65ec4e55058b951eb8da9ab80139145300518223589d5fece5bdc11ede91a1ea394d569993ccdb0ab8 diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild index 51311ad80550..0e94224d5bbf 100644 --- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild +++ b/net-analyzer/bwm-ng/bwm-ng-0.6.3.ebuild @@ -1,31 +1,31 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor" -SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz" HOMEPAGE="http://www.gropp.org/" +SRC_URI="https://github.com/vgropp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm ppc x86" LICENSE="GPL-2" SLOT="0" -IUSE="csv html" +IUSE="+csv +html" -RDEPEND="sys-libs/ncurses:0= - >=sys-apps/net-tools-1.60-r1" +RDEPEND=" + >=sys-apps/net-tools-1.60-r1 + sys-libs/ncurses:0= +" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${P}-fix-buildsystem.patch - "${FILESDIR}"/${P}-static-inline.patch + "${FILESDIR}"/${PN}-0.6.2-tinfo.patch ) src_prepare() { default - mv configure.{in,ac} || die eautoreconf } @@ -33,6 +33,6 @@ src_configure() { econf \ $(use_enable csv) \ $(use_enable html) \ - --enable-ncurses \ + --with-ncurses \ --with-procnetdev } diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch deleted file mode 100644 index 04c14392d66a..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch +++ /dev/null @@ -1,93 +0,0 @@ -* Fix broken buildsystem -* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS -https://bugs.gentoo.org/show_bug.cgi?id=561718 - ---- a/configure.in -+++ b/configure.in -@@ -3,7 +3,7 @@ - - AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng]) - AC_CONFIG_SRCDIR(src/bwm-ng.c) --AM_INIT_AUTOMAKE([gnu]) -+AM_INIT_AUTOMAKE([gnu subdir-objects]) - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR(./) - AC_LANG([C]) -@@ -28,44 +28,12 @@ - AC_CHECK_TYPES(unsigned long long) - - # Checks for libraries. --CURSES_CHECKED="0" -+AC_ARG_ENABLE([ncurses], -+ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses])) - --AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi --]) -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[ --if [ test $withval != "no" ]; then -- OLD_CPPFLAGS=$CPPFLAGS -- if [ test $withval != "yes" ]; then -- CPPFLAGS="$CPPFLAGS -I$withval" -- fi -- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) -- CURSES_CHECKED="1" --else -- CURSES_CHECKED="1" --fi -+AS_IF([test "x$enable_ncurses" != "xno"], [ -+ PKG_CHECK_MODULES([NCURSES], [ncurses], [AC_DEFINE([HAVE_LIBNCURSES], [1], [Define to 1 if you have the `ncurses' library (-lncurses).])]) - ]) --fi -- -- -- --if [ test $CURSES_CHECKED != "1" ]; then --AC_CHECK_LIB([curses],[initscr,timeout],,[ -- AC_CHECK_LIB([ncurses],[newterm,timeout]) --]) --fi - - AC_CHECK_FUNCS([wattron]) - AC_CHECK_FUNCS([curs_set]) ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -2,12 +2,10 @@ - - bin_PROGRAMS = bwm-ng - --bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c -+bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c - --EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c -- --bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM) --bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM) -+bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@ -+bwm_ng_LDADD = @NCURSES_LIBS@ - - noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h - ---- a/src/defines.h -+++ b/src/defines.h -@@ -48,7 +48,7 @@ - #define LIBSTATGRAB - #endif - --#if HAVE_LIBCURSES || HAVE_LIBNCURSES -+#if defined(HAVE_LIBCURSES) || defined(HAVE_LIBNCURSES) - #define HAVE_CURSES - #endif - diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch deleted file mode 100644 index 88e15ecefe3f..000000000000 --- a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-static-inline.patch +++ /dev/null @@ -1,256 +0,0 @@ -Make all 'inline' functions 'static inline' such that -the compiler can emit definitions when needed. -http://www.greenend.org.uk/rjk/tech/inline.html - ---- a/src/bwm-ng.c -+++ b/src/bwm-ng.c -@@ -26,7 +26,7 @@ - - /* handle interrupt signal */ - void sigint(int sig) FUNCATTR_NORETURN; --inline void init(void); -+static inline void init(void); - - /* clear stuff and exit */ - #ifdef __STDC__ -@@ -98,7 +98,7 @@ - deinit(0, NULL); - } - --inline void init(void) { -+static inline void init(void) { - if_count=0; - delay=500; - #if EXTENDED_STATS ---- a/src/help.c -+++ b/src/help.c -@@ -24,9 +24,9 @@ - #include "global_vars.h" - #include "help.h" - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr); -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr); - --inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { -+static inline void print_help_line(const char *short_c,const char * long_c,const char *descr) { - #ifdef LONG_OPTIONS - printf(" %-23s",long_c); - #else ---- a/src/options.c -+++ b/src/options.c -@@ -30,12 +30,12 @@ - char *trim_whitespace(char *str); - int read_config(const char *config_file); - #endif --inline int str2output_unit(char *optarg); -+static inline int str2output_unit(char *optarg); - #if EXTENDED_STATS --inline int str2output_type(char *optarg); -+static inline int str2output_type(char *optarg); - #endif --inline int str2out_method(char *optarg); --inline int str2in_method(char *optarg); -+static inline int str2out_method(char *optarg); -+static inline int str2in_method(char *optarg); - - #ifdef CONFIG_FILE - /****************************************************************************** -@@ -65,7 +65,7 @@ - /******************************************************************************/ - #endif - --inline int str2output_unit(char *optarg) { -+static inline int str2output_unit(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"bytes")) return BYTES_OUT; - if (!strcasecmp(optarg,"bits")) return BITS_OUT; -@@ -76,7 +76,7 @@ - } - - #if EXTENDED_STATS --inline int str2output_type(char *optarg) { -+static inline int str2output_type(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"rate")) return RATE_OUT; - if (!strcasecmp(optarg,"max")) return MAX_OUT; -@@ -87,7 +87,7 @@ - } - #endif - --inline int str2out_method(char *optarg) { -+static inline int str2out_method(char *optarg) { - if (optarg) { - if (!strcasecmp(optarg,"plain")) return PLAIN_OUT; - #ifdef HAVE_CURSES -@@ -109,7 +109,7 @@ - } - - --inline int str2in_method(char *optarg) { -+static inline int str2in_method(char *optarg) { - if (optarg) { - #ifdef PROC_NET_DEV - if (!strcasecmp(optarg,"proc")) return PROC_IN; ---- a/src/output.c -+++ b/src/output.c -@@ -25,13 +25,13 @@ - #include "output.h" - - inline static const char *output_type2str(void); --inline const char *input2str(void); --inline const char *show_all_if2str(void); --inline ullong direction2value(char mode,struct inout_long stats); -+static inline const char *input2str(void); -+static inline const char *show_all_if2str(void); -+static inline ullong direction2value(char mode,struct inout_long stats); - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items); -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items); - #endif --inline char *dyn_byte_value2str(double value,char *str,int buf_size); -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size); - char *values2str(char mode,t_iface_speed_stats stats,t_iface_stats full_stats,float multiplier,char *str,int buf_size); - - inline static const char *output_type2str(void) { -@@ -59,7 +59,7 @@ - } - - --inline const char *input2str(void) { -+static inline const char *input2str(void) { - switch (input_method) { - #ifdef SYSCTL - case SYSCTL_IN: -@@ -121,7 +121,7 @@ - return ""; - } - --inline const char *show_all_if2str(void) { -+static inline const char *show_all_if2str(void) { - switch (show_all_if) { - case 1: - return " (all)"; -@@ -262,7 +262,7 @@ - } - - --inline ullong direction2value(char mode,struct inout_long stats) { -+static inline ullong direction2value(char mode,struct inout_long stats) { - switch (mode) { - case 0: - return stats.in; -@@ -275,7 +275,7 @@ - } - - #if EXTENDED_STATS --inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { -+static inline double direction_max2value(char mode,struct inouttotal_double stats,int items) { - switch (mode) { - case 0: - return (double)(stats.in/items); -@@ -288,7 +288,7 @@ - } - #endif - --inline char *dyn_byte_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_byte_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1024) - snprintf(str,buf_size,"%15.2f ",value); -@@ -306,7 +306,7 @@ - return str; - } - --inline char *dyn_bit_value2str(double value,char *str,int buf_size) { -+static inline char *dyn_bit_value2str(double value,char *str,int buf_size) { - if (dynamic) { - if (value<1000) - snprintf(str,buf_size,"%15.2f ",value); ---- a/src/process.c -+++ b/src/process.c -@@ -26,19 +26,19 @@ - - short show_iface(char *instr, char *searchstr,char iface_is_up); - #if HAVE_GETTIMEOFDAY --inline long tvdiff(struct timeval newer, struct timeval older); -+static inline long tvdiff(struct timeval newer, struct timeval older); - float get_time_delay(int iface_num); - #endif --inline ullong calc_new_values(ullong new, ullong old); -+static inline ullong calc_new_values(ullong new, ullong old); - t_iface_speed_stats convert2calced_values(t_iface_speed_stats new, t_iface_speed_stats old); - t_iface_speed_stats convert2calced_disk_values(t_iface_speed_stats new, t_iface_speed_stats old); - #if EXTENDED_STATS --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data); -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier); - void save_avg(struct t_avg *avg,struct iface_speed_stats calced_stats,float multiplier); --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values); -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier); - #endif - - /* returns the whether to show the iface or not -@@ -74,7 +74,7 @@ - - #if HAVE_GETTIMEOFDAY - /* Returns: the time difference in milliseconds. */ --inline long tvdiff(struct timeval newer, struct timeval older) { -+static inline long tvdiff(struct timeval newer, struct timeval older) { - return labs((newer.tv_sec-older.tv_sec)*1000+ - (newer.tv_usec-older.tv_usec)/1000); - } -@@ -92,7 +92,7 @@ - #endif - - /* basically new-old, but handles "overflow" of source aswell */ --inline ullong calc_new_values(ullong new, ullong old) { -+static inline ullong calc_new_values(ullong new, ullong old) { - /* FIXME: WRAP_AROUND _might_ be wrong for libstatgrab, where the type is always long long */ - return (new>=old) ? (ullong)(new-old) : (ullong)(( - #ifdef HAVE_LIBKSTAT -@@ -133,13 +133,13 @@ - - #if EXTENDED_STATS - /* sub old values from cached for avg stats */ --inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void sub_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in-=data.in; - values->out-=data.out; - values->total-=data.total; - } - --inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { -+static inline void add_avg_values(struct inouttotal_double *values,struct inouttotal_double data) { - values->in+=data.in; - values->out+=data.out; - values->total+=data.total; -@@ -148,7 +148,7 @@ - - /* put new-old bytes in inout_long struct into a inouttotal_double struct - * and add values to cached .value struct */ --inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { -+static inline void save_avg_values(struct inouttotal_double *values,struct inouttotal_double *data,struct inout_long calced_stats,float multiplier) { - data->in=calced_stats.in*multiplier; - data->out=calced_stats.out*multiplier; - data->total=(calced_stats.in+calced_stats.out)*multiplier; -@@ -198,13 +198,13 @@ - } - - /* add current in and out bytes to totals struct */ --inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { -+static inline void save_sum(struct inout_long *stats,struct inout_long new_stats_values) { - stats->in+=new_stats_values.in; - stats->out+=new_stats_values.out; - } - - /* lookup old max values and save new if higher */ --inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { -+static inline void save_max(struct inouttotal_double *stats,struct inout_long calced_stats,float multiplier) { - if (multiplier*calced_stats.in > stats->in) - stats->in=multiplier*calced_stats.in; - if (multiplier*calced_stats.out>stats->out) diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch new file mode 100644 index 000000000000..a51f9c0596aa --- /dev/null +++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.2-tinfo.patch @@ -0,0 +1,10 @@ +--- a/configure.in ++++ b/configure.in +@@ -52,6 +52,7 @@ + CPPFLAGS="$CPPFLAGS -I$withval" + fi + AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ]) ++ AC_SEARCH_LIBS([wtimeout],[tinfo]) + CURSES_CHECKED="1" + else + CURSES_CHECKED="1" diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml index 7d30b17df0f1..d2b0d3760b1b 100644 --- a/net-analyzer/bwm-ng/metadata.xml +++ b/net-analyzer/bwm-ng/metadata.xml @@ -1,12 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="csv">Enable csv output</flag> -<flag name="html">Enable html output</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="csv">Enable csv output</flag> + <flag name="html">Enable html output</flag> + </use> + <upstream> + <remote-id type="github">vgropp/bwm-ng</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild index 3b4912656104..3de0d8294e7b 100644 --- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild +++ b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild @@ -1,36 +1,34 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Simple ncurses bandwidth monitor" -HOMEPAGE="http://bwmon.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://bwmon.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" SLOT="0" LICENSE="GPL-2 public-domain" -KEYWORDS="amd64 hppa ppc sparc x86" +KEYWORDS="amd64 ~hppa ppc sparc x86" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-typo-fix.patch \ - "${FILESDIR}"/${P}-overflow.patch \ +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-typo-fix.patch + "${FILESDIR}"/${P}-overflow.patch "${FILESDIR}"/${P}-tinfo.patch -} +) src_compile() { emake -C src CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } -src_install () { +src_install() { dobin ${PN} dodoc README } diff --git a/net-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml index 5d308982f242..b9c34036ee8f 100644 --- a/net-analyzer/bwmon/metadata.xml +++ b/net-analyzer/bwmon/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>Simple ncurses bandwidth monitor</longdescription> <upstream> <remote-id type="sourceforge">bwmon</remote-id> </upstream> diff --git a/net-analyzer/bwping/Manifest b/net-analyzer/bwping/Manifest index 0db0cfbe8f91..e0f5b0fe3dae 100644 --- a/net-analyzer/bwping/Manifest +++ b/net-analyzer/bwping/Manifest @@ -1,2 +1 @@ -DIST bwping-1.15.tar.gz 104234 BLAKE2B f0bc4b050760c775b5186667c2c15ce431832761d0bf00bf451d37514f93bafc1b6379ba96c30b1132f6dcb22fd4626304e4037c47794f9bf6fe28d10d5df6fb SHA512 76578571e3b3ca0f5ee61c28380d784fdcfbcee632e92b28a42c446ded9fb0fd0b682f360a51fca2df599353d5da9227762b186b5339ccfe7b9a7fa876399f8a -DIST bwping-1.16.tar.gz 103811 BLAKE2B 63880d4fe96d1272c06ca307fd0eb16fb1729ec3ddbd0de7bd484859625b3a9e8ba6d5730ac8df30795e2f7cb22ffd73dc9416eaca1ebc876f7ada83bcb46ca7 SHA512 d8f625a858e8278021ae91c5476ce18d1ecb8518a0f1d3d410a59dea4a64ec658fff527bc1f80d141a1249fe92da87afc536b86d31a30bcf316072e45cbc3998 +DIST bwping-2.5.tar.gz 113076 BLAKE2B c2a01b1d1d9fb83c2f0e40e2b1967d0e1e5a939d912372637558aa84cea0bca08f080cc8d980906d346ca44b39b7f37b54b0d6e18f834928bd59ddd056af43ac SHA512 2c271215476c8f1e0758aaae0e1730c526a326eeb3c7ffac3d8fac5783dbbe84d97fbb6732bfa7199ea8e4caf81a8dc9bd54ee36b63ece46dd2286880c734371 diff --git a/net-analyzer/bwping/bwping-1.16.ebuild b/net-analyzer/bwping/bwping-1.16.ebuild deleted file mode 100644 index b8610ffd425f..000000000000 --- a/net-analyzer/bwping/bwping-1.16.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP" -HOMEPAGE="https://bwping.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" - -src_test() { - [[ ${UID} = 0 ]] && default -} diff --git a/net-analyzer/bwping/bwping-1.15.ebuild b/net-analyzer/bwping/bwping-2.5.ebuild index 95d107fb4f3c..bb17cbaa8b50 100644 --- a/net-analyzer/bwping/bwping-1.15.ebuild +++ b/net-analyzer/bwping/bwping-2.5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="A tool to measure bandwidth and RTT between two hosts using ICMP" HOMEPAGE="https://bwping.sourceforge.io/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/oleg-derevenetz/bwping/releases/download/RELEASE_${PV}/${P}.tar.gz" LICENSE="BSD" SLOT="0" diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml index a5d9e36f9669..616d3d5f37bd 100644 --- a/net-analyzer/bwping/metadata.xml +++ b/net-analyzer/bwping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -10,6 +10,7 @@ <email>oleg.derevenetz@gmail.com</email> <name>Oleg Derevenetz</name> </maintainer> + <remote-id type="github">oleg-derevenetz/bwping</remote-id> <remote-id type="sourceforge">bwping</remote-id> </upstream> <longdescription> diff --git a/net-analyzer/cacti-spine/Manifest b/net-analyzer/cacti-spine/Manifest index 936e540866a9..8686e9b07669 100644 --- a/net-analyzer/cacti-spine/Manifest +++ b/net-analyzer/cacti-spine/Manifest @@ -1 +1 @@ -DIST cacti-spine-1.2.9.tar.gz 106572 BLAKE2B 803d16b6708e4cc5fc5ea9a5cb49bfd535fea421a873ce9baf74e1de75597a5a4941a909219d729e291ff3201c0f9c2a8304381144d935778ef331779395c688 SHA512 668b25cb89fad331ae4bc726b797bbeade74c90500af348748a995be0de2f699264cd24e98ea709214453328058e1dba6399dca2074bb6ce71e0d4b434b9dee4 +DIST cacti-spine-1.2.20.tar.gz 115258 BLAKE2B 78a9ed8a9e7e69e98bfa9971134dd6f34f540a93b0b1a2aababb66781f3c9787712d57d86b81d7f409487c4cc4447d4f84bd7292890b7eb70ec4137d97248793 SHA512 d7e129f7b42542d7ecc78d55cebc6d9ce481834342d3f3da1fce5538d8e42bc194a825795053d5e3a065b54574e2a3b9413725f1bc0562e55f1db213f9a94d0c diff --git a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild index ac2422dded6c..8cadbd1d2cb0 100644 --- a/net-analyzer/cacti-spine/cacti-spine-1.2.9.ebuild +++ b/net-analyzer/cacti-spine/cacti-spine-1.2.20.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools MY_P=${PN}-${PV/_p/-} @@ -12,26 +13,14 @@ SRC_URI="https://www.cacti.net/downloads/spine/${MY_P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 sparc x86" -IUSE="libressl" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch -) +KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc x86" + +DEPEND="dev-db/mysql-connector-c:= + dev-libs/openssl:= + net-analyzer/net-snmp:=" +RDEPEND="${DEPEND} + >net-analyzer/cacti-0.8.8" +BDEPEND="sys-apps/help2man" src_prepare() { default @@ -39,6 +28,11 @@ src_prepare() { eautoreconf } +src_configure() { + # Drop CONFIG_SHELL after 1.2.x (fix is on develop branch) + CONFIG_SHELL="${BROOT}"/bin/bash econf +} + src_install() { dosbin spine diff --git a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild index 3eacb02e8472..cfc27aa3907f 100644 --- a/net-analyzer/cacti-spine/cacti-spine-99999.ebuild +++ b/net-analyzer/cacti-spine/cacti-spine-9999.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools git-r3 MY_P=${PN}-${PV/_p/-} @@ -12,25 +13,15 @@ EGIT_REPO_URI="https://github.com/Cacti/spine" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="" -IUSE="libressl" -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) +BDEPEND="sys-apps/help2man" +DEPEND="dev-libs/openssl:= net-analyzer/net-snmp:= - dev-db/mysql-connector-c:0= -" -DEPEND=" - ${CDEPEND} - sys-apps/help2man -" -RDEPEND=" - ${CDEPEND} - >net-analyzer/cacti-0.8.8 -" + dev-db/mysql-connector-c:0=" +RDEPEND="${DEPEND} + >net-analyzer/cacti-0.8.8" + PATCHES=( - "${FILESDIR}"/${PN}-0.8.8d-ping.patch "${FILESDIR}"/${PN}-0.8.8g-net-snmp.patch ) diff --git a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch b/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch deleted file mode 100644 index 55dc8754c8db..000000000000 --- a/net-analyzer/cacti-spine/files/cacti-spine-0.8.8d-ping.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ping.c -+++ b/ping.c -@@ -913,7 +913,7 @@ - struct hostent result; - - buf = malloc(len*sizeof(char)); -- memset(buf, 0, sizeof(buf)); -+ memset(buf, 0, len*sizeof(char)); - - while (1) { - hostinfo = gethostbyname_r(hostname, &result, buf, len, &h_errno); diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml index 3c9260bb2907..f994f3ce9b55 100644 --- a/net-analyzer/cacti-spine/metadata.xml +++ b/net-analyzer/cacti-spine/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -13,4 +13,7 @@ replacement for the default cmd.php poller so you must decide if using Spine makes sense for your installation. </longdescription> + <upstream> + <remote-id type="github">Cacti/spine</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest index c078ee622279..28480b1c97a6 100644 --- a/net-analyzer/cacti/Manifest +++ b/net-analyzer/cacti/Manifest @@ -1 +1,2 @@ -DIST cacti-1.2.9.tar.gz 24906227 BLAKE2B 65a4459f9f55c55db853f81bcac6c60f146ba50f6dfd0abde449a41847afdb8564452ede1a493291c19ee7732ccc4a76d485af078021c7e0fcb6d1b265994940 SHA512 e50eb5587dc0274788b35cb701383ba897ab7c45a65efc7a8d32963b492c1ff1b96b0271ab7b6f9b53ad7dff5dd66b3ce4bd4a91c3ecf8ccd8d4b19b3ac972e4 +DIST cacti-1.2.21.tar.gz 40798454 BLAKE2B 86eae6743c07e45b4b06202cca072a385f45d2021159f0f5160a8c2a8eb8f3a2f9db63512515602d1c3eb6be4b53f5755c20d6da2194ff445c133a2bcdb33e27 SHA512 084ff9135dd0a92596a4d65f2fd461c8e84907ff87e467f6d144ee3b52ef7aeb44ffa5a8c25e74e5ff25588bc6c5b13b44ab2f24ef5e1c6652513b5c2a39f78d +DIST cacti-1.2.26.tar.gz 43637358 BLAKE2B 862b98e9b194f211a400b37f90c2bfb128bf71ee4660391ba2311deedd8b1342ce0d17d67181d16deae345c12596d7599b1272272b32fd7ab52fe2850f8209f6 SHA512 43bfa2fa5b87267191f845de8be38025b795509eb12817e5ff9884b20676655ec4e5230e015abe2afa9f10354317eec39081613e5c9fec4f6a6f314bedf873ab diff --git a/net-analyzer/cacti/cacti-1.2.9.ebuild b/net-analyzer/cacti/cacti-1.2.21.ebuild index 096bfc1182c1..8b3907868f76 100644 --- a/net-analyzer/cacti/cacti-1.2.9.ebuild +++ b/net-analyzer/cacti/cacti-1.2.21.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit eutils webapp +EAPI=8 + +inherit edos2unix webapp # Support for _p* in version. MY_P=${P/_p*/} @@ -12,7 +13,7 @@ HOMEPAGE="https://www.cacti.net/" SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86" IUSE="snmp doc" need_httpd @@ -37,7 +38,7 @@ src_install() { edos2unix `find -type f -name '*.php'` dodir ${MY_HTDOCSDIR} - cp -r . "${D}"${MY_HTDOCSDIR} + cp -r . "${ED}"${MY_HTDOCSDIR} webapp_serverowned ${MY_HTDOCSDIR}/rra webapp_serverowned ${MY_HTDOCSDIR}/log diff --git a/net-analyzer/cacti/cacti-1.2.26.ebuild b/net-analyzer/cacti/cacti-1.2.26.ebuild new file mode 100644 index 000000000000..711ac1952fbe --- /dev/null +++ b/net-analyzer/cacti/cacti-1.2.26.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edos2unix webapp + +# Support for _p* in version. +MY_P=${P/_p*/} + +DESCRIPTION="Cacti is a complete frontend to rrdtool" +HOMEPAGE="https://www.cacti.net/" +SRC_URI="https://www.cacti.net/downloads/${MY_P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~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/metadata.xml b/net-analyzer/cacti/metadata.xml index 8fae41374fe9..a300fdda8fa4 100644 --- a/net-analyzer/cacti/metadata.xml +++ b/net-analyzer/cacti/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <stabilize-allarches/> <longdescription lang="en"> Cacti is a complete network graphing solution designed to harness the power of RRDTool's data storage and graphing functionality. Cacti @@ -17,4 +18,7 @@ <use> <flag name="doc">install html documentation</flag> </use> + <upstream> + <remote-id type="github">Cacti/cacti</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest index 6046aff7a263..076a2fe8d920 100644 --- a/net-analyzer/calamaris/Manifest +++ b/net-analyzer/calamaris/Manifest @@ -1,2 +1 @@ -DIST calamaris-2.59.tar.gz 56168 BLAKE2B 1ab118066c836c2d2e9584594e31db77ed8aa50dd3f74da5f60ea41075abd5873f5d413ebf6e352f5cdf4ecefc86307669c46f88c9048194f31936470040ed82 SHA512 8c8ed820a1af6e21cfe9f03397c159b2261c8253b3395a8d6dbd21064151439406496132917d0ef087eed805c7945cf28f2d12dc1e52340991c18e6a27484ade -DIST calamaris-2.99.4.0.tar.gz 105860 BLAKE2B f87b51bab7aac10f9ef0fb50a788a0ad86a3b98171b9d4f1e1f7cc50878ff9f9ad70ed6485e4fa301c713b5551390ee4f2697c37291a540ee3b3feb6960891d4 SHA512 4127a3963fd0ea5baa1d5ce9a784f45658bb685f18e576c134fee1b4e8fdad535676974498119018e771924a8a622ed83b8aa095d3909b7bb3d009dd6024dbef +DIST calamaris-2.99.4.5.tar.gz 116893 BLAKE2B 9864f135b364dd7d7becd7c30cc28da1f41c4db0fb940f45153d5fd8da04c8df8675a728e19b47f6eb8f602945655817717189349fe047944d0abdacfd0476c9 SHA512 d9bc890afd6a349ea448b4f40281b8d4dd5babf2915cdfe6d4a46c066826e54c3a9e988e575fb13a4cf5ae9500d33faa5d24f295504f7b6fbfbec219610b309d diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild deleted file mode 100644 index 5829b5a2276d..000000000000 --- a/net-analyzer/calamaris/calamaris-2.59.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports" -HOMEPAGE="http://cord.de/calamaris-home-page" -SRC_URI="http://cord.de/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND="dev-lang/perl" - -src_install () { - dobin calamaris - doman calamaris.1 - dodoc CHANGES EXAMPLES README -} diff --git a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild index aed1057e0f8f..658b1514c2ec 100644 --- a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild +++ b/net-analyzer/calamaris/calamaris-2.99.4.5.ebuild @@ -1,22 +1,25 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports" -HOMEPAGE="http://cord.de/calamaris-home-page" -SRC_URI="http://cord.de/${P}.tar.gz" +DESCRIPTION="parses logfiles of a wide variety of web proxy servers and generates reports" +HOMEPAGE="https://cord.de/calamaris-english" +SRC_URI="https://cord.de/files/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="selinux" RDEPEND=" dev-lang/perl dev-perl/GDGraph + selinux? ( sec-policy/selinux-calamaris ) " src_prepare() { + default sed -i \ -e "s:\(use lib\).*$:\1 '/usr/share/';:" \ calamaris || die diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml index 1807f641fbf8..dce3f3be66c0 100644 --- a/net-analyzer/calamaris/metadata.xml +++ b/net-analyzer/calamaris/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription>Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports</longdescription> </pkgmetadata> diff --git a/net-analyzer/carl/Manifest b/net-analyzer/carl/Manifest deleted file mode 100644 index 8a178454b643..000000000000 --- a/net-analyzer/carl/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST carl-0.9.tar.gz 11096 BLAKE2B 46298873f8fff62a965a7ec7a657522dd90d1a298814f537bb5b32582ea63d0bcb1d4988cd31e6918f16514c65dd3c6517e9079c3c78f6cb0a4bc6d8ece1614a SHA512 9876e30d171bf00c4e53c6e90c98181ac25aeda004bdb8a03060c45a99c55fa087062076ff3964a222d2981ed682ae7b8f4cbade13c69154198200d35e1a577e diff --git a/net-analyzer/carl/carl-0.9-r2.ebuild b/net-analyzer/carl/carl-0.9-r2.ebuild deleted file mode 100644 index 9b6e70a1512c..000000000000 --- a/net-analyzer/carl/carl-0.9-r2.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python3_6 pypy3) - -inherit distutils-r1 - -DESCRIPTION="An rsync logfile analyzer" -HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml" -SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 x86" -IUSE="" - -DOCS="README" diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml deleted file mode 100644 index 090046ba85ad..000000000000 --- a/net-analyzer/carl/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>klausman@gentoo.org</email> -</maintainer> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/cbm/Manifest b/net-analyzer/cbm/Manifest index b532c14ec13a..ac585801d938 100644 --- a/net-analyzer/cbm/Manifest +++ b/net-analyzer/cbm/Manifest @@ -1,2 +1 @@ -DIST cbm-0.1.tar.gz 310247 BLAKE2B 08d2b7c79795217e6f6e2c72bbf1a4e5af096ddd9ed76c9a61093cd790d7ef2429d2db3d94102c334f1433803d4b91cb297f57185b666554ce84eee5c2295322 SHA512 24bf6a4d68fed253977b965d7e5b6aff4fb9db502c47b4a2b3b36f8c2963c9648b78ae607e9753fe4792a73ddbc29b86b3a1acc3c431a9355b11ff348566add4 -DIST cbm-0.2.tar.gz 16043 BLAKE2B a5c041ac33b4694c2933bee0d71786896ec30d0735b921f34cfb6a247179709afd9fa6d90f0602869976f334391e8138830f538b18a08a7396f4049e26029b24 SHA512 ca9dbbd73e707dca3b7bf10201840de28b2b3956ce3cb2fc76e1b530caf6ff883eb437f8be0df1efe3b5d8398c4949ea00de4ba48ed26b27afa21cf445d5d076 +DIST cbm-0.3.2.tar.gz 17448 BLAKE2B 21acdfb2e125b31f617bd3204cc11ef199647552b67671e62bec7a94ea4a5c213a1099c72261e6370aee06e4a6686392878a30a863778387c08a1a8095855940 SHA512 7a597467203786023a8efee23ea1ed65195f872f6287ed2767f9be449cc47757980703f629222f37309c25cc5f201d9581a713479d954ddc99347d641ab4ac34 diff --git a/net-analyzer/cbm/cbm-0.1-r1.ebuild b/net-analyzer/cbm/cbm-0.1-r1.ebuild deleted file mode 100644 index 3e3c60fb9e6b..000000000000 --- a/net-analyzer/cbm/cbm-0.1-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="Display the current traffic on all network devices" -HOMEPAGE="http://www.isotton.com/software/unix/cbm/" -SRC_URI="http://www.isotton.com/software/unix/${PN}/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - app-text/xmlto - app-text/docbook-xml-dtd:4.4 - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc-4.3.patch \ - "${FILESDIR}"/${P}-gcc-4.7.patch \ - "${FILESDIR}"/${P}-tinfo.patch \ - "${FILESDIR}"/${P}-headers-status-line.patch - eautoreconf -} diff --git a/net-analyzer/cbm/cbm-0.2.ebuild b/net-analyzer/cbm/cbm-0.3.2.ebuild index 970db519d022..9c8f5b01a4b2 100644 --- a/net-analyzer/cbm/cbm-0.2.ebuild +++ b/net-analyzer/cbm/cbm-0.3.2.ebuild @@ -1,29 +1,25 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="Color Bandwidth Meter" -HOMEPAGE=" - http://www.isotton.com/software/unix/cbm/ - https://github.com/resurrecting-open-source-projects/cbm -" +HOMEPAGE="https://github.com/resurrecting-open-source-projects/cbm" SRC_URI="https://github.com/resurrecting-open-source-projects/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - app-text/docbook-xml-dtd:4.4 +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="app-text/docbook-xml-dtd:4.4 app-text/xmlto virtual/pkgconfig " + PATCHES=( "${FILESDIR}"/${PN}-0.2-tinfo.patch ) diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch deleted file mode 100644 index ae9b58f6e99b..000000000000 --- a/net-analyzer/cbm/files/cbm-0.1-gcc-4.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/statistics.hpp -+++ b/src/statistics.hpp -@@ -3,6 +3,7 @@ - - #include <list> - #include <string> -+#include <sys/time.h> - - namespace statistics { - diff --git a/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch b/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch deleted file mode 100644 index 94b50a6877f7..000000000000 --- a/net-analyzer/cbm/files/cbm-0.1-gcc-4.7.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/cbm.cpp -+++ b/src/cbm.cpp -@@ -18,6 +18,7 @@ - #include <sys/socket.h> - #include <arpa/inet.h> - #include <net/if.h> -+#include <unistd.h> - - // Externs - extern int optind, opterr, optopt; diff --git a/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch b/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch deleted file mode 100644 index 4b09bbb69793..000000000000 --- a/net-analyzer/cbm/files/cbm-0.1-headers-status-line.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bdc4f02a6d7fb1416f36aef89af4592c691576d8 Mon Sep 17 00:00:00 2001 -From: Jari Aalto <jari.aalto@cante.net> -Date: Mon, 19 Sep 2011 14:27:04 +0300 -Subject: [PATCH] [fix] Headers and status line don't display by Paul Martin - <pm@debian.org> -Organization: Private -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jari Aalto <jari.aalto@cante.net> ---- - src/cbm.cpp | 9 ++++++++- - src/widgets/Window.cpp | 2 +- - 2 files changed, 9 insertions(+), 2 deletions(-) - -index 74282e2..0197443 100644 ---- a/src/cbm.cpp -+++ b/src/cbm.cpp -@@ -156,13 +156,20 @@ int main(int argc, char **argv) { - interfaceTable.setColumns(4); - interfaceTable.setActiveStyle(A_BOLD); - interfaceTable.setActiveRow(1); -+ // Position the interface table -+ interfaceTable.setPosition(2, 2); -+ interfaceTable.setSize(screen.getWidth() - 4, -+ 8); // TODO - - // Create the detail table - VerticalTable detailTable(screen); - detailTable.setColumns(2); - detailTable.setRows(2); - detailTable.setActiveRow(-1); -- -+ // Position the detail table -+ detailTable.setPosition(2, 12); // TODO -+ detailTable.setSize(screen.getWidth() - 4, 10); // TODO -+ - // Populate the detail table - detailTable.setText (0, 0, "Interface"); - detailTable.setStyle(0, 0, COLOR_PAIR(COLOR_HEADING) | A_BOLD); -index 322cb9b..572eef7 100644 ---- a/src/widgets/Window.cpp -+++ b/src/widgets/Window.cpp -@@ -14,7 +14,7 @@ Window::~Window() { - } - - void Window::setPosition(unsigned x, unsigned y) { -- mvwin((WINDOW*) win_, y, x); -+ mvderwin((WINDOW*) win_, y, x); - } - - void Window::setSize(unsigned width, unsigned height) { --- -1.7.5.4 - diff --git a/net-analyzer/cbm/files/cbm-0.1-tinfo.patch b/net-analyzer/cbm/files/cbm-0.1-tinfo.patch deleted file mode 100644 index 955d762214c4..000000000000 --- a/net-analyzer/cbm/files/cbm-0.1-tinfo.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -3,4 +3,4 @@ - cbm_SOURCES = cbm.cpp \ - ErrnoError.hpp \ - statistics.cpp statistics.hpp --cbm_LDADD = -lncurses widgets/libwidgets.la -+cbm_LDADD = $(ncurses_LIBS) widgets/libwidgets.la ---- a/configure.ac -+++ b/configure.ac -@@ -18,6 +18,8 @@ - - # Checks for libraries. - -+PKG_CHECK_MODULES(ncurses,ncurses) -+ - # Checks for header files. - - # Checks for typedefs, structures, and compiler characteristics. diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml index 8377d38ed6dc..d5554963005f 100644 --- a/net-analyzer/cbm/metadata.xml +++ b/net-analyzer/cbm/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>pinkbyte@gentoo.org</email> - <name>Sergey Popov</name> - </maintainer> -<maintainer type="project"> + <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/cbm</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest deleted file mode 100644 index 2261157cb9cf..000000000000 --- a/net-analyzer/chaosreader/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4 diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild deleted file mode 100644 index 09f3c3382e7a..000000000000 --- a/net-analyzer/chaosreader/chaosreader-0.96.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data." -HOMEPAGE="http://chaosreader.sourceforge.net - https://github.com/brendangregg/Chaosreader" -SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" - -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos" -LICENSE="GPL-2+" - -DEPEND=">=dev-lang/perl-5.8.0" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/Chaosreader-${PV}" - -PATCHES=( - "${FILESDIR}"/chaosreader-0.96-zombies.patch - "${FILESDIR}"/chaosreader-0.96-chunkcheck.patch - "${FILESDIR}"/chaosreader-0.96-divisionbyzero.patch -) - -src_install() { - dobin ${PN} -} diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch deleted file mode 100644 index 6a394d4b308e..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/chaosreader 2011-11-10 19:17:50.000000000 +0100 -+++ b/chaosreader 2012-03-09 18:15:21.096105305 +0100 -@@ -5350,6 +5353,24 @@ - next if length($http_data) < 8; - $partnum++; - $parttext = sprintf("%02d",$partnum); -+ -+ ## from https://sourceforge.net/tracker/?func=detail&aid=2019799&group_id=107384&atid=647491 -+ ### Chunk Check -+ if ( $http_header =~ /Transfer-Encoding: chunked/ ) { -+ my $new_http_data=""; -+ my $chunksize=-1; -+ my $pos=0; -+ until ($chunksize==0) { -+ my $eolpos=index($http_data,"\r\n",$pos); -+ $chunksize=hex(substr($http_data,$pos,$eolpos - $pos)); -+ $pos=($eolpos+2); -+ if ($chunksize > 0) { -+ $new_http_data.=substr($http_data,$pos,$chunksize); -+ } -+ $pos+=($chunksize+2); -+ } -+ $http_data=$new_http_data; -+ } - - ### Part - Checks - $http_type = &File_Type($http_data); diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch deleted file mode 100644 index 584918513062..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/chaosreader 2014-06-15 21:30:11.000000000 +0200 -+++ b/chaosreader 2019-02-21 18:26:00.671756895 +0100 -@@ -4275,7 +4275,14 @@ - print REPLAY "ms($timediff1);\n"; - } - $duration = 0.01 if $duration == 0; # avoid divide by 0, -- $speed = sprintf("%.2f",$bytes / (1024 * $duration)); -+ + # avoid division by zero -+ # from https://sourceforge.net/tracker/?func=detail&aid=2210488&group_id=107384&atid=647489 -+ if ( $duration > 0 ) { -+ $speed = sprintf("%.2f",$bytes / (1024 * $duration)); -+ } -+ else { -+ $speed = "unknown"; -+ } - print REPLAY "print \"\n\n" . - "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";"; - close REPLAY; diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch deleted file mode 100644 index 40fa6063adf3..000000000000 --- a/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/chaosreader 2006-12-24 15:12:23.000000000 +0100 -+++ b/chaosreader 2006-12-24 15:11:56.000000000 +0100 -@@ -396,6 +395,8 @@ if ($Arg{normal}) { - - elsif ($Arg{standalone}) { - -+ $SIG{CHLD} = "IGNORE"; -+ - ############################################################ - # --- STANDALONE - Create Packet Logs and Process them --- - # diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml deleted file mode 100644 index f74b571ce679..000000000000 --- a/net-analyzer/chaosreader/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>m.mairkeimberger@gmail.com</email> - <name>Michael Mair-Keimberger</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">chaosreader</remote-id> - <remote-id type="github">brendangregg/chaosreader</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest index d378a34fa03d..4f03d903bfdd 100644 --- a/net-analyzer/check_mk_agent/Manifest +++ b/net-analyzer/check_mk_agent/Manifest @@ -1,2 +1 @@ -DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild deleted file mode 100644 index c41c9b1f3484..000000000000 --- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit systemd - -DESCRIPTION="Agent to report data to Check_MK for monitoring" -HOMEPAGE="http://mathias-kettner.de/check_mk.html" - -MY_PV="${PV/_p/p}" -MY_P="check-mk-raw-${MY_PV}.cre" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper" - -RDEPEND="!!net-analyzer/check_mk - app-shells/bash:* - xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) ) - " -DEPEND="${RDEPEND}" - -SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz" - -src_unpack() { - # check_mk is a tarball containing tarballs - unpack ${A} - unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz - mkdir -p "${S}" || die - cd "${S}" || die - unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz - mkdir -p "${S}"/doc || die - cd "${S}"/doc || die - unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz -} - -src_install() { - # Install agent related files - newbin check_mk_agent.linux check_mk_agent - - keepdir /usr/lib/check_mk_agent/local - dodir /usr/lib/check_mk_agent/plugins - dodir /etc/check_mk - - dodoc doc/{AUTHORS,COPYING,ChangeLog} - docompress - - if use xinetd; then - insinto /etc/xinetd.d - newins cfg_examples/xinetd.conf check_mk - systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service} - fi - - # Install the check_mk_agent logwatch plugin - if use logwatch; then - insinto /etc/check_mk - doins cfg_examples/logwatch.cfg - exeinto /usr/lib/check_mk_agent/plugins - doexe plugins/mk_logwatch - fi - - # Install any other useflag-enabled agent plugins - exeinto /usr/lib/check_mk_agent/plugins - use inventory && newexe plugins/mk_inventory.linux mk_inventory - use smart && doexe plugins/smart - use mysql && doexe plugins/mk_mysql - use postgres && doexe plugins/mk_postgres - use apache_status && doexe plugins/apache_status - use zypper && doexe plugins/mk_zypper - use oracle && doexe plugins/mk_oracle - use nfsexports && doexe plugins/nfsexports -} diff --git a/net-analyzer/check_mk_agent/metadata.xml b/net-analyzer/check_mk_agent/metadata.xml index 1a171aa481ac..89c9c6e274a7 100644 --- a/net-analyzer/check_mk_agent/metadata.xml +++ b/net-analyzer/check_mk_agent/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>axs@gentoo.org</email> - <name>Ian Stakenvicius (_AxS_)</name> - </maintainer> + <!-- maintainer-needed --> <longdescription lang="en"> The agent, to gather and report system and other monitoring data to Check_MK enabled Nagios/Icigna centralized monitoring servers. diff --git a/net-analyzer/chronograf/Manifest b/net-analyzer/chronograf/Manifest index 6bf2c756bf05..b906fdb9c76e 100644 --- a/net-analyzer/chronograf/Manifest +++ b/net-analyzer/chronograf/Manifest @@ -1,6 +1,3 @@ -DIST chronograf-1.4.3.0.tar.gz 3979946 BLAKE2B 963511250e1d49ca92e9fde23b3c0899331ef22fe071c47c8d9d6a0ab0264e2dcb1dc083559424ff0b4bb59b0d4eb3121febe6f1ce828bac24598ae8be51cb6a SHA512 49a7565dc58f4f79ad1feb25bf6f74e9267630f6dab5f8767411d11f12dd7a76e9486b8f52c961c27dae6511286192585cee67363acf558287da436c39500ef9 -DIST chronograf-1.6.2.tar.gz 4585236 BLAKE2B a9861f84c1c862512fb1a5166f063a54d6a72f0eb3d175f7314ac50fd04b4f2529e18195cffa49b11a6b13483619ae7e579bc15479f8cea0698fd13cdc594677 SHA512 c4be1deed7ce4f0006cbf123faa0577909bf821581f5f263d3d474963f2541dca0092964a38626b80b5f32c11947f130aa97d37f3d673e304cea665c42bf2a32 -DIST chronograf-1.7.3.tar.gz 16319610 BLAKE2B 3d90ad33ce78b4bd939e5c016ea14b7986d8888707a8a68cd832e0826612aa984d65615301bee4d800343ecc38964103abcf72810c6390fd9cdd65542739e9ba SHA512 dd5e4805dcbe167a399b7927b976839bb99f805abc7caf0fbf9cba479647df1a681f175d7bfc48a2267312e7f89470935623f7bc5e6bcb7cf861928f3e0b2f1a -DIST chronograf-gen-1.4.3.0.tar.gz 2488979 BLAKE2B 47738629d25dd6b5c11f942bdcea089291bfd8ad1476f448985d35fd35fa4a59274e95b863f7055c34ac0047f584fc45c83e3143aceb8b13b6c4fd28c42039ec SHA512 0346c19f80bea597c87a54f2d5409854a30dfa020bb0326791a6387d81aafe0c6e5112b6d086b21f95dc4f68a269a8fb2e0113156122636c3a6281ba58df6b49 -DIST chronograf-gen-1.6.2.tar.gz 3263429 BLAKE2B 6b6202bfd216a7777c89f2329379df03226b0b212e720987357b66bc26c3d07212a26ed2c41991c7ee3c0eea9f3a731985697b7e4752eb3be906cbc8790a8290 SHA512 55cf76b6c33134a49deb605543ff49aeffaa3baf4262787b19afe1d3d42c2a6e66e88d031f07a2f13a214556c479daa6b40f8586b529730c924ae45bf0e85213 -DIST chronograf-gen-1.7.3.tar.gz 2893752 BLAKE2B bfbc680c3237522844b406504412dd6001eef3f93fc31df18660bb74b7e7561f44c5d3af039af62e000610f40c81e78fcde8a651a5198b4bd152fa04e93c51c7 SHA512 8120f563e0c5be8a7b8179016db72a1ff5eb7447c1124ffeb87d5c928275f3b0080f1f4d01cd9c5b0eef601852b2e3701e3b4cefda9a427bbaeaf9fc46a69ab1 +DIST 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 diff --git a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild b/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild deleted file mode 100644 index 2b2c7163f727..000000000000 --- a/net-analyzer/chronograf/chronograf-1.4.3.0.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.6.2.ebuild b/net-analyzer/chronograf/chronograf-1.6.2.ebuild deleted file mode 100644 index ebae27747c62..000000000000 --- a/net-analyzer/chronograf/chronograf-1.6.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.7.3.ebuild b/net-analyzer/chronograf/chronograf-1.7.3.ebuild deleted file mode 100644 index c4eb4def22b6..000000000000 --- a/net-analyzer/chronograf/chronograf-1.7.3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2018 Sony Interactive Entertainment Inc. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/chronograf - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${PN}-gen-${PV}.tar.gz" - -LICENSE="AGPL-3+" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup chronograf - enewuser chronograf -1 -1 /var/lib/chronograf chronograf -} - -src_unpack() { - local f - golang-vcs-snapshot_src_unpack - pushd "${S}/src/${EGO_PN}" > /dev/null || die - for f in ${A}; do - case $f in - ${PN}-gen-*.tar.*) - unpack ${f} - ;; - esac - done -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -o chronograf cmd/chronograf/main.go - echo "$@" - "$@" || die "building chronograf failed" - set -- env GOPATH="${S}" go build -o chronoctl cmd/chronoctl/main.go - echo "$@" - "$@" || die "building chronoctl failed" - popd > /dev/null || die -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die -dobin chronograf chronoctl - dodoc CHANGELOG.md - insinto /etc/logrotate.d - newins etc/scripts/logrotate chronograf - systemd_dounit etc/scripts/chronograf.service - insinto /usr/share/chronograf/canned -doins canned/*.json -keepdir /usr/share/chronograf/resources - keepdir /var/log/chronograf - fowners chronograf:chronograf /var/log/chronograf - newconfd "${FILESDIR}"/chronograf.confd chronograf - newinitd "${FILESDIR}"/chronograf.rc chronograf - popd > /dev/null || die -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - einfo "In order to use chronograf, you will need to configure" - einfo "the appropriate options in ${EROOT}etc/conf.d/chronograf" - fi -} diff --git a/net-analyzer/chronograf/chronograf-1.8.5.ebuild b/net-analyzer/chronograf/chronograf-1.8.5.ebuild new file mode 100644 index 000000000000..75faf8089855 --- /dev/null +++ b/net-analyzer/chronograf/chronograf-1.8.5.ebuild @@ -0,0 +1,67 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit go-module systemd +COMMIT=6b7e6cb1a + +DESCRIPTION="Monitoring, processing and alerting on time series data" +HOMEPAGE="https://www.influxdata.com" +SRC_URI="https://github.com/influxdata/chronograf/archive/${PV}.tar.gz -> ${P}.tar.gz + 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" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND="acct-group/chronograf + acct-user/chronograf" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND}" + +src_prepare() { + default + mv ../canned/bin_gen.go canned || die + mv ../dist/dist_gen.go dist || die + mv ../protoboards/bin_gen.go protoboards || die + mv ../server/swagger_gen.go server || die +} + +src_compile() { + local go_ldflags + go_ldflags=" + -X main.commit=${COMMIT} + -X main.version=${PV}" + go build \ + -o chronograf \ + -ldflags "${go_ldflags}" \ + ./cmd/chronograf/main.go || die "could not compile chronograf" + go build \ + -o chronoctl \ + -ldflags "${go_ldflags}" \ + ./cmd/chronoctl || die "could not compile chronoctl" +} + +src_install() { + dobin chronograf chronoctl + dodoc CHANGELOG.md + insinto /etc/logrotate.d + newins etc/scripts/logrotate chronograf + systemd_dounit etc/scripts/chronograf.service + insinto /usr/share/chronograf/canned + doins canned/*.json + keepdir /usr/share/chronograf/resources + newconfd "${FILESDIR}"/chronograf.confd chronograf + newinitd "${FILESDIR}"/chronograf.rc chronograf + keepdir /var/log/chronograf + fowners chronograf:chronograf /var/log/chronograf +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + einfo "In order to use chronograf, you will need to configure" + einfo "the appropriate options in ${EROOT}/etc/conf.d/chronograf" + fi +} diff --git a/net-analyzer/chronograf/metadata.xml b/net-analyzer/chronograf/metadata.xml index ed7262b70f1e..db463f3eeb66 100644 --- a/net-analyzer/chronograf/metadata.xml +++ b/net-analyzer/chronograf/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - Open source framework for processing, monitoring and alerting on - time series data. - </longdescription> </pkgmetadata> diff --git a/net-analyzer/cloudshark/Manifest b/net-analyzer/cloudshark/Manifest index e92ca230a999..04725555ecde 100644 --- a/net-analyzer/cloudshark/Manifest +++ b/net-analyzer/cloudshark/Manifest @@ -1,3 +1 @@ DIST cloudshark-1.0.4.tar.gz 24947 BLAKE2B e386d8cb2faf941ef97bd593c2d17566c5d97dce4d73af0d2f462d6e5c875a59e6598e5679bebf4c06be1dde8ebd37c05354dac46c6349c19b65ae0b57a1976b SHA512 5cb0e43e348d00c0ecc98f079a35f455865cbbe884e34101369b74429bb5bc14bb98acffa9749ce44a765e3653c0548e8b30cc658fb982b09dd61e2ec31b4f86 -DIST cloudshark-plugin-1.0.2-174.tgz 143067 BLAKE2B 629ce8ee1fc4f50945228f6ada55a6f4ef88c8aa52cdbccf851a97581d9a2939d4322933747c090aa9261c6bffc619d6f250fa2dfad6583f0830457165ceb8f1 SHA512 42445e67630b1bd2968f0836f625acb3792f22257de104ec0b90c59fa8d2096649eba2252cd6161ce57c8ff79095d52c5663d2fa018c650667896c9905e9dd7e -DIST cloudshark-plugin-1.0.3-180.tgz 143381 BLAKE2B ed27e2a7102f72e12da9908160a365f511fc3ea568cb9d8b5a2796d3f85bb1c73ca5be7c82ad4de9abb42267ceef4739cad66e369b06a480c85a80b411470474 SHA512 765144e6a2c7ce17eaa05f8170216e08ccac224ba6c11750893ae5caa8f40a2b6bee883fd9be91fa800ad3b45dc42d2ec81e564aa573015a91a8537be8384c73 diff --git a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild deleted file mode 100644 index 14e9a59b9b81..000000000000 --- a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -SV="1.0.2-174" - -DESCRIPTION="Easily upload your wireshark captures to CloudShark" -HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" -SRC_URI="http://appliance.cloudshark.org/downloads/${PN}-plugin-${SV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -PDEPEND="net-analyzer/wireshark:=[lua] - net-misc/curl" - -S="${WORKDIR}/${PN}-${SV}" - -get_PV() { - local pv=$(best_version $1) - pv=${pv#$1-}; pv=${pv%-r*} - pv=${pv//_}; echo ${pv} -} - -src_prepare() { - #cloudshark isn't meant to be installed systemwide, we fix that - epatch "${FILESDIR}"/cs_log_dir.patch - - sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua - #causes errors, looks like it expects windows paths only - #echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default - sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua - - #stuff to fix cloudshark_init.default to be more sane - #sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work) -} - -src_install() { - insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark) - doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt - newins cloudshark_init.default cloudshark_init.lua - dodoc CLOUDSHARK_README.txt -} diff --git a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild deleted file mode 100644 index 2925d93b8e5b..000000000000 --- a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils multilib - -SV="1.0.3-180" - -DESCRIPTION="Easily upload your wireshark captures to CloudShark" -HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" -SRC_URI="http://appliance.cloudshark.org/plugin/${PN}-plugin-${SV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -PDEPEND="net-analyzer/wireshark:=[lua] - net-misc/curl" - -S="${WORKDIR}/${PN}-${SV}" - -get_PV() { - local pv=$(best_version $1) - pv=${pv#$1-}; pv=${pv%-r*} - pv=${pv//_}; echo ${pv} -} - -src_prepare() { - #cloudshark isn't meant to be installed systemwide, we fix that - epatch "${FILESDIR}"/cs_log_dir.patch - - sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua - #causes errors, looks like it expects windows paths only - #echo "CLOUDSHARK_CABUNDLE = /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt" >> cloudshark_init.default - sed -i "s#%s/curl-ca-bundle.crt#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/curl-ca-bundle.crt#" cloudshark.lua - - #stuff to fix cloudshark_init.default to be more sane - #sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default (tshark support doesn't seem to work) -} - -src_install() { - insinto /usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark) - doins cloudshark.lua json.lua version.lua curl-ca-bundle.crt - newins cloudshark_init.default cloudshark_init.lua - dodoc CLOUDSHARK_README.txt -} diff --git a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild index c25a86e3f199..3904b2a51763 100644 --- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild +++ b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils multilib +EAPI=8 DESCRIPTION="Easily upload your wireshark captures to CloudShark" HOMEPAGE="https://cloudshark.io/articles/wireshark-plugin/ https://github.com/cloudshark/wireshark-plugin" @@ -27,12 +25,13 @@ get_PV() { src_prepare() { #cloudshark isn't meant to be installed systemwide, we fix that - epatch "${FILESDIR}"/cs_log_dir.patch + eapply "${FILESDIR}"/cs_log_dir.patch sed -i "s#%s/cloudshark_init.lua#/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)/cloudshark_init.lua#" cloudshark.lua #this enables cloudshark by DEFAULT on tshark, not desired #sed -i 's#CLOUDSHARK_TSHARK = "n"#CLOUDSHARK_TSHARK = "y"#' cloudshark_init.default + default } src_install() { diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml index bbafcdbcbb95..d9ce0ea4d0fa 100644 --- a/net-analyzer/cloudshark/metadata.xml +++ b/net-analyzer/cloudshark/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest index 2b178af67e87..6f216853448c 100644 --- a/net-analyzer/cnet/Manifest +++ b/net-analyzer/cnet/Manifest @@ -1,2 +1 @@ -DIST cnet-3.3.1.tgz 2684531 BLAKE2B 5cb2cf545ccf1e2adb1e50f4220b944361ed44d61857ef4bf0ce30ed9e6346e0ed709bfbcfa339751bf2abc67d930b19decdc6355803426fa1eb4d097a6eed73 SHA512 9b86a077d48086036fbcfa86ba202b49610e1e1eac55fd3076b24a7ca622a6fc9b34156477bcb25af15d06cf0813f12a7b3f4cb21f1eeb00fd2e010610797ce8 DIST cnet-3.3.4.tgz 2687235 BLAKE2B dec8b4510cfb9a39ade046dee56955d4ab39094d07acf373b056ce1917f3bbddcf22cf5feefe864b472be4c4a47da3147a3b977cdbf8b0295e0c3a8da95a8420 SHA512 51457541d1023e49bdad4df3502c51d11ea6d62e3e6ae857becfb60229626ba777226b2b42d313d95b982b2790c6b1f80b39e344d9d4bcd4c38ccc31b055d8f9 diff --git a/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild deleted file mode 100644 index 3bde2f1eb731..000000000000 --- a/net-analyzer/cnet/cnet-3.3.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils multilib toolchain-funcs - -DESCRIPTION="Network simulation tool" -HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - >=dev-lang/tk-8.5 - dev-libs/elfutils - x11-libs/libX11 -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.3.1-gentoo.patch \ - "${FILESDIR}"/${PN}-3.3.1-tcl.patch - - # Set libdir properly - sed -i -e "/CNETPATH/s:local/lib:$(get_libdir):" src/preferences.h || die - sed -i -e "/^LIBDIR/s:lib:$(get_libdir):" Makefile || die - - epatch_user -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - AR="$(tc-getAR)" \ - RANLIB="$(tc-getRANLIB)" -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ANNOUNCE - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${P}/examples - fi -} diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild index d0f7d21a3314..2685af53c5bd 100644 --- a/net-analyzer/cnet/cnet-3.3.4.ebuild +++ b/net-analyzer/cnet/cnet-3.3.4.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Network simulation tool" -HOMEPAGE="http://www.csse.uwa.edu.au/cnet3/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" +HOMEPAGE="https://www.csse.uwa.edu.au/cnet3/" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz" LICENSE="GPL-2" SLOT="0" @@ -18,13 +19,10 @@ RDEPEND=" dev-libs/elfutils x11-libs/libX11 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" + +DOCS=( 1st.README ) -DOCS=( - 1st.README -) PATCHES=( "${FILESDIR}"/${PN}-3.3.4-gentoo.patch "${FILESDIR}"/${PN}-3.3.1-tcl.patch diff --git a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch b/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch deleted file mode 100644 index 9754fb4ebf84..000000000000 --- a/net-analyzer/cnet/files/cnet-3.3.1-gentoo.patch +++ /dev/null @@ -1,163 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -6,7 +6,7 @@ - # Comment/uncomment the following 4 constants to suit your system: - # - # PREFIX defines the directory below which cnet will be installed. --PREFIX = /usr/local -+PREFIX = /usr - #PREFIX = $(HOME) - # - # BINDIR defines the directory where the cnet binary will be installed. -@@ -16,26 +16,24 @@ - LIBDIR = $(PREFIX)/lib64/cnet - # - # WWWDIR defines the directory to hold cnet's web-based documentation --WWWDIR = /home/httpd/html/cnet -+#WWWDIR = /home/httpd/html/cnet - #WWWDIR = $(HOME)/WWW/cnet - # - # --------------------------------------------------------------------- - # - it: -- make -C src -- make -C support -+ $(MAKE) -C src -+ $(MAKE) -C support - @ls -l bin/$(NAME) lib/*.a - - install: -- make -- @mkdir -p $(BINDIR) $(LIBDIR) -- @chmod 755 $(BINDIR) $(LIBDIR) -- @cp bin/$(NAME) $(BINDIR)/$(NAME) -- @chmod 755 $(BINDIR)/$(NAME) -- @rm -rf $(LIBDIR)/* -- @cp lib/* $(LIBDIR) -- @chmod 644 $(LIBDIR)/* -- @ls -l $(BINDIR)/$(NAME) $(LIBDIR)/*.a -+ @mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) -+ @chmod 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) -+ @cp bin/$(NAME) $(DESTDIR)$(BINDIR)/$(NAME) -+ @chmod 755 $(DESTDIR)$(BINDIR)/$(NAME) -+ @rm -rf $(DESTDIR)$(LIBDIR)/* -+ @cp lib/* $(DESTDIR)$(LIBDIR) -+ @chmod 644 $(DESTDIR)$(LIBDIR)/* - - AND = html/CLICK html/KEYBOARD html/STOPANDWAIT html/TICKTOCK - www: ---- a/src/Makefile.linux -+++ b/src/Makefile.linux -@@ -5,7 +5,7 @@ - # binutils 2.5.2, and - # libelf (0.6.4 onwards) - # --WARNINGS = -Wall -Werror -Wshadow -Wpointer-arith -Wcast-qual \ -+WARNINGS = -Wall -Wshadow -Wpointer-arith -Wcast-qual \ - -Wcast-align -Wwrite-strings -Wconversion \ - -Wstrict-prototypes -Wredundant-decls -Winline \ - -Wcomments -Wtrigraphs -Wimport -Wundef -@@ -20,8 +20,8 @@ - XINCLUDES = -I/usr/include/tcl8.5 - XLIBS = -ltcl8.5 -ltk8.5 -lX11 - # --C99 = gcc -std=c99 -Wall -Werror -pedantic --CFLAGS = -O3 -fPIC $(INCLUDES) $(XINCLUDES) -+C99 = $(CC) -std=c99 -Wall -pedantic -+CFLAGS += -fPIC $(INCLUDES) $(XINCLUDES) - # - LD = gcc -rdynamic - LIBDIRS = $(XLIBDIRS) ---- a/support/Makefile -+++ b/support/Makefile -@@ -7,21 +7,21 @@ - - it: - @if uname -s -r | grep -q "Linux" ; then \ -- make -f Makefile.linux ; fi -+ $(MAKE) -f Makefile.linux ; fi - @if uname -s -r | grep -q "Darwin" ; then \ -- make -f Makefile.macosx ; fi -+ $(MAKE) -f Makefile.macosx ; fi - @if uname -s -r | grep -q "SunOS 4" ; then \ -- make -f Makefile.sunos ; fi -+ $(MAKE) -f Makefile.sunos ; fi - @if uname -s -r | grep -q "SunOS 5" ; then \ -- make -f Makefile.solaris ; fi -+ $(MAKE) -f Makefile.solaris ; fi - @if uname -s -r | grep -q "OSF1" ; then \ -- make -f Makefile.osf1 ; fi -+ $(MAKE) -f Makefile.osf1 ; fi - @if uname -s -r | grep -q "IRIX" ; then \ -- make -f Makefile.irix5 ; fi -+ $(MAKE) -f Makefile.irix5 ; fi - @if uname -s -r | grep -q "FreeBSD" ; then \ -- make -f Makefile.freebsd ; fi -+ $(MAKE) -f Makefile.freebsd ; fi - @if uname -s -r | grep -q "NetBSD" ; then \ -- make -f Makefile.netbsd ; fi -+ $(MAKE) -f Makefile.netbsd ; fi - @cp -p cnetsupport.h ../lib - - # --------------------------------------------------------------------- ---- a/support/Makefile.common -+++ b/support/Makefile.common -@@ -1,13 +1,13 @@ - # --CC = gcc --CFLAGS = -std=c99 -pedantic -Wall -Werror -O3 -fPIC -+#CC = gcc -+CFLAGS += -std=c99 -pedantic -Wall -fPIC - - DOTH = cnetsupport.h - OBJ = hashtable.o haversine.o lexical.o md5.o queue.o vector.o - - $(NAME): $(OBJ) -- ar rc $(NAME) $(OBJ) -- ranlib $(NAME) -+ $(AR) rc $(NAME) $(OBJ) -+ $(RANLIB) $(NAME) - @cp -p $(NAME) ../lib - - %.o : %.c $(DOTH) ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,21 +8,21 @@ - - it: - @if uname -s -r | grep -q "Linux" ; then \ -- make -f Makefile.linux $(NAME) ; fi -+ $(MAKE) -f Makefile.linux $(NAME) ; fi - @if uname -s -r | grep -q "Darwin" ; then \ -- make -f Makefile.macosx $(NAME) ; fi -+ $(MAKE) -f Makefile.macosx $(NAME) ; fi - @if uname -s -r | grep -q "SunOS 4" ; then \ -- make -f Makefile.sunos $(NAME) ; fi -+ $(MAKE) -f Makefile.sunos $(NAME) ; fi - @if uname -s -r | grep -q "SunOS 5" ; then \ -- make -f Makefile.solaris $(NAME) ; fi -+ $(MAKE) -f Makefile.solaris $(NAME) ; fi - @if uname -s -r | grep -q "OSF1" ; then \ -- make -f Makefile.osf1 $(NAME) ; fi -+ $(MAKE) -f Makefile.osf1 $(NAME) ; fi - @if uname -s -r | grep -q "IRIX" ; then \ -- make -f Makefile.irix5 $(NAME) ; fi -+ $(MAKE) -f Makefile.irix5 $(NAME) ; fi - @if uname -s -r | grep -q "FreeBSD" ; then \ -- make -f Makefile.freebsd $(NAME) ; fi -+ $(MAKE) -f Makefile.freebsd $(NAME) ; fi - @if uname -s -r | grep -q "NetBSD" ; then \ -- make -f Makefile.netbsd $(NAME) ; fi -+ $(MAKE) -f Makefile.netbsd $(NAME) ; fi - @cp -p $(NAME) ../bin - @cp -p cnet.h ../lib - -@@ -33,7 +33,7 @@ - @rm -rf HTML GPATH GRTAGS GSYMS GTAGS - - hide: -- make clean -+ $(MAKE) clean - echo '#if HIDE_GLOBAL_NAMES' > hidenames.h - sort < HIDENAMES | \ - awk '{ if($$0 !~ /#/) printf("#define\t%-36s\t__CN%03d\n", $$0,++n);}'\ diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/cnet/metadata.xml +++ b/net-analyzer/cnet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild index 0c94c1940d9e..a09503c512ea 100644 --- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild +++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild @@ -1,22 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="netcat clone extended with twofish encryption" -HOMEPAGE="http://cryptcat.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-unix-${PV}.tar" +inherit toolchain-funcs + +DESCRIPTION="Netcat clone extended with twofish encryption" +HOMEPAGE="https://cryptcat.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-unix-${PV}.tar" +S="${WORKDIR}"/unix LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -S=${WORKDIR}/unix +PATCHES=( + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${P}-misc.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - epatch "${FILESDIR}"/${P}-misc.patch + default tc-export CC CXX } diff --git a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch index 17ec33489c89..0b9c62b597f0 100644 --- a/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch +++ b/net-analyzer/cryptcat/files/cryptcat-1.2.1-build.patch @@ -1,5 +1,5 @@ ---- a/unix/Makefile -+++ b/unix/Makefile +--- a/Makefile ++++ b/Makefile @@ -10,16 +10,14 @@ # debugging # DFLAGS = -DTEST -DDEBUG diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml index 12086277ff16..c3e340e3461a 100644 --- a/net-analyzer/cryptcat/metadata.xml +++ b/net-analyzer/cryptcat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest index cc59c2538cd9..9cd1ba973c97 100644 --- a/net-analyzer/cutter/Manifest +++ b/net-analyzer/cutter/Manifest @@ -1,2 +1 @@ -DIST cutter-1.03.tgz 13176 BLAKE2B d879d849be77c34d3e1882cbe500be71e631a5047116828ab07f8ab07b5bbb853e19b6e8b7dd5c42a73ce7b5c2825228cbeae07ec875e83da7bd1bd1c6f34a7a SHA512 821e8abf496e22b86bdd855fb1c9c51648a276ebb572edd2ccb172ae7025a38794df37dfe153c1807785ecec279c34b9df5e2bcc2de582b3a88ee3776cf46eea DIST cutter-1.04.tgz 13680 BLAKE2B 373e5e0c0fb14224974ff399c7db0a69dc5568394a881be2c285437050a1ec4cfb26acbcdd593d22519f34a32760bdbe342a96c2a4d55547f7c06bc49806e228 SHA512 79c17ec8c17e696a79aa8b11fda347f2e6929eb35f9a37da450acf6aff7ab9471e13eaef24708f90f3f0c2791fade2eb944443b98df3d3ae4eef0c408abc7b3a diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild deleted file mode 100644 index 7e3806ff08d3..000000000000 --- a/net-analyzer/cutter/cutter-1.03-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" -HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" -SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -src_prepare() { - epatch "${FILESDIR}"/${P}-debian.patch - rm -f Makefile # implicit rules are better ;x -} - -src_compile() { - emake cutter CC="$(tc-getCC)" -} - -src_install() { - dosbin cutter - dodoc README - doman debian/cutter.8 -} diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild index f11002ca418e..ebe71d34d0bc 100644 --- a/net-analyzer/cutter/cutter-1.04.ebuild +++ b/net-analyzer/cutter/cutter-1.04.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers" HOMEPAGE="http://www.digitage.co.uk/digitage/software/linux-security/cutter" @@ -10,11 +11,18 @@ SRC_URI="http://www.digitage.co.uk/digitage/files/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-1.03-debian.patch + "${FILESDIR}"/${PN}-1.04-musl-if-ether.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-1.03-debian.patch - rm -f Makefile # implicit rules are better ;x + default + + # implicit rules are better ;x + rm -f Makefile || die } src_compile() { diff --git a/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch new file mode 100644 index 000000000000..fed8bc26ee02 --- /dev/null +++ b/net-analyzer/cutter/files/cutter-1.04-musl-if-ether.patch @@ -0,0 +1,12 @@ +https://git.alpinelinux.org/aports/tree/main/cutter/musl-fix.patch +https://bugs.gentoo.org/715994 +--- a/cutter.c ++++ b/cutter.c +@@ -47,7 +47,6 @@ + #include <linux/socket.h> + #include <linux/ip.h> + #include <linux/tcp.h> +-#include <linux/if_ether.h> + #include <fcntl.h> + #include <netpacket/packet.h> + #include <net/ethernet.h> /* the L2 protocols */ diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/cutter/metadata.xml +++ b/net-analyzer/cutter/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest index 0614aa5c743d..1a0ef22ae56d 100644 --- a/net-analyzer/darkstat/Manifest +++ b/net-analyzer/darkstat/Manifest @@ -1 +1 @@ -DIST darkstat-3.0.719.tar.bz2 117695 BLAKE2B b2aef3073aafaa42d006fd9ade652ea3542a5f238e347b219ee30e995915fa38b005161d26dff6a9a3e01e98b426ec14c32e1390592128d5816278e5f895f178 SHA512 264f6c5f862745fbfb5d125aae5a319369f028fd7be96cfb12775147f528a36b7f5a42bcd6434f2d376933292364641f2ec9cd9bdb1fe105f5a905e331181f98 +DIST darkstat-3.0.721.tar.gz 104050 BLAKE2B 1005bd3e40be59ad214c95908b34e70eb8b60e33a9b85ee3f6b7fa7f8f6691fad73234ef228ec529aaad0e8ad9eb07f0bdb9d08a560103af3cb377fd11765436 SHA512 077eec3cc69b021966d4545f408a7444136cedb8be1dbae96fb1ce94d9bcd3a1db3bf4ea1bed8999088b24f7e2ed333d1166fe39bf974f32772b8c8f6fde707c diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild deleted file mode 100644 index eb3e78e31c6c..000000000000 --- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user - -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=" - dev-libs/libbsd - net-libs/libpcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} -" - -DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} - -DOCS=( AUTHORS ChangeLog README NEWS ) - -src_prepare() { - default - - sed -i -e 's|-flto||g' configure.ac || die - - eautoreconf -} - -src_configure() { - econf --disable-debug --with-privdrop-user=darkstat -} - -src_install() { - default - - newinitd "${FILESDIR}"/darkstat-initd darkstat - newconfd "${FILESDIR}"/darkstat-confd darkstat - - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die - sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die - - keepdir "${DARKSTAT_CHROOT_DIR}" - chown darkstat:0 "${D}${DARKSTAT_CHROOT_DIR}" -} - -pkg_preinst() { - enewuser darkstat -} - -pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=`sed -n 's/^#CHROOT=\(.*\)/\1/p' "${ROOT}"etc/conf.d/darkstat` - chown darkstat:0 "${ROOT}${DARKSTAT_CHROOT_DIR}" - - elog "To start different darkstat instances which will listen on a different" - elog "interfaces create in /etc/init.d directory the 'darkstat.if' symlink to" - elog "darkstat script where 'if' is the name of the interface." - elog "Also in /etc/conf.d directory copy darkstat to darkstat.if" - elog "and edit it to change default values." - elog - elog "darkstat's default chroot directory is: \"${ROOT}${DARKSTAT_CHROOT_DIR}\"" -} diff --git a/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild new file mode 100644 index 000000000000..3e6de7f9ed76 --- /dev/null +++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Network traffic analyzer with cute web interface" +HOMEPAGE="https://unix4lyfe.org/darkstat/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/emikulic/darkstat" + inherit git-r3 +else + SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="amd64 ppc x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND="acct-user/darkstat + dev-libs/libbsd + net-libs/libpcap + sys-libs/zlib" +RDEPEND="${DEPEND}" + +DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} + +DOCS=( AUTHORS ChangeLog README.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch +) + +src_prepare() { + default + + sed -i \ + -e '/-DNDEBUG/d' \ + -e 's|-flto||g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + econf --with-privdrop-user=darkstat +} + +src_install() { + default + + newinitd "${FILESDIR}"/darkstat-initd darkstat + newconfd "${FILESDIR}"/darkstat-confd darkstat + + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die + + keepdir "${DARKSTAT_CHROOT_DIR}" + fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}" +} + +pkg_postinst() { + elog "To start different darkstat instances which will listen on a different" + elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to" + elog "darkstat script where 'if' is the name of the interface." + elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if" + elog "and edit it to change default values." + elog + elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat." + elog "Please chown it to darkstat:0 (or a different directory if you change it)." +} diff --git a/net-analyzer/darkstat/darkstat-9999999.ebuild b/net-analyzer/darkstat/darkstat-9999999.ebuild new file mode 100644 index 000000000000..dcd53be61eb1 --- /dev/null +++ b/net-analyzer/darkstat/darkstat-9999999.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Network traffic analyzer with cute web interface" +HOMEPAGE="https://unix4lyfe.org/darkstat/" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/emikulic/darkstat" + inherit git-r3 +else + SRC_URI="https://github.com/emikulic/darkstat/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~ppc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +DEPEND="acct-user/darkstat + dev-libs/libbsd + net-libs/libpcap + sys-libs/zlib" +RDEPEND="${DEPEND}" + +DARKSTAT_CHROOT_DIR=${DARKSTAT_CHROOT_DIR:-/var/lib/darkstat} + +DOCS=( AUTHORS ChangeLog README.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.0.719-strncpy-off-by-one.patch +) + +src_prepare() { + default + + sed -i \ + -e '/-DNDEBUG/d' \ + -e 's|-flto||g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + econf --with-privdrop-user=darkstat +} + +src_install() { + default + + newinitd "${FILESDIR}"/darkstat-initd darkstat + newconfd "${FILESDIR}"/darkstat-confd darkstat + + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/conf.d/darkstat || die + sed -i -e "s:__CHROOT__:${DARKSTAT_CHROOT_DIR}:g" "${D}"/etc/init.d/darkstat || die + + keepdir "${DARKSTAT_CHROOT_DIR}" + fowners darkstat:0 "${DARKSTAT_CHROOT_DIR}" +} + +pkg_postinst() { + # 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/files/darkstat-3.0.719-strncpy-off-by-one.patch b/net-analyzer/darkstat/files/darkstat-3.0.719-strncpy-off-by-one.patch new file mode 100644 index 000000000000..cab429c0ecec --- /dev/null +++ b/net-analyzer/darkstat/files/darkstat-3.0.719-strncpy-off-by-one.patch @@ -0,0 +1,11 @@ +--- a/localip.c ++++ b/localip.c +@@ -58,7 +58,7 @@ + } else { + /* Warn about changed address. */ + if (!addr_equal(ips->addrs + *idx, a)) { +- static char before[INET6_ADDRSTRLEN]; ++ static char before[INET6_ADDRSTRLEN + 1]; + strncpy(before, addr_to_str(ips->addrs + *idx), INET6_ADDRSTRLEN); + verbosef("interface '%s' address %d/%d changed from %s to %s", + iface, *idx+1, ips->num_addrs, before, addr_to_str(a)); diff --git a/net-analyzer/darkstat/files/darkstat-confd b/net-analyzer/darkstat/files/darkstat-confd index 3d95a0461a06..89e349e68868 100644 --- a/net-analyzer/darkstat/files/darkstat-confd +++ b/net-analyzer/darkstat/files/darkstat-confd @@ -6,10 +6,10 @@ # The port for the embedded webserver #PORT="667" -# The address embedded webserver should bind to +# The address the embedded webserver should bind to #ADDRESS="0.0.0.0" -# Set the filter. See tcpdump documenation for details. +# Set the filter. See tcpdump documentation for details. #FILTER="" # Log daily traffic statistics into the named file, relative to the diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml index c289cc9010db..7903d33acaf1 100644 --- a/net-analyzer/darkstat/metadata.xml +++ b/net-analyzer/darkstat/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> + <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> @@ -10,4 +10,7 @@ runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP. </longdescription> + <upstream> + <remote-id type="github">emikulic/darkstat</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/dhcp_probe/Manifest b/net-analyzer/dhcp_probe/Manifest index daa2b61e7d68..5ed1a3a8246e 100644 --- a/net-analyzer/dhcp_probe/Manifest +++ b/net-analyzer/dhcp_probe/Manifest @@ -1 +1 @@ -DIST dhcp_probe-1.3.0.tar.gz 211613 BLAKE2B cbcc43b292fe537216ef40de9e417c1f700be4ad5f34feacd9475eb31866b68957ce66c5abc47db3b7e5a0dc8751ca6e54200b79ab2f1f8c3f308f6c1c7aef4d SHA512 d643012529ee5149adbc0c1f19f8e579c55201e86de2aec9b3313be9412db4e973162f864d1baaf79fa340b7bd9a7385f0f1406d1b616e801ced3c7bb387c854 +DIST dhcp_probe-1.3.1.tar.gz 246238 BLAKE2B 86c079c4c7951f3a70ced20dbea5d4f0d716335d2f9a18b1b9986965ca0446b5a7b673c7e652405deceeef336218016418a86be1a76d452c7802061403a66e82 SHA512 1002683e6ceb3806289fa9e4879be3d957a9ddc42656d7114942708560f8efba0db058137e04cad092e5a083900987aa1f76c5a7c20db4b57c104dd6a6fcabb6 diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild deleted file mode 100644 index 3819fc35ca70..000000000000 --- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r4.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="discover DHCP and BootP servers on a directly-attached Ethernet network" -HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/" -SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - net-libs/libpcap - >=net-libs/libnet-1.1.2.1-r2 -" -RDEPEND="${DEPEND}" -DOCS=( - "${FILESDIR}"/${PN}_mail - AUTHORS - ChangeLog - NEWS - README - TODO - extras/dhcp_probe.cf.sample -) -PATCHES=( - "${FILESDIR}"/${PV}/01_dhcp_probe.5.patch - "${FILESDIR}"/${PV}/02_dhcp_probe.8.patch - "${FILESDIR}"/${PV}/03_implicit_point_conv_bootp.c.patch - "${FILESDIR}"/${PV}/04_linux_32_or_64bits.patch - "${FILESDIR}"/${PV}/05-cleanup.patch - "${FILESDIR}"/${PV}/06-return.patch - "${FILESDIR}"/${PV}/07-comment.patch - "${FILESDIR}"/${PV}/08-man8.patch -) - -src_configure() { - use amd64 && append-flags -D__ARCH__=64 - STRIP=true econf -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} -} diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild new file mode 100644 index 000000000000..c7d6357a1e18 --- /dev/null +++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Discover DHCP and BootP servers on a directly-attached Ethernet network" +HOMEPAGE="https://www.net.princeton.edu/software/dhcp_probe/" +SRC_URI="https://www.net.princeton.edu/software/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + net-libs/libnet + net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.1-respect-AR.patch + "${FILESDIR}"/${PN}-1.3.1-fix-configure-CPP.patch +) + +src_prepare() { + default + + # for AR patch + eautoreconf +} + +src_configure() { + # configure uses CPP + tc-export CPP + + use amd64 && append-cppflags -D__ARCH__=64 + + STRIP=true econf +} + +src_install() { + default + + dodoc extras/dhcp_probe.cf.sample "${FILESDIR}"/${PN}_mail + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} +} diff --git a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch b/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch deleted file mode 100644 index 2d5599c06224..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/01_dhcp_probe.5.patch +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_dhcp_probe.5.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change a syntax problem in groff file for hyphenation problem -## Note: -## Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>. -## This patch will be applied in the next version of the upstream code. - - -@DPATCH@ -diff -urNad trunk~/doc/dhcp_probe.cf.5 trunk/doc/dhcp_probe.cf.5 ---- trunk~/doc/dhcp_probe.cf.5 2009-03-30 14:53:40.000000000 +0200 -+++ trunk/doc/dhcp_probe.cf.5 2009-03-30 14:57:05.000000000 +0200 -@@ -472,10 +472,10 @@ - .PP - .RS - .nf ---p the name of the calling program (e.g. dhcp_probe), ---I the name of the interface on which the unexpected response packet was received ---i the IP source address of the packet ---m Ethernet source address of the packet -+\-p the name of the calling program (e.g. dhcp_probe), -+\-I the name of the interface on which the unexpected response packet was received -+\-i the IP source address of the packet -+\-m Ethernet source address of the packet - .fi - .RE - .PP -@@ -483,7 +483,7 @@ - .PP - .RS - .nf ---y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern" -+\-y the non-zero yiaddr value from the packet, when it falls inside a "Lease Network of Concern" - .fi - .RE - .PP -@@ -723,7 +723,7 @@ - # alert_program_name2 /absolute/path/name - # - # The program specified via 'alert_program_name2' will be called as follows: --# /absolute/path/name -p name_of_calling_program -I name_of_interface_on_which_the_response_was_received -i IP_source_of_the_response -m ether_src_of_the_response [-y yiaddr_when_in_lease_networks_of_concern] -+# /absolute/path/name \-p name_of_calling_program \-I name_of_interface_on_which_the_response_was_received \-i IP_source_of_the_response \-m ether_src_of_the_response [\-y yiaddr_when_in_lease_networks_of_concern] - # The options may appear in any order. - # The program must silently ignore any options or arguments it does not recognize, - # so as to be forward-compatible with future enhancements to dhcp_probe. diff --git a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch b/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch deleted file mode 100644 index d9d3d5aa898a..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/02_dhcp_probe.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_dhcp_probe.8.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Change a syntax problem in groff file for hyphenation problem -## Note: -## Submitted to upstream programmer Irwin Tillman<irwin@princeton.edu>. -## This patch will be applied in the next version of the upstream code. - - -@DPATCH@ -diff -urNad trunk~/doc/dhcp_probe.8 trunk/doc/dhcp_probe.8 ---- trunk~/doc/dhcp_probe.8 2009-03-30 14:53:40.000000000 +0200 -+++ trunk/doc/dhcp_probe.8 2009-03-30 15:18:09.000000000 +0200 -@@ -380,15 +380,15 @@ - file, - that program is executed, with the following required options: - .nf -- -p the name of the calling program (e.g. dhcp_probe) -- -I the name of the interface on which the unexpected response packet was received -- -i the IP source address of the packet -- -m and the Ethernet source address of the packet -+ \-p the name of the calling program (e.g. dhcp_probe) -+ \-I the name of the interface on which the unexpected response packet was received -+ \-i the IP source address of the packet -+ \-m and the Ethernet source address of the packet - .fi - If the response packet's yiaddr is non-zero and falls within a "Lease Networks of Concern", - the following optional options are also passed: - .nf -- -y the non-zero yiaddr value -+ \-y the non-zero yiaddr value - .fi - (We do not wait for the - .I alert_program_name2 diff --git a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch b/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch deleted file mode 100644 index 41af750416bf..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/03_implicit_point_conv_bootp.c.patch +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_implicit_point_conv_bootp.c.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix implicit Pointer Converstion in bootp.c file. -## Fix bug #529635 discovered by Dann Frazier <dannf@debian.org> -## - -@DPATCH@ -diff -urNad trunk~/src/bootp.c trunk/src/bootp.c ---- trunk~/src/bootp.c 2009-03-31 14:19:06.000000000 +0200 -+++ trunk/src/bootp.c 2009-05-21 09:51:26.000000000 +0200 -@@ -11,7 +11,7 @@ - #include "bootp.h" - #include "configfile.h" - #include "report.h" -- -+#include "utils.h" - - - diff --git a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch b/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch deleted file mode 100644 index dcd79ffc58b2..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/04_linux_32_or_64bits.patch +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_linux_32_or_64bits.dpatch by Laurent Guignard <lguignard.debian@gmail.com> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: A solution to solve the bug #535361 -## May be this will be a solution with the right method ??? - -@DPATCH@ -diff -urNad trunk~/src/get_myipaddr.c trunk/src/get_myipaddr.c ---- trunk~/src/get_myipaddr.c 2009-09-03 13:10:32.000000000 +0200 -+++ trunk/src/get_myipaddr.c 2009-09-03 13:15:39.671451172 +0200 -@@ -118,7 +118,21 @@ - #endif /* not STRUCT_SOCKADDR_HAS_SA_LEN */ - - /* increment ptr to next interface for next time through the loop */ -+#ifdef __ARCH__ /* Debian GNU/Linux behavior for packaging goal */ -+ switch(__ARCH__) { -+ case 32: /* 32 bits architectures */ -+ ptr += sizeof(ifr->ifr_name) + len; -+ break; -+ case 64: /* 64 bits architectures */ -+ ptr += sizeof(struct ifreq); -+ break; -+ default: /* Default dhcp_probe behavior */ -+ ptr += sizeof(ifr->ifr_name) + len; -+ break; -+ } -+#else /* Default dhcp_probe behavior */ - ptr += sizeof(ifr->ifr_name) + len; -+#endif - - if (strcmp(ifname, ifr->ifr_name) != 0 ) /* is this the interface we're looking for? */ - continue; diff --git a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch b/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch deleted file mode 100644 index 4151b461bbfd..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/05-cleanup.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig 2009-03-09 21:17:47.000000000 +0100 -+++ dhcp_probe-1.3.0/src/dhcp_probe.c 2009-11-19 18:09:26.000000000 +0100 -@@ -84,7 +84,6 @@ - struct sigaction sa; - FILE *pid_fp; - char *cwd = CWD; -- int i; - - int write_packet_len; - int bytes_written; -@@ -98,9 +97,6 @@ - int linktype; - char pcap_errbuf[PCAP_ERRBUF_SIZE], pcap_errbuf2[PCAP_ERRBUF_SIZE]; - -- /* for libnet */ -- char libnet_errbuf[LIBNET_ERRBUF_SIZE]; -- - /* get progname = last component of argv[0] */ - prog = strrchr(argv[0], '/'); - if (prog) -@@ -987,8 +983,6 @@ - Must not be called until after initial configuration is complete. - */ - -- int i; -- - if (! read_configfile(config_file)) { - my_exit(1, 1, 1); - } diff --git a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch b/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch deleted file mode 100644 index c27ad646e6c9..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/06-return.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcp_probe-1.3.0/src/dhcp_probe.c.orig 2009-11-19 18:13:31.000000000 +0100 -+++ dhcp_probe-1.3.0/src/dhcp_probe.c 2009-11-19 18:13:59.000000000 +0100 -@@ -684,6 +684,8 @@ - pcap_close(pd_template); - - my_exit(0, 1, 1); -+ -+ return 0; /* will not be reached */ - } - - diff --git a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch b/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch deleted file mode 100644 index c8184144a597..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/07-comment.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dhcp_probe-1.3.0/src/configfile.c.orig 2009-03-09 21:17:47.000000000 +0100 -+++ dhcp_probe-1.3.0/src/configfile.c 2009-11-19 18:17:03.000000000 +0100 -@@ -55,7 +55,7 @@ - - /* parallel arrays of "lease networks of concern" (address & mask), and number of elems in arrays. - We also precompute a parallel array of 'addr & mask' to save computing these repeatedly later. --/* If a response already identified as being from a rogue DHCP server contains a yiaddr field field -+ If a response already identified as being from a rogue DHCP server contains a yiaddr field field - that falls into one of these networks, it is reported as a matter of special concern. - */ - struct in_addr lease_networks_of_concern_addr[MAX_LEASE_NETWORKS_OF_CONCERN]; diff --git a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch b/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch deleted file mode 100644 index 56f8686eaebd..000000000000 --- a/net-analyzer/dhcp_probe/files/1.3.0/08-man8.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- dhcp_probe-1.3.0/doc/dhcp_probe.8.orig 2009-11-19 18:27:47.000000000 +0100 -+++ dhcp_probe-1.3.0/doc/dhcp_probe.8 2009-11-19 18:28:50.000000000 +0100 -@@ -141,7 +141,7 @@ - libraries. - .SH OPTIONS - .TP --.IB \-c \ config_file -+.BI \-c \ config_file - Specifies the configuration file. - If not specified, this defaults to - .BR /etc/dhcp_probe.cf . -@@ -253,7 +253,7 @@ - .B \-v - Display the program's version number, then exit. - .TP --.IB \-w \ cwd -+.BI \-w \ cwd - Specifies the working directory; shortly after starting the - program changes its current working directory to this. - If not specified, this defaults to diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch new file mode 100644 index 000000000000..fa32f0f73164 --- /dev/null +++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-fix-configure-CPP.patch @@ -0,0 +1,26 @@ +Before this patch, with CPP exported: +``` +checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found +checking how to run the C preprocessor... x86_64-pc-linux-gnu-gcc -E +./configure: 6512: ac_fn_c_try_cpp: not found +./configure: 6512: ac_fn_c_try_cpp: not found +configure: error: in `/var/tmp/portage/net-analyzer/dhcp_probe-1.3.1/work/dhcp_probe-1.3.1': +configure: error: C preprocessor "x86_64-pc-linux-gnu-gcc -E" fails sanity check +See `config.log' for more details +``` + +... and unexported: +``` +checking for inet_aton function prototype in arpa/inet.h... ./configure: 6386: CPP: not found +[... continues without dying ...] +``` +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB + AM_PROG_AR ++AC_PROG_CPP + + dnl ########################################################################## + diff --git a/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch new file mode 100644 index 000000000000..da32b63718ac --- /dev/null +++ b/net-analyzer/dhcp_probe/files/dhcp_probe-1.3.1-respect-AR.patch @@ -0,0 +1,10 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -15,6 +15,7 @@ dnl ########################################################################## + dnl Checks for programs. + AC_PROG_CC + AC_PROG_RANLIB ++AM_PROG_AR + + dnl ########################################################################## + diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml index c880ff99c6fe..d5af4bcfaf13 100644 --- a/net-analyzer/dhcp_probe/metadata.xml +++ b/net-analyzer/dhcp_probe/metadata.xml @@ -1,16 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription> - dchp_probe attempts to discover DHCP and BootP servers on a - directly-attached Ethernet network - </longdescription> </pkgmetadata> diff --git a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild index ef15429658e2..b7647756faa3 100644 --- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild +++ b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="DHCP Packet Analyzer/tcpdump postprocessor" HOMEPAGE="https://www.mavetju.org/unix/general.php" @@ -12,23 +13,22 @@ LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 arm ~mips x86" +# for pod2man +BDEPEND="dev-lang/perl" RDEPEND="net-libs/libpcap" -DEPEND=" - ${RDEPEND} - dev-lang/perl -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-Makefile.patch - epatch "${FILESDIR}"/${P}-debian.patch - epatch "${FILESDIR}"/${P}-endianness.patch -} +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-debian.patch + "${FILESDIR}"/${P}-endianness.patch +) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } -src_install () { +src_install() { dobin ${PN} doman ${PN}.8 dodoc CHANGES CONTACT diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml index f34967c0f990..4a2aa198f9ce 100644 --- a/net-analyzer/dhcpdump/metadata.xml +++ b/net-analyzer/dhcpdump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/dnsenum/Manifest b/net-analyzer/dnsenum/Manifest index fbfcc568646e..4b9d71389a55 100644 --- a/net-analyzer/dnsenum/Manifest +++ b/net-analyzer/dnsenum/Manifest @@ -1 +1,2 @@ DIST dnsenum-1.2.2.tar.gz 902708 BLAKE2B 4ce8b9b4f641949f9d06f60e452b3c9cfc32819a6d3aa0bdcbb37c58ef22b2dcfd4b3805e5b9a1a264326ddf1f24e4b68b6cb8b2bc7ee4f7ac5ae11017da8aab SHA512 3915be8e3ddf1102520594fcb1a41506401c662175455414226165e473844fa94f8577e68395586bfbf7e97b7c5a29e20e1ad63bb40a214c53e141afe66eddd6 +DIST dnsenum-1.3.1.tar.gz 21452 BLAKE2B e2ef22d2c001294a4c5417a571ed647b97cdf76af8534b4ff9648405d086c47aa39ca646e7b134122a085b97f2c6698ccb6d6e198cb564255c7f4d8df4838a78 SHA512 26cec4056ae787ee297868e58ca384946e1edb80be36b0a92beca846a8abb9be21963295cb2cc3349d9ec765b30b308f3721347d24208481c35dce371c32db97 diff --git a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild index ac19ef55f4d4..7df960e72a02 100644 --- a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild +++ b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://dnsenum.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" RDEPEND=" dev-perl/Net-DNS diff --git a/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild b/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild new file mode 100644 index 000000000000..30be96ccd221 --- /dev/null +++ b/net-analyzer/dnsenum/dnsenum-1.3.1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A perl script to enumerate DNS from a server" +HOMEPAGE="https://github.com/SparrowOchon/dnsenum2" +SRC_URI="https://github.com/SparrowOchon/dnsenum2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-perl/HTML-Parser + dev-perl/Net-DNS + dev-perl/Net-IP + dev-perl/Net-Netmask + dev-perl/Net-Whois-IP + dev-perl/String-Random + dev-perl/WWW-Mechanize + dev-perl/XML-Writer" + +S="${WORKDIR}/${PN}2-${PV}" + +src_prepare() { + default + sed -i -e "s:dnsenum\.pl:dnsenum:g" dnsenum.pl || die +} + +src_install() { + emake DESTDIR="${D}" INSTALL_DEPS=0 install + dodoc README.md +} diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml index 376c468e9d5c..73183f603795 100644 --- a/net-analyzer/dnsenum/metadata.xml +++ b/net-analyzer/dnsenum/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> <upstream> - <remote-id type="github">fwaeytens/dnsenum</remote-id> + <remote-id type="github">SparrowOchon/dnsenum2</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/dnsmap/Manifest b/net-analyzer/dnsmap/Manifest index dd7b978d1f47..fe087b1eb9a2 100644 --- a/net-analyzer/dnsmap/Manifest +++ b/net-analyzer/dnsmap/Manifest @@ -1 +1 @@ -DIST dnsmap-0.35.tar.gz 73584 BLAKE2B 15de8771f8add66d2598996961cae06670ebf9009d575ad3eaee6e7300163fbc84abf6e9082791de155a9daf5581cf2daf568a7a85a4a55adbf0c81e92639e94 SHA512 9a1bc25500dde22f2c641cd41a83e634dffda06fdfd62d439b9b8656f5e7624ab1d4736ed0d375acc24fb3f12091f7f75190fd97c4b7fa3c237baa0ade871ca1 +DIST dnsmap-0.36.tar.gz 73782 BLAKE2B 94d6aa024979805c81dc5160b213a9e32297283f6b35f91e8eb376db83b5f3627783491530a89d24bbba740ba48870b0073910a1773242f0caedfcfd71e93ef2 SHA512 60f0602314ea6f2b8c16bda1d1d47110c4b2a16f32174882e4406b4ccece39001527337f6ba40da65524287d005c1611e4c14e6a1ec99b25e50f4a20c7e6577f diff --git a/net-analyzer/dnsmap/dnsmap-0.35.ebuild b/net-analyzer/dnsmap/dnsmap-0.36.ebuild index d6cb5787b332..ccfe8b6421d6 100644 --- a/net-analyzer/dnsmap/dnsmap-0.35.ebuild +++ b/net-analyzer/dnsmap/dnsmap-0.36.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools DESCRIPTION="Scan for subdomains using bruteforcing techniques" @@ -23,9 +24,6 @@ DOCS=( src_prepare() { default - eautoreconf -} -src_install() { - default + eautoreconf } diff --git a/net-analyzer/dnsmap/metadata.xml b/net-analyzer/dnsmap/metadata.xml index 825589988b40..9c17f50421ee 100644 --- a/net-analyzer/dnsmap/metadata.xml +++ b/net-analyzer/dnsmap/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/dnsmap</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest index d56ed9d51848..fcc834eb16f2 100644 --- a/net-analyzer/dnstracer/Manifest +++ b/net-analyzer/dnstracer/Manifest @@ -1 +1 @@ -DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473 +DIST dnstracer-1.10.tar.gz 19169 BLAKE2B 8d549f7968b313778f4ee28a5dae0d782b23ff6ce874d343c079c178e9e7516d37af61c14ac6d4f00888dffa98f50768acd2d3fa2d221358d4db8aea82bc830f SHA512 8174f92c5c1b300c1011a24f0cf2f16dc2b52a082729e52d1033a047e20d132d6005b89618ecbbd25cbdc1c95cdc0748cf666bdc56b769b240d8885469bc6e05 diff --git a/net-analyzer/dnstracer/dnstracer-1.10.ebuild b/net-analyzer/dnstracer/dnstracer-1.10.ebuild new file mode 100644 index 000000000000..6635e2f464c2 --- /dev/null +++ b/net-analyzer/dnstracer/dnstracer-1.10.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Determines where a given nameserver gets its information from" +HOMEPAGE="https://www.mavetju.org/unix/general.php" +SRC_URI="https://www.mavetju.org/download/${P}.tar.bz2 -> ${P}.tar.gz" +S="${WORKDIR}/${PN}" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" + +BDEPEND="dev-lang/perl" + +PATCHES=( + "${FILESDIR}"/${PN}-1.9-argv0.patch +) + +src_compile() { + emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" +} + +src_install() { + dobin ${PN} + doman ${PN}.8 + + dodoc CHANGES CONTACT README +} diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild deleted file mode 100644 index 2db5b7bd0e74..000000000000 --- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Determines where a given nameserver gets its information from" -HOMEPAGE="http://www.mavetju.org/unix/general.php" -SRC_URI="http://www.mavetju.org/download/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux" -IUSE="ipv6" - -DOCS=( CHANGES README ) -PATCHES=( - "${FILESDIR}"/${PN}-1.9-argv0.patch -) - -src_configure() { - econf $(use_enable ipv6) -} diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/dnstracer/metadata.xml +++ b/net-analyzer/dnstracer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/dosdetector/Manifest b/net-analyzer/dosdetector/Manifest deleted file mode 100644 index 51cee04f0987..000000000000 --- a/net-analyzer/dosdetector/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST dosdetector-20060621.tar.gz 164768 BLAKE2B 467b6f45fadecfc6260e90797b7bd5eba042860bdc42ef5aed7538ac70259bd2d34ccecadb46255c02488aef4e929d7eb1cc49884ef649210006aa8ef267965a SHA512 30b6980920920a05668165a1c3dcbd07a94f964367d5f48ca443e017806cfcce85a11ad57183d3cc29ac06e8a1ef122227187f6cacd237fe327db4a768b992f6 diff --git a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild deleted file mode 100644 index 81aecb194510..000000000000 --- a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it" -HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/" -SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-isdigit.patch \ - "${FILESDIR}"/${P}-sizeof.patch -} diff --git a/net-analyzer/dosdetector/dosdetector-20060621.ebuild b/net-analyzer/dosdetector/dosdetector-20060621.ebuild deleted file mode 100644 index c7d8681ca3b5..000000000000 --- a/net-analyzer/dosdetector/dosdetector-20060621.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it" -HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/" -SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 x86" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-isdigit.patch -} diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch deleted file mode 100644 index 11cd3170ded9..000000000000 --- a/net-analyzer/dosdetector/files/dosdetector-20060621-isdigit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/dos.h -+++ b/include/dos.h -@@ -26,6 +26,7 @@ - #include <net/ppp_defs.h> - #include <sys/ioctl.h> - #include <time.h> -+#include <ctype.h> /* isdigit() */ - - /* - #define DEBUG_TREE 1 diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch deleted file mode 100644 index aea9cfba19ee..000000000000 --- a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/main.c -+++ b/src/main.c -@@ -306,8 +306,6 @@ - hosts = calloc(2, sizeof(struct host)); - rules = calloc(1, sizeof(struct rule)); - rules_num = 0; -- bzero(hosts, sizeof(hosts)); -- bzero(rules, sizeof(rules)); - - /* Init rules table */ - if (init_rules(opt.rules) != 0) { diff --git a/net-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/dosdetector/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest index bfbea558151d..51e6594562f5 100644 --- a/net-analyzer/driftnet/Manifest +++ b/net-analyzer/driftnet/Manifest @@ -1 +1 @@ -DIST driftnet-0.1.6_p20090401.tar.gz 43683 BLAKE2B a3f5c57c5f57247feca37815b84630422f9fdb9ec978791eadaaf0f0b51d1f744674931ea9bb1b9291fc9e556ec9758ff44210a442d219ceeabf71e0ea3a193f SHA512 93b2f7b644603bf2fea09163c3c8cc6eed7ed61f3ad7f6770a754e1a31afde5a75e27464c399261bfdafbe37729f201e6bbcb06bb6c59bf52ac0ede4393a15fa +DIST driftnet-1.3.0.tar.gz 4971618 BLAKE2B 1cf0a46caac2267c093bf21a0d8e150518dbfe0e76acbe21ef87cd760ccbe964313116ee24d25ad7759b3eeba19ef7925200caee4fd06bb28f9836217d889256 SHA512 45f1016a850cf9e5e294756e47e40eccb13f57a316ae7fa885eac2d5e53f68b9d9ef86868415eca76b108f7aa1f4080c550a91f789265edb0f6e3a55e05f5f0c diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild deleted file mode 100644 index 6e4749e79a26..000000000000 --- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils fcaps flag-o-matic toolchain-funcs - -DESCRIPTION="Listen to network traffic and pick out images from TCP streams observed" -HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" -SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm64 ppc -sparc x86" -SLOT="0" -IUSE="gtk mp3 suid" - -CDEPEND=" - net-libs/libpcap - gtk? ( - x11-libs/gtk+:2 - virtual/jpeg:0 - media-libs/giflib:= - media-libs/libpng:= - ) -" - -DEPEND=" - ${CDEPEND} - virtual/pkgconfig -" -RDEPEND=" - ${CDEPEND} - mp3? ( media-sound/mpg123 ) -" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.1.6-giflib-5.patch - - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - - # With newer libpng, --cflags causes build failures. - sed -i \ - -e 's:pkg-config --cflags libpng:$(PKG_CONFIG) --libs libpng:' \ - -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:g' \ - Makefile || die -} - -src_compile() { - tc-export CC PKG_CONFIG - - if use gtk; then - emake - mv driftnet driftnet-gtk || die - emake clean - fi - - # build a non-gtk version for all users - sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed" - append-flags -DNO_DISPLAY_WINDOW - emake -} - -src_install() { - dosbin driftnet - doman driftnet.1 - - use gtk && dosbin driftnet-gtk - - dodoc CHANGES CREDITS README TODO - - if use suid ; then - elog "marking the no-display driftnet as setuid root." - fowners root:wheel "/usr/sbin/driftnet" - fperms 710 "/usr/sbin/driftnet" - fperms u+s "/usr/sbin/driftnet" - fi -} - -pkg_postinst() { - fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/sbin/driftnet - use gtk && fcaps cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/sbin/driftnet-gtk -} diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild deleted file mode 100644 index 22cf099f37a2..000000000000 --- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes" -HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" -SRC_URI="https://github.com/downloads/rbu/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ppc -sparc x86" -SLOT="0" -IUSE="gtk mp3 suid" - -CDEPEND="net-libs/libpcap - gtk? ( x11-libs/gtk+:2 - virtual/jpeg - media-libs/giflib - media-libs/libpng )" - -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - mp3? ( media-sound/mpg123 )" - -src_prepare() { - sed -i \ - -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ - png.c || die - # With newer libpng, --cflags causes build failures. - sed -i \ - -e 's:pkg-config --cflags libpng:pkg-config --libs libpng:' \ - Makefile || die -} - -src_compile() { - export CC=$(tc-getCC) - if use gtk; then - emake - mv driftnet driftnet-gtk || die - emake clean - fi - - # build a non-gtk version for all users - sed -i 's:^\(.*gtk.*\)$:#\1:g' Makefile || die "sed disable gtk failed" - append-flags -DNO_DISPLAY_WINDOW - emake -} - -src_install () { - dosbin driftnet - doman driftnet.1 - - use gtk && dosbin driftnet-gtk - - dodoc CHANGES CREDITS README TODO - - if use suid ; then - elog "marking the no-display driftnet as setuid root." - fowners root:wheel "/usr/sbin/driftnet" - fperms 710 "/usr/sbin/driftnet" - fperms u+s "/usr/sbin/driftnet" - fi -} diff --git a/net-analyzer/driftnet/driftnet-1.3.0.ebuild b/net-analyzer/driftnet/driftnet-1.3.0.ebuild new file mode 100644 index 000000000000..3d2fa78cc783 --- /dev/null +++ b/net-analyzer/driftnet/driftnet-1.3.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fcaps + +DESCRIPTION="Watches network traffic and displays media from TCP streams observed" +HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/" +SRC_URI="https://github.com/deiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="amd64 ~arm64 ppc -sparc x86" +SLOT="0" +IUSE="debug gtk suid test" + +RDEPEND=" + net-libs/libpcap + net-libs/libwebsockets:=[client,http-proxy,socks5] + gtk? ( + media-libs/giflib:= + media-libs/libpng:= + virtual/jpeg:0 + x11-libs/gtk+:2 + ) +" +BDEPEND=" + virtual/pkgconfig +" +DEPEND=" + ${RDEPEND} + test? ( dev-util/cmocka ) +" +RESTRICT="!test? ( test )" +DOCS=" + Changelog CREDITS README.md TODO +" +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0-CFLAGS.patch + "${FILESDIR}"/${PN}-1.3.0-gtk.patch + "${FILESDIR}"/${PN}-1.3.0-musl-stdint.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable gtk display) +} + +src_install() { + default + + gzip -d "${ED}"/usr/share/man/man1/${PN}.1.gz || die + + if use suid ; then + elog "marking the no-display driftnet as setuid root." + fowners root:wheel "/usr/bin/driftnet" + fperms 710 "/usr/bin/driftnet" + fperms u+s "/usr/bin/driftnet" + fi +} + +pkg_postinst() { + fcaps \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/driftnet +} diff --git a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch b/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch deleted file mode 100644 index 30ad62c38f47..000000000000 --- a/net-analyzer/driftnet/files/driftnet-0.1.6-giflib-5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/gif.c -+++ b/gif.c -@@ -20,7 +20,12 @@ - */ - int gif_load_hdr(img I) { - GifFileType *g; -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ g = I->us = DGifOpenFileHandle(fileno(I->fp), GifError); -+#else - g = I->us = DGifOpenFileHandle(fileno(I->fp)); -+#endif /* GIFLIB_MAJOR */ - if (!I->us) { - I->err = IE_HDRFORMAT; - return 0; -@@ -36,7 +41,12 @@ - * Abort loading a GIF file after the header is done. - */ - int gif_abort_load(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+ DGifCloseFile((GifFileType*)I->us, GifError); -+#else - DGifCloseFile((GifFileType*)I->us); -+#endif /* GIFLIB_MAJOR */ - return 1; - } - -@@ -44,6 +54,9 @@ - * Load GIF image. - */ - int gif_load_img(img I) { -+#if GIFLIB_MAJOR > 4 -+ int *GifError = NULL; -+#endif /* GIFLIB_MAJOR */ - GifFileType *g = I->us; - struct SavedImage *si; - int ret = 0; -@@ -114,7 +127,11 @@ - ret = 1; - fail: - -+#if GIFLIB_MAJOR > 4 -+ DGifCloseFile(g, GifError); -+#else - DGifCloseFile(g); -+#endif /* GIFLIB_MAJOR */ - - return ret; - } diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch new file mode 100644 index 000000000000..2b25ed45833a --- /dev/null +++ b/net-analyzer/driftnet/files/driftnet-1.3.0-CFLAGS.patch @@ -0,0 +1,21 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -68,12 +68,12 @@ + , + [enable_debug=yes]) + +-if test "x$enable_debug" = xyes; then +- CFLAGS="-O2 -g -DDEBUG" +-else +- CFLAGS="-O2 -DNDEBUG" +-fi +-#AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") ++#if test "x$enable_debug" = xyes; then ++# CFLAGS="-O2 -g -DDEBUG" ++#else ++# CFLAGS="-O2 -DNDEBUG" ++#fi ++AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes") + + # + # Checks for programs. diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch new file mode 100644 index 000000000000..2a8a294e8dbe --- /dev/null +++ b/net-analyzer/driftnet/files/driftnet-1.3.0-gtk.patch @@ -0,0 +1,13 @@ +--- a/src/options.h ++++ b/src/options.h +@@ -32,10 +32,8 @@ + char *audio_mpeg_player; + int mpeg_player_specified; + int newpfx; +-#ifndef NO_DISPLAY_WINDOW + char *savedimgpfx; + int enable_gtk_display; +-#endif + char *drop_username; + int list_interfaces; + int monitor_mode; diff --git a/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch new file mode 100644 index 000000000000..7261bbc80e16 --- /dev/null +++ b/net-analyzer/driftnet/files/driftnet-1.3.0-musl-stdint.patch @@ -0,0 +1,113 @@ +https://bugs.gentoo.org/832419 +--- a/src/media/image.c ++++ b/src/media/image.c +@@ -11,6 +11,7 @@ + + #include <stdio.h> + #include <stdlib.h> /* On many systems (Darwin...), stdio.h is a prerequisite. */ ++#include <stdint.h> + #include <string.h> + + #include <netinet/in.h> /* ntohl */ +@@ -288,7 +289,7 @@ unsigned char *find_jpeg_image(const unsigned char *data, const size_t len, unsi + unsigned char *find_png_eoi(unsigned char *buffer, const size_t len) { + unsigned char *end_data, *data, chunk_code[PNG_CODE_LEN + 1]; + struct png_chunk chunk; +- u_int32_t datalen; ++ uint32_t datalen; + + /* Move past the PNG header */ + data = (buffer + PNG_SIG_LEN); +--- a/src/network/layer2.c ++++ b/src/network/layer2.c +@@ -12,6 +12,7 @@ + + #include "compat/compat.h" + ++#include <stdint.h> + #include <string.h> + + #ifdef __FreeBSD__ +@@ -39,7 +40,7 @@ + struct ethhdr { + unsigned char h_dest[ETH_ALEN]; + unsigned char h_source[ETH_ALEN]; +- u_int16_t h_proto; ++ uint16_t h_proto; + } __attribute__((packed)); + #endif + +@@ -55,20 +56,20 @@ struct ethhdr { + #endif + + struct ieee80211_radiotap_header { +- u_int8_t it_version; /* set to 0 */ +- u_int8_t it_pad; +- u_int16_t it_len; /* entire length */ +- u_int32_t it_present; /* fields present */ ++ uint8_t it_version; /* set to 0 */ ++ uint8_t it_pad; ++ uint16_t it_len; /* entire length */ ++ uint32_t it_present; /* fields present */ + }; + + struct ieee80211_frame { +- u_int16_t fc; +- u_int16_t wi_duration; +- u_int8_t wi_add1[6]; +- u_int8_t wi_add2[6]; +- u_int8_t wi_add3[6]; +- u_int16_t wi_sequenceControl; +- // u_int8_t wi_add4[6]; ++ uint16_t fc; ++ uint16_t wi_duration; ++ uint8_t wi_add1[6]; ++ uint8_t wi_add2[6]; ++ uint8_t wi_add3[6]; ++ uint16_t wi_sequenceControl; ++ // uint8_t wi_add4[6]; + //unsigned int qosControl:2; + //unsigned int frameBody[23124]; + }; +@@ -89,13 +90,13 @@ struct frame_control { + + /* SNAP LLC header format */ + struct snap_header { +- u_int8_t dsap; +- u_int8_t ssap; +- u_int8_t ctl; +- u_int8_t org1; +- u_int8_t org2; +- u_int8_t org3; +- u_int16_t ether_type; /* ethernet type */ ++ uint8_t dsap; ++ uint8_t ssap; ++ uint8_t ctl; ++ uint8_t org1; ++ uint8_t org2; ++ uint8_t org3; ++ uint16_t ether_type; /* ethernet type */ + }; + + /* +--- a/src/network/layer3.c ++++ b/src/network/layer3.c +@@ -12,6 +12,7 @@ + + #include "compat/compat.h" + ++#include <stdint.h> + #include <string.h> + #include <assert.h> + +@@ -30,8 +31,8 @@ + int layer3_find_tcp(const u_char *pkt, uint8_t nextproto, int * offset, + struct sockaddr * src, struct sockaddr * dst, struct tcphdr * tcp) + { +- u_int16_t *sport = NULL; +- u_int16_t *dport = NULL; ++ uint16_t *sport = NULL; ++ uint16_t *dport = NULL; + + while (1) { + switch (nextproto) { diff --git a/net-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml index 56038b1c27ca..dce3f3be66c0 100644 --- a/net-analyzer/driftnet/metadata.xml +++ b/net-analyzer/driftnet/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription>A program which listens to network traffic and picks out images from TCP streams it observes</longdescription> </pkgmetadata> diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest new file mode 100644 index 000000000000..f299e852f03d --- /dev/null +++ b/net-analyzer/dsniff/Manifest @@ -0,0 +1,3 @@ +DIST dsniff_2.4b1+debian-30.debian.tar.xz 30788 BLAKE2B 8605b1dcca36f626f31410d88d25a57e6661b57b941155cdbde951991b09fb2dd7c147b1fdd1a22eded1cf904c890317b1844a7829cd6e43fd2fc5defc79b5f3 SHA512 45ffe34fcd30cd1461a354891b9d5567038cc176dbfa79c67020075cd40ae09b7092954925019e583d0d69cae76a558049b489745454a8034ce3e9e832c58f64 +DIST dsniff_2.4b1+debian-31.debian.tar.xz 30848 BLAKE2B 46bdfa08170fbfbba35fcc67340fc35352ef276dd5e8e00a540da39d28364c3198198eefeb6b85cb05e74d3785fc61c7e8e58d6ce37e0b62e6018e4842d938ad SHA512 da927bb887db6761a07dc2460bdeb834b386ccc5b8aa50ebce804ee130f89379268412cddd83ad64cc763e98e2f42a7efc23b7ca77db59445533272cb408088f +DIST dsniff_2.4b1+debian.orig.tar.gz 130220 BLAKE2B e6953a5bfc5331b030e1a5335987c51fa4cf2c644fc4e7ac9aefe17f52373a1f66ccef36c5d9136542f68a475350138b1f3e501bc9494a0fd4988c7c5a7b2eef SHA512 09c3a864f112f81b8fdf93436886b14eb8f603ec751b13f18cf027307f24098c018eacf98b3ae353731a0cf6f1c9cacfafbb534a0db8b9f0cc793e7515c41b5a diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild new file mode 100644 index 000000000000..adb46e181081 --- /dev/null +++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p30.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_p*/}" +MY_PV="$(ver_rs 1 '.' "${MY_PV}")" +# 2.4_beta1_p30 -> 2.4beta1-30 +MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)" + +DESCRIPTION="A collection of tools for network auditing and penetration testing" +HOMEPAGE="https://monkey.org/~dugsong/dsniff/" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${P/_beta1*/}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="X" + +# There's a berkdb configure option but we get a build failure if +# we try to disable it. Not clear how useful the package is +# without it anyway. +RDEPEND="net-libs/libpcap + >=net-libs/libnet-1.1.2.1-r1 + >=net-libs/libnids-1.21 + net-libs/libnsl:= + net-libs/libtirpc:= + dev-libs/openssl:= + >=sys-libs/db-4:= + X? ( x11-libs/libXmu )" +DEPEND="${DEPEND} + net-libs/rpcsvc-proto" +# Calls rpcgen during build +BDEPEND="net-libs/rpcsvc-proto" + +PATCHES=( + "${WORKDIR}"/debian/patches/ + "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + $(use_with X x) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake install install_prefix="${D}" + + dodir /etc/dsniff + cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \ + "${ED}"/etc/dsniff/ || die + dodoc CHANGES README TODO +} diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild new file mode 100644 index 000000000000..f7cbbc6b9514 --- /dev/null +++ b/net-analyzer/dsniff/dsniff-2.4_beta1_p31.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools toolchain-funcs + +MY_PV="${PV/_beta/b}" +MY_PV="${MY_PV/_p*/}" +MY_PV="$(ver_rs 1 '.' "${MY_PV}")" +# 2.4_beta1_p30 -> 2.4beta1-30 +MY_DEB_PV="$(ver_cut 1-2)$(ver_cut 3-4)-$(ver_cut 6)" + +DESCRIPTION="A collection of tools for network auditing and penetration testing" +HOMEPAGE="https://monkey.org/~dugsong/dsniff/" +SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian.orig.tar.gz + mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${MY_PV}+debian-${PV/*_p}.debian.tar.xz" +S="${WORKDIR}/${P/_beta1*/}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="X" + +# There's a berkdb configure option but we get a build failure if +# we try to disable it. Not clear how useful the package is +# without it anyway. +RDEPEND="net-libs/libpcap + >=net-libs/libnet-1.1.2.1-r1 + >=net-libs/libnids-1.21 + net-libs/libnsl:= + net-libs/libtirpc:= + dev-libs/openssl:= + >=sys-libs/db-4:= + X? ( x11-libs/libXmu )" +DEPEND="${DEPEND} + net-libs/rpcsvc-proto" +# Calls rpcgen during build +BDEPEND="net-libs/rpcsvc-proto" + +PATCHES=( + "${WORKDIR}"/debian/patches/ + "${FILESDIR}"/${PN}-2.4_beta1_p30-httppostfix.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-libdir-configure.patch + "${FILESDIR}"/${PN}-2.4_beta1_p30-respect-AR.patch + "${FILESDIR}"/${PN}-2.4_beta1_p31-c99-fixes.patch +) + +src_prepare() { + default + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + tc-export AR + + econf \ + $(use_with X x) +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + emake install install_prefix="${D}" + + dodir /etc/dsniff + cp "${ED}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \ + "${ED}"/etc/dsniff/ || die + dodoc CHANGES README TODO +} diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch new file mode 100644 index 000000000000..487e45321662 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-httppostfix.patch @@ -0,0 +1,21 @@ +Allow mixed case in some fields. +--- a/decode_http.c ++++ b/decode_http.c +@@ -139,14 +139,14 @@ + host = p; + } + else if (req[0] == 'P') { +- if (strncmp(p, "Content-type: ", 14) == 0) { +- if (strncmp(p + 14, "application/" ++ if (strncasecmp(p, "Content-type: ", 14) == 0) { ++ if (strncasecmp(p + 14, "application/" + "x-www-form-urlencoded", + 33) != 0) { + query = NULL; + } + } +- else if (strncmp(p, "Content-length: ", 16) == 0) { ++ else if (strncasecmp(p, "Content-length: ", 16) == 0) { + p += 16; + i = atoi(p); + if ((msg = buf_tok(&inbuf, NULL, i)) == NULL) diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch new file mode 100644 index 000000000000..a2309cd836e8 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-libdir-configure.patch @@ -0,0 +1,105 @@ +Respect libdir rather than always using 'lib'. +--- a/configure.in ++++ b/configure.in +@@ -127,13 +127,13 @@ AC_ARG_WITH(db, + if test -f ${dir}/include/db_185.h; then + AC_DEFINE(HAVE_DB_185_H) + DBINC="-I${dir}/include" +- DBLIB="-L${dir}/lib -ldb" ++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb" + have_db=yes + break + elif test -f ${dir}/include/db.h; then + AC_DEFINE(HAVE_DB_H) + DBINC="-I${dir}/include" +- DBLIB="-L${dir}/lib -ldb" ++ DBLIB="-L${dir}/${libdir#${prefix}} -ldb" + have_db=yes + break + fi +@@ -178,11 +178,11 @@ AC_ARG_WITH(libpcap, + PCAPLIB="-L$withval -lpcap" + elif test -f $withval/include/pcap.h -a \ + -f $withval/include/net/bpf.h -a \ +- -f $withval/lib/libpcap.a; then ++ -f $withval/${libdir#${prefix}}/libpcap.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" +- PCAPLIB="-L$withval/lib -lpcap" ++ PCAPLIB="-L$withval/${libdir#${prefix}} -lpcap" + else + AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) + fi +@@ -190,7 +190,7 @@ AC_ARG_WITH(libpcap, + esac ], + [ if test -f ${prefix}/include/pcap.h; then + PCAPINC="-I${prefix}/include" +- PCAPLIB="-L${prefix}/lib -lpcap" ++ PCAPLIB="-L${prefix}/${libdir#${prefix}} -lpcap" + elif test -f /usr/include/pcap/pcap.h; then + PCAPINC="-I/usr/include/pcap" + PCAPLIB="-lpcap" +@@ -226,7 +226,7 @@ AC_ARG_WITH(libnet, + CFLAGS="$CFLAGS `libnet-config --defines`" + fi + LNETINC="-I$withval/include" +- LNETLIB="-L$withval/lib -lnet" ++ LNETLIB="-L$withval/${libdir#${prefix}} -lnet" + else + AC_ERROR(libnet.h or libnet.a not found in $withval) + fi +@@ -235,7 +235,7 @@ AC_ARG_WITH(libnet, + [ if test -f ${prefix}/include/libnet.h; then + CFLAGS="$CFLAGS `${prefix}/bin/libnet-config --defines`" + LNETINC="-I${prefix}/include" +- LNETLIB="-L${prefix}/lib -lnet" ++ LNETLIB="-L${prefix}/${libdir#${prefix}} -lnet" + elif test -f /usr/include/libnet.h; then + CFLAGS="$CFLAGS `libnet-config --defines`" + LNETLIB="-lnet" +@@ -267,7 +267,7 @@ AC_ARG_WITH(libnids, + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + NIDSINC="-I$withval/include" +- NIDSLIB="-L$withval/lib -lnids" ++ NIDSLIB="-L$withval/${libdir#${prefix}} -lnids" + else + AC_ERROR(nids.h or libnids.a not found in $withval) + fi +@@ -275,7 +275,7 @@ AC_ARG_WITH(libnids, + esac ], + [ if test -f ${prefix}/include/nids.h; then + NIDSINC="-I${prefix}/include" +- NIDSLIB="-L${prefix}/lib -lnids" ++ NIDSLIB="-L${prefix}/${libdir#${prefix}} -lnids" + elif test -f /usr/include/nids.h; then + NIDSLIB="-lnids" + else +@@ -309,11 +309,11 @@ AC_ARG_WITH(openssl, + SSLINC="-I$withval/include" + SSLLIB="-L$withval -lssl -lcrypto" + elif test -f $withval/include/openssl/ssl.h -a \ +- -f $withval/lib/libssl.a; then ++ -f $withval/${libdir#${prefix}}/libssl.a; then + owd=`pwd` + if cd $withval; then withval=`pwd`; cd $owd; fi + SSLINC="-I$withval/include" +- SSLLIB="-L$withval/lib -lssl -lcrypto" ++ SSLLIB="-L$withval/${libdir#${prefix}} -lssl -lcrypto" + else + AC_ERROR(ssl.h or libssl.a not found in $withval) + fi +@@ -322,10 +322,10 @@ AC_ARG_WITH(openssl, + esac ], + [ if test -f ${prefix}/include/openssl/ssl.h; then + SSLINC="-I${prefix}/include" +- SSLLIB="-L${prefix}/lib -lssl -lcrypto" ++ SSLLIB="-L${prefix}/${libdir#${prefix}} -lssl -lcrypto" + elif test -f ${prefix}/ssl/include/openssl/ssl.h; then + SSLINC="-I${prefix}/ssl/include" +- SSLLIB="-L${prefix}/ssl/lib -lssl -lcrypto" ++ SSLLIB="-L${prefix}/ssl/${libdir#${prefix}} -lssl -lcrypto" + elif test -f /usr/include/openssl/ssl.h; then + SSLLIB="-lssl -lcrypto" + else diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch new file mode 100644 index 000000000000..fd2235fada7d --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p30-respect-AR.patch @@ -0,0 +1,22 @@ +Respect the 'AR' environment variable. +--- a/Makefile.in ++++ b/Makefile.in +@@ -103,7 +103,7 @@ $(LIBOBJS): + $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -c $(srcdir)/missing/$*.c + + libmissing.a: $(LIBOBJS) +- ar -cr $@ $(LIBOBJS) ++ $(AR) -cr $@ $(LIBOBJS) + $(RANLIB) $@ + + dsniff: $(HDRS) $(SRCS) $(OBJS) libmissing.a +--- a/configure.in ++++ b/configure.in +@@ -17,6 +17,7 @@ dnl Checks for programs. + AC_PROG_CC + AC_PROG_INSTALL + AC_PROG_RANLIB ++AC_CHECK_PROG(AR,ar,ar) + + dnl Checks for header files. + AC_PATH_XTRA diff --git a/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch new file mode 100644 index 000000000000..f77d21ea9510 --- /dev/null +++ b/net-analyzer/dsniff/files/dsniff-2.4_beta1_p31-c99-fixes.patch @@ -0,0 +1,36 @@ +# Gentoo bug: https://bugs.gentoo.org/919503 + +diff --git a/tcpkill.c b/tcpkill.c +index 1a64d40..de7ad00 100644 +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -19,6 +19,7 @@ + #include <err.h> + #include <libnet.h> + #include <pcap.h> ++#include <inttypes.h> + + #include "pcaputil.h" + #include "version.h" +@@ -84,7 +85,7 @@ tcp_kill_cb(u_char *user, const struct pcap_pkthdr *pcap, const u_char *pkt) + if (libnet_write(l) < 0) + warn("write"); + +- fprintf(stderr, "%s R %lu:%lu(0) win 0\n", ctext, seq, seq); ++ fprintf(stderr, "%s R %"PRIu32":%"PRIu32"(0) win 0\n", ctext, seq, seq); + } + } + +diff --git a/urlsnarf.c b/urlsnarf.c +index f46ccf8..d57b9dd 100644 +--- a/urlsnarf.c ++++ b/urlsnarf.c +@@ -341,7 +341,7 @@ main(int argc, char *argv[]) + } + + struct pcap_pkthdr *h; +- u_char *d; ++ const u_char *d; + int rc; + while ((rc = pcap_next_ex(p, &h, &d)) == 1) { + tt = h->ts.tv_sec; diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml new file mode 100644 index 000000000000..505675120273 --- /dev/null +++ b/net-analyzer/dsniff/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <longdescription> + dsniff is a collection of tools for network auditing and penetration testing. + dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a + network for interesting data (passwords, e-mail, files, etc.). arpspoof, + dnsspoof, and macof facilitate the interception of network traffic normally + unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm + implement active monkey-in-the-middle attacks against redirected SSH and HTTPS + sessions by exploiting weak bindings in ad-hoc PKI. + </longdescription> +</pkgmetadata> diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild deleted file mode 100644 index 3ef54165ba6e..000000000000 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils ltprune - -DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~hppa x86" -IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap" -RESTRICT="test" - -RDEPEND="idn? ( net-dns/libidn ) - postgres? ( dev-db/postgresql:* ) - ldap? ( net-nds/openldap ) - ssl? ( - gnutls? ( >=net-libs/gnutls-3.3:= ) - !gnutls? ( >=dev-libs/openssl-0.9.7d:= ) - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2" - -REQUIRED_USE="gnutls? ( ssl )" - -DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch - epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch - epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable http) \ - $(use_enable icp) \ - $(use_enable priority) \ - $(use_enable smtp) \ - $(use_enable tos) \ - $(use_with idn libidn) \ - $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ - --config-cache \ - --disable-static \ - --disable-ttcp -} - -src_install() { - default - prune_libtool_files -} diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild deleted file mode 100644 index ea9b234861eb..000000000000 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils ltprune - -DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap" -RESTRICT="test" - -RDEPEND="idn? ( net-dns/libidn ) - postgres? ( dev-db/postgresql:* ) - ldap? ( net-nds/openldap ) - ssl? ( - gnutls? ( >=net-libs/gnutls-3.3:= ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - )" -DEPEND="${RDEPEND} - >=sys-devel/libtool-2" - -REQUIRED_USE="gnutls? ( ssl )" - -DOCS=( README AUTHORS ChangeLog DETAILS NEWS TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.0.2_p434-fix_implicit_declarations.patch - epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch - epatch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable http) \ - $(use_enable icp) \ - $(use_enable priority) \ - $(use_enable smtp) \ - $(use_enable tos) \ - $(use_with idn libidn) \ - $(usex gnutls $(use_with gnutls) $(use_with ssl)) \ - --config-cache \ - --disable-static \ - --disable-ttcp -} - -src_install() { - default - prune_libtool_files -} diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild index 17e0727353a8..a1b34e731c1b 100644 --- a/net-analyzer/echoping/echoping-6.0.2_p434-r4.ebuild +++ b/net-analyzer/echoping/echoping-6.0.2_p434-r5.ebuild @@ -1,34 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools DESCRIPTION="Small program to test performances of remote servers" -HOMEPAGE="http://echoping.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +HOMEPAGE="https://framagit.org/bortzmeyer/echoping" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="libressl gnutls http icp idn priority smtp ssl tos postgres ldap" +KEYWORDS="amd64 ~hppa x86" +IUSE="gnutls http icp idn priority smtp ssl tos postgres ldap" RESTRICT="test" RDEPEND=" - idn? ( net-dns/libidn ) - ldap? ( net-nds/openldap ) + idn? ( net-dns/libidn:= ) + ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:* ) ssl? ( gnutls? ( >=net-libs/gnutls-3.3:= ) !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:0= ) ) " DEPEND=" ${RDEPEND} - >=sys-devel/libtool-2 + >=dev-build/libtool-2 " REQUIRED_USE="gnutls? ( ssl )" @@ -38,6 +37,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_certificate_type_set_priority.patch "${FILESDIR}"/${PN}-6.0.2_p434-gnutls_session.patch "${FILESDIR}"/${PN}-6.0.2_p434-fno-common.patch + "${FILESDIR}"/0001-correctly-link-to-libm.patch ) src_prepare() { diff --git a/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch new file mode 100644 index 000000000000..2bd38fea6c6e --- /dev/null +++ b/net-analyzer/echoping/files/0001-correctly-link-to-libm.patch @@ -0,0 +1,32 @@ +From a951dcd0ea6cc64afbba2a438aead17706562486 Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Mon, 4 Mar 2024 22:43:43 -0500 +Subject: [PATCH] correctly link to libm + +The program depends on math.h symbols via util.c, but blindly assumes +that it will be available without explicitly linking to it -- a POSIX +violation. + +Also an LTO violation. + +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a586281..3f96637 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ bin_PROGRAMS = echoping + man_MANS = echoping.1 + echoping_SOURCES = echoping.c error.c readline.c writen.c util.c http.c icp.c HTParse.c echoping.h icp.h HTParse.h smtp.c + pkginclude_HEADERS = echoping.h compilation.h +-echoping_LDADD = ++echoping_LDADD = -lm + echoping_LDFLAGS = -export-dynamic + DOCS=DETAILS PLUGINS + SUBDIRS=plugins +-- +2.43.0 + diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml index 723d8a307977..78a65a684593 100644 --- a/net-analyzer/echoping/metadata.xml +++ b/net-analyzer/echoping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -12,7 +12,4 @@ <flag name="smtp">enable support for SMTP protocol.</flag> <flag name="tos">enable support for TOS (TYpe Of Service).</flag> </use> - <upstream> - <remote-id type="sourceforge">echoping</remote-id> - </upstream> </pkgmetadata> diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest deleted file mode 100644 index 09b734e121f1..000000000000 --- a/net-analyzer/egressor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST egressor_release1.0.tar.gz 28746 BLAKE2B 224ffd1fb56d9088a66367bbd88ecaab83c2316b2614a2b5211e03c4ff07683f8584c46d6ab7f0b26cbcb87a3321d0d3789a22cfee994aca3df8c488c9a297e5 SHA512 dfb1ee553ccfb92429fe68df06db031e5cbca41fe4fda36961ba8121d79de03a7dc36febc5a58561c3de9b1412cc90811f5ddc8b156aab8282b0dc3c14cd7aec diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild deleted file mode 100644 index 528e269b5891..000000000000 --- a/net-analyzer/egressor/egressor-1.0-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="tool for checking router configuration" -HOMEPAGE="http://packetfactory.openwall.net/projects/egressor/" -SRC_URI="http://packetfactory.openwall.net/projects/egressor/${PN}_release${PV}.tar.gz" - -LICENSE="egressor" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND="<net-libs/libnet-1.1 - >=net-libs/libnet-1.0.2a-r3" -RDEPEND="net-libs/libpcap - dev-perl/Net-RawIP - dev-lang/perl" - -S=${WORKDIR} - -src_prepare() { - epatch \ - "${FILESDIR}"/${PV}-libnet-1.0.patch \ - "${FILESDIR}"/${PV}-flags.patch -} - -src_compile() { - tc-export CC - emake -C client -} - -src_install() { - dobin client/egressor server/egressor_server.pl - dodoc README client/README-CLIENT server/README-SERVER -} diff --git a/net-analyzer/egressor/files/1.0-flags.patch b/net-analyzer/egressor/files/1.0-flags.patch deleted file mode 100644 index 03368b05dbaa..000000000000 --- a/net-analyzer/egressor/files/1.0-flags.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/client/Makefile -+++ b/client/Makefile -@@ -5,8 +5,8 @@ - #---------------------------------------------------------------------- - - --CC = gcc --CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -Wall -DMD=5 -+CC ?= gcc -+CFLAGS += -Wall -DMD=5 - #CFLAGS2 = -O -DMD=5 - OBJECTS = egressor.o md5c.o \ - -@@ -21,7 +21,7 @@ - - - egressor: egressor.o md5c.o -- $(CC) egressor.o $(LIBS) -o ./egressor -+ $(CC) $(CFLAGS) $(LDFLAGS) egressor.o $(LIBS) -o ./egressor - - md5c.o: global.h md5.h - $(CC) -c $(CFLAGS) md5c.c diff --git a/net-analyzer/egressor/files/1.0-libnet-1.0.patch b/net-analyzer/egressor/files/1.0-libnet-1.0.patch deleted file mode 100644 index be7cb4f15c6f..000000000000 --- a/net-analyzer/egressor/files/1.0-libnet-1.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/client/Makefile -+++ b/client/Makefile -@@ -15 +15 @@ --LIBS = -L../../lib/ -lnet -+LIBS = -L../../lib/ -lnet-1.0 ---- a/client/libnet_test.h -+++ b/client/libnet_test.h -@@ -36 +36 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml deleted file mode 100644 index 1bb807b42b3a..000000000000 --- a/net-analyzer/egressor/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription>tool for checking router configuration</longdescription> -</pkgmetadata> diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest index 461a54737885..d579f7fa8695 100644 --- a/net-analyzer/etherape/Manifest +++ b/net-analyzer/etherape/Manifest @@ -1,3 +1 @@ -DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3 -DIST etherape-0.9.17.tar.gz 1436276 BLAKE2B 3ac9496238d5a3653129822c6d21643a5e65afd93ff278532bcad623a0c4dc05b553711dd6f7047774cb758a6f65113a3381a08154001a6c2058415d35f2cd1d SHA512 65f039cd98826fee9a5988235dbdface00e2f17e5bd83eb28339d5bdb9d2b5f8ffe84e071c36418617d68add32e39866eb393f23b008b35fe36662453a02c57a -DIST etherape-0.9.18.tar.gz 1436265 BLAKE2B b9f3fd625369fdf6790bef75cc97effd3e1a6eec0635472752daf420c890d4a5231bd1baff6ee58937ad27e1d96eaae5b79cc2f9a2b6eeeb7c957d08cbc8f667 SHA512 0ed19966451f9e9b5f5754018d485e7dc59005657ceddf8a75e790c4b7fbf3c8eea56354cf490ec27e18c4bc14c5b3fe648c90facc471dfb14b52ea68abc37d3 +DIST etherape-0.9.20.tar.gz 1480790 BLAKE2B 22682d1b7b72206519d0ad32855f558a718bed83674753fcc923419845ac8b97ce970c1121f49eac9b910e10675b5397e5d3a16701af5bc9b78187baee455ccf SHA512 1dbfbb0efff7871a4b78ca90f81ac2155b57ace217b72e443cdc8b3d3807f7ab881c876bec12d93673500026a9dbf1111417a419891df62230e664af9b54b636 diff --git a/net-analyzer/etherape/etherape-0.9.14.ebuild b/net-analyzer/etherape/etherape-0.9.14.ebuild deleted file mode 100644 index bc2c11074e7a..000000000000 --- a/net-analyzer/etherape/etherape-0.9.14.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="A graphical network monitor for Unix modeled after etherman" -HOMEPAGE="http://etherape.sourceforge.net/" -SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" - -RDEPEND=" - >=gnome-base/libglade-2.0 - >=gnome-base/libgnomeui-2.0 - gnome-base/libgnomecanvas[glade] - net-libs/libpcap -" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.11.5 - app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - virtual/pkgconfig -" diff --git a/net-analyzer/etherape/etherape-0.9.17.ebuild b/net-analyzer/etherape/etherape-0.9.17.ebuild deleted file mode 100644 index 74efaf843ce3..000000000000 --- a/net-analyzer/etherape/etherape-0.9.17.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2 - -DESCRIPTION="A graphical network monitor for Unix modeled after etherman" -HOMEPAGE="http://etherape.sourceforge.net/" -SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" - -RDEPEND=" - >=gnome-base/libglade-2.0 - dev-libs/popt - gnome-base/libgnomecanvas[glade] - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - >=sys-devel/gettext-0.11.5 - app-text/docbook-xml-dtd:4.1.2 - app-text/gnome-doc-utils - virtual/pkgconfig -" diff --git a/net-analyzer/etherape/etherape-0.9.18.ebuild b/net-analyzer/etherape/etherape-0.9.20.ebuild index 1cfcbd672427..eeacc6874cfc 100644 --- a/net-analyzer/etherape/etherape-0.9.18.ebuild +++ b/net-analyzer/etherape/etherape-0.9.20.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="A graphical network monitor for Unix modeled after etherman" -HOMEPAGE="http://etherape.sourceforge.net/" -SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz" +HOMEPAGE="https://etherape.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/etherape/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" RDEPEND=" dev-libs/glib:2 @@ -17,10 +17,10 @@ RDEPEND=" net-libs/libpcap x11-libs/goocanvas:2.0 " -DEPEND=" - ${RDEPEND} - >=sys-devel/gettext-0.11.5 +DEPEND="${RDEPEND}" +BDEPEND=" app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools + >=sys-devel/gettext-0.11.5 virtual/pkgconfig " diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml index 81f2ca0b0fae..9c45f653502a 100644 --- a/net-analyzer/etherape/metadata.xml +++ b/net-analyzer/etherape/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ethloop/ethloop-10-r3.ebuild b/net-analyzer/ethloop/ethloop-10-r3.ebuild deleted file mode 100644 index d49ae392f80f..000000000000 --- a/net-analyzer/ethloop/ethloop-10-r3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Local simulator for testing Linux QoS disciplines" -HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/" -SRC_URI="http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" -RESTRICT="mirror bindist" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc45.patch -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" -} - -src_install() { - dosbin ethloop -} diff --git a/net-analyzer/ethloop/ethloop-10-r4.ebuild b/net-analyzer/ethloop/ethloop-10-r4.ebuild index 4067bea8c944..dc5653f727a8 100644 --- a/net-analyzer/ethloop/ethloop-10-r4.ebuild +++ b/net-analyzer/ethloop/ethloop-10-r4.ebuild @@ -1,25 +1,26 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Local simulator for testing Linux QoS disciplines" HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/" SRC_URI="http://luxik.cdi.cz/~devik/qos/${PN}/${PN}${PV}.tgz" +S="${WORKDIR}"/${PN} LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" RESTRICT="mirror bindist" -S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${P}-misc.patch ) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } src_install() { diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch b/net-analyzer/ethloop/files/ethloop-10-gcc45.patch deleted file mode 100644 index bf905cd44b2c..000000000000 --- a/net-analyzer/ethloop/files/ethloop-10-gcc45.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix recv call (bug #336755), add some more includes. - ---- a/ethloop.c -+++ b/ethloop.c -@@ -1,5 +1,7 @@ - /* vim: cin sw=4 ts=4 - */ -+#include <arpa/inet.h> /* htons() */ -+#include <sys/types.h> /* recv() */ - #include <sys/socket.h> - #include <sys/ioctl.h> - #include <sys/poll.h> -@@ -13,6 +15,7 @@ - #include <stdlib.h> - #include <sys/time.h> - #include <signal.h> -+#include <string.h> - - int sock; - -@@ -133,9 +136,9 @@ - int recv_raw(int tmo) - { - struct pollfd pf = {sock,POLLIN,0}; -- int r; unsigned short proto; -+ ssize_t r; unsigned short proto; - if(poll(&pf,1,tmo) <= 0) return 0; -- r = recv(sock,&buf,1550,0); -+ r = recv(sock,&buf,sizeof(buf),0); - if (r <= 0) { - printf("error recv (%d)\n",r); - return 0; diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml index 497a26fb249e..dce3f3be66c0 100644 --- a/net-analyzer/ethloop/metadata.xml +++ b/net-analyzer/ethloop/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription>Local simulator for testing Linux QoS disciplines</longdescription> </pkgmetadata> diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest index fb40201464a6..fa8a33dc442d 100644 --- a/net-analyzer/ettercap/Manifest +++ b/net-analyzer/ettercap/Manifest @@ -1 +1 @@ -DIST ettercap-0.8.3.tar.gz 8381943 BLAKE2B f49098d61f60877d3f979d7861f36dad6ec3fbfca7ed89d8f9826867145ea36daec65a1076c893f81391218688448515ef020a9cdf9a16ffddc830bacec8eb1c SHA512 1929c986d3a17ebc693ffe8531e01c66379c0ee6ea71305ea49b6a9eece84b6da1923135311db458bdb6035feb593e525786e6cf4c465ced5a7683384d4a4ae7 +DIST ettercap-0.8.3.1.tar.gz 6678653 BLAKE2B 2680b97454626a6f1af3b21f689ba8eed7a023c3ef5cd84d5b2b5859382f398b3a6fc622270ca41941a8a18a7bdd260af64165344a33b2e195c86ee61567f2eb SHA512 9bd71dcc1730293ee83934aca3587dfde662cb3890c12fafa557b6359f12226e5cb6f59a0db1aa11245a132b275e355e3bcc8952db921171d27b792827f148b5 diff --git a/net-analyzer/ettercap/ettercap-0.8.3.ebuild b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild index f49ef8cf2e4f..2474d2cd615a 100644 --- a/net-analyzer/ettercap/ettercap-0.8.3.ebuild +++ b/net-analyzer/ettercap/ettercap-0.8.3.1-r3.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils +inherit cmake -DESCRIPTION="A suite for man in the middle attacks" +DESCRIPTION="Suite for man in the middle attacks" HOMEPAGE="https://github.com/Ettercap/ettercap" LICENSE="GPL-2+" SLOT="0" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" else @@ -19,19 +19,19 @@ else KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86" fi -IUSE="doc geoip gtk ipv6 libressl ncurses +plugins test" +IUSE="doc geoip gtk ipv6 ncurses +plugins test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libbsd +RDEPEND=" + dev-libs/libbsd dev-libs/libpcre - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + dev-libs/openssl:= net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib geoip? ( dev-libs/geoip ) gtk? ( - >=dev-libs/atk-1.2.4 + >=app-accessibility/at-spi2-core-2.46.0 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo @@ -40,20 +40,29 @@ RDEPEND="dev-libs/libbsd >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) - plugins? ( >=net-misc/curl-7.26.0 )" -DEPEND="${RDEPEND} - doc? ( app-text/ghostscript-gpl - sys-apps/groff ) + plugins? ( >=net-misc/curl-7.26.0 ) +" +DEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +BDEPEND=" + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) test? ( dev-libs/check ) - sys-devel/flex - virtual/yacc" +" + PATCHES=( - "${FILESDIR}"/${PN}-0.8.3-fno-common.patch + "${FILESDIR}"/${P}-curl-8.patch + "${FILESDIR}"/${P}-libressl.patch #903001, 736990 + "${FILESDIR}"/${P}-musl.patch #897820 ) src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -69,7 +78,10 @@ src_configure() { -DSYSTEM_LIBS=ON -DINSTALL_SYSCONFDIR="${EPREFIX}"/etc ) - #right now we only support gtk2, but ettercap also supports gtk3 - #do we care? do we want to support both? - cmake-utils_src_configure + + # right now we only support gtk2, but ettercap also supports gtk3 + # do we care? do we want to support both? + ! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF) + + cmake_src_configure } diff --git a/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild index 047be22f8f4c..2b82d1fd180f 100644 --- a/net-analyzer/ettercap/ettercap-9999.ebuild +++ b/net-analyzer/ettercap/ettercap-9999.ebuild @@ -1,36 +1,37 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils +inherit cmake -DESCRIPTION="A suite for man in the middle attacks" +DESCRIPTION="Suite for man in the middle attacks" HOMEPAGE="https://github.com/Ettercap/ettercap" LICENSE="GPL-2+" SLOT="0" -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/Ettercap/${PN}.git" else - SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" #mirror does not work - KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86" + SRC_URI="https://github.com/Ettercap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86" fi -IUSE="doc gtk ipv6 libressl ncurses +plugins test" +IUSE="doc geoip gtk ipv6 ncurses +plugins test" RESTRICT="!test? ( test )" -RDEPEND="dev-libs/libbsd - dev-libs/libpcre - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) +RDEPEND=" + dev-libs/libbsd + dev-libs/libpcre2 + dev-libs/openssl:= net-libs/libnet:1.1 >=net-libs/libpcap-0.8.1 sys-libs/zlib + geoip? ( dev-libs/geoip ) gtk? ( - >=dev-libs/atk-1.2.4 + >=app-accessibility/at-spi2-core-2.46.0 >=dev-libs/glib-2.2.2:2 media-libs/freetype x11-libs/cairo @@ -39,20 +40,23 @@ RDEPEND="dev-libs/libbsd >=x11-libs/pango-1.2.3 ) ncurses? ( >=sys-libs/ncurses-5.3:= ) - plugins? ( >=net-misc/curl-7.26.0 )" -DEPEND="${RDEPEND} - doc? ( app-text/ghostscript-gpl - sys-apps/groff ) + plugins? ( >=net-misc/curl-7.26.0 ) +" +DEPEND=" + app-alternatives/yacc + app-alternatives/lex +" +BDEPEND=" + doc? ( + app-text/ghostscript-gpl + sys-apps/groff + ) test? ( dev-libs/check ) - sys-devel/flex - virtual/yacc" -PATCHES=( - "${FILESDIR}"/${PN}-0.8.3-fno-common.patch -) +" src_prepare() { sed -i "s:Release:Release Gentoo:" CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -63,11 +67,15 @@ src_configure() { -DENABLE_IPV6="$(usex ipv6)" -DENABLE_TESTS="$(usex test)" -DENABLE_PDF_DOCS="$(usex doc)" + -DENABLE_GEOIP="$(usex geoip)" -DBUNDLED_LIBS=OFF -DSYSTEM_LIBS=ON - -DINSTALL_SYSCONFDIR="${EROOT}"etc + -DINSTALL_SYSCONFDIR="${EPREFIX}"/etc ) - #right now we only support gtk2, but ettercap also supports gtk3 - #do we care? do we want to support both? - cmake-utils_src_configure + + # right now we only support gtk2, but ettercap also supports gtk3 + # do we care? do we want to support both? + ! use gtk && mycmakeargs+=(-DINSTALL_DESKTOP=OFF) + + cmake_src_configure } diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch b/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch deleted file mode 100644 index eddca836905f..000000000000 --- a/net-analyzer/ettercap/files/ettercap-0.8.3-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/include/ec_threads.h -+++ b/include/ec_threads.h -@@ -12,7 +12,7 @@ - }; - - /* a value to be used to return errors in fuctcions using pthread_t values */ --pthread_t EC_PTHREAD_NULL; -+extern pthread_t EC_PTHREAD_NULL; - #define EC_PTHREAD_SELF EC_PTHREAD_NULL - #define PTHREAD_ID(id) (*(unsigned long*)&(id)) - ---- a/src/ec_threads.c -+++ b/src/ec_threads.c -@@ -46,6 +46,8 @@ - #define INIT_LOCK do{ DEBUG_MSG("thread_init_lock"); pthread_mutex_lock(&init_mtx); } while(0) - #define INIT_UNLOCK do{ DEBUG_MSG("thread_init_unlock"); pthread_mutex_unlock(&init_mtx); } while(0) - -+pthread_t EC_PTHREAD_NULL; -+ - /* protos... */ - - pthread_t ec_thread_detached(char *name, char *desc, void *(*function)(void *), void *args, int detached); diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch new file mode 100644 index 000000000000..e1c2259733c2 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-curl-8.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/902987 +https://github.com/Ettercap/ettercap/commit/40534662043b7d831d1f6c70448afa9d374a9b63 + +From 40534662043b7d831d1f6c70448afa9d374a9b63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 23 Mar 2023 10:23:14 -0700 +Subject: [PATCH] sslstrip: Enhance the libcurl version check to consider + version 8+ + +Lately curl has released version 8 and hence LIBCURL_VERSION_MAJOR is +reset to 0, current check assumes major version to be 7 at max and hence +on systems with libcurl 8+ this check breaks and build fails + +Fixes + +TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/ettercap/0.8.3.1-r0/git/plug-ins/sslstrip/sslstrip.c:57:2: error: libcurl 7.26.0 or up is needed + ^ +1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/plug-ins/sslstrip/sslstrip.c ++++ b/plug-ins/sslstrip/sslstrip.c +@@ -51,7 +51,7 @@ + + #include <curl/curl.h> + +-#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MINOR < 26) ++#if (LIBCURL_VERSION_MAJOR < 7) || (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR < 26) + #error libcurl 7.26.0 or up is needed + #endif + + diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch new file mode 100644 index 000000000000..a56e75c88b75 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-libressl.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/903001 +https://bugs.gentoo.org/736990 +https://github.com/Ettercap/ettercap/pull/1069 +https://github.com/Ettercap/ettercap/commit/b2fc8e959dc71fdbaba08aecb1f157c914490a07 + +From b2f7634c9dbc0ef68640f0571787d92300e9f9f9 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin <stefan@steils.org> +Date: Sat, 15 Aug 2020 07:18:31 +0300 +Subject: [PATCH] ec_sslwrap: fix compilation with LibreSSL + +Disable taking over SNI extension from ClientHello and SSL configuration +operations until LibreSSL supports the required API. + +Fixes: https://github.com/Ettercap/ettercap/issues/1068 +--- + src/ec_sslwrap.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ec_sslwrap.c b/src/ec_sslwrap.c +index b9f26a142..1e4c24fc1 100644 +--- a/src/ec_sslwrap.c ++++ b/src/ec_sslwrap.c +@@ -71,11 +71,11 @@ + #define TLS_server_method SSLv23_server_method + #endif + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + #define HAVE_OPENSSL_1_1_0 + #endif + +-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) + #define HAVE_OPENSSL_1_1_1 + #endif + diff --git a/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch new file mode 100644 index 000000000000..516823ec6972 --- /dev/null +++ b/net-analyzer/ettercap/files/ettercap-0.8.3.1-musl.patch @@ -0,0 +1,39 @@ +Upsream-PR: https://github.com/Ettercap/ettercap/pull/1220 +Uptream-Commit: https://github.com/Ettercap/ettercap/commit/f03a1174ffccf9343423498fa3c65bd9090d4ce0 +Bug: https://bugs.gentoo.org/897820 + +From 3ef51159d4e2cea97accb87af08943333fbefb04 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> +Date: Fri, 3 Mar 2023 21:27:14 +0100 +Subject: [PATCH] Define _GNU_SOURCE to make sure memmem is found when musl + library is used. This fixes issue: #1219 + +Thanks Sam James for the suggestion! +--- + include/ec.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/include/ec.h b/include/ec.h +index fbf048111..561062c2f 100644 +--- a/include/ec.h ++++ b/include/ec.h +@@ -21,6 +21,9 @@ + #if !defined (__USE_GNU) /* for memmem(), strsignal(), etc etc... */ + #define __USE_GNU + #endif ++#if !defined (_GNU_SOURCE) /* for memmem(), strsignal(), etc etc... on musl */ ++ #define _GNU_SOURCE ++#endif + #ifdef OS_SOLARIS + #define _REENTRANT /* for strtok_r() */ + #endif +@@ -28,6 +31,9 @@ + #if defined (__USE_GNU) + #undef __USE_GNU + #endif ++#if defined (_GNU_SOURCE) ++ #undef _GNU_SOURCE ++#endif + #include <strings.h> + #include <unistd.h> + #include <time.h> diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml index a98ad417c5f9..6a049198d589 100644 --- a/net-analyzer/ettercap/metadata.xml +++ b/net-analyzer/ettercap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest index 66b2d4bb5f08..54681ec36bc0 100644 --- a/net-analyzer/fail2ban/Manifest +++ b/net-analyzer/fail2ban/Manifest @@ -1,3 +1,2 @@ -DIST fail2ban-0.10.4.tar.gz 493104 BLAKE2B 3a58ab114cf25172c77b229ce53bf6dd009d4fb8c700142480ba0212072d8820126bfabf5dd417835bdac5f5b65d599c6dde859d8c57267e90cfb569dc4a2073 SHA512 ee53f2e8dc3cda4f588c60da5227d3d71550496ddfdf5bdbffced25bafd442b8e2352a9ad9f27bf76489903b5b779cdb9614963342de907c1036ae9268b8f35f -DIST fail2ban-0.10.5.tar.gz 520460 BLAKE2B 872b1b2d96d5c79b228cf7c38923161336e452c33fddce75d25004454a5b5d119d435aeb789d55576de4e24bbf8d8288d9fc2fb3f17323074a27857a08e3c6a4 SHA512 d2ad64999031537f2adfc01efd02d2db0718485e38745736339c2e3a1792cd82147fb6cf5a3d371d83dbe91d1afe34e741e038ed4d84d6f444ea1922dc4bb658 -DIST fail2ban-0.11.1.tar.gz 538660 BLAKE2B c88765ac3f49c19e0570248891814c647f2c3515290982de21c7b6c377508189fa53182fca84d62f61b231e250395992e8cf06cc61394dd41150f02d8a254f8b SHA512 019b088aa6375f98742ed101ef6f65adabca3324444d71d5b8597a8d1d22fa76b9f503660f0498643fe24a3b8e4368de916072a1ab77b8e2ea3eda41c3e0c8c6 +DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb +DIST fail2ban-1.1.0.tar.gz 603854 BLAKE2B f7c2d3a1e5b5cdca1f26d92cefe75958bb61b87ad1cf316380b91527c96f3261e5665478c5fbb053f6419956dda934c8ef3ce837af2819b1b1c8d162246fc15f SHA512 9bff7b9c41e58a953901800468e5c4153c9db6af01c7eb18111ad8620b40d03a0771020472fb759b2809d250e2bb45471e6c7e8283e72ea48290ecf7bf921821 diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild deleted file mode 100644 index 1db3b7bffdde..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.10.4-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 eutils systemd vcs-snapshot - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86" -IUSE="selinux systemd" - -# TODO support ipfw and ipfilter -RDEPEND=" - kernel_linux? ( net-firewall/iptables ) - kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) - net-misc/whois - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -python_prepare_all() { - eapply_user - - # Replace /var/run with /run, but not in the top source directory - find . -mindepth 2 -type f -exec \ - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} - - keepdir /var/lib/${PN} -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite" - fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild deleted file mode 100644 index 652d96b809db..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.10.4-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="selinux systemd" - -RDEPEND=" - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -src_unpack() { - default - mv ${PN}-${PN}-* ${P} || die -} - -python_prepare_all() { - default - - # Replace /var/run with /run, but not in the top source directory - find . -mindepth 2 -type f -exec \ - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} - - keepdir /var/lib/${PN} -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite. If you do not use the" - elog "persistent database feature, then you should set" - elog "dbfile = :memory: in fail2ban.conf accordingly." - fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild deleted file mode 100644 index 12997e0f764a..000000000000 --- a/net-analyzer/fail2ban/fail2ban-0.11.1-r2.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit bash-completion-r1 distutils-r1 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="selinux systemd" - -RDEPEND=" - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -python_prepare_all() { - default - - # Replace /var/run with /run, but not in the top source directory - find . -mindepth 2 -type f -exec \ - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} - - keepdir /var/lib/${PN} - - newbashcomp files/bash-completion ${PN}-client - bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite. If you do not use the" - elog "persistent database feature, then you should set" - elog "dbfile = :memory: in fail2ban.conf accordingly." - fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild index e00569c23f08..2a67b21bda7b 100644 --- a/net-analyzer/fail2ban/fail2ban-0.10.5-r1.ebuild +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild @@ -1,69 +1,86 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_6 ) +EAPI=8 + DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..11} ) -inherit bash-completion-r1 distutils-r1 systemd +inherit bash-completion-r1 distutils-r1 systemd tmpfiles -DESCRIPTION="scans log files and bans IPs that show malicious signs" +DESCRIPTION="Scans log files and bans IPs that show malicious signs" HOMEPAGE="https://www.fail2ban.org/" -SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="selinux systemd" RDEPEND=" virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) " -RESTRICT="test" DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) -src_unpack() { - default - mv ${PN}-${PN}-* ${P} || die -} +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch + "${FILESDIR}"/${P}-configreader-warning.patch +) python_prepare_all() { - default + distutils-r1_python_prepare_all # Replace /var/run with /run, but not in the top source directory find . -mindepth 2 -type f -exec \ sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all } python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi + ./fail2ban-2to3 || die distutils-r1_python_compile } +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + bin/fail2ban-testcases \ + --no-network \ + --no-gamin \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + python_install_all() { distutils-r1_python_install_all - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf doman man/*.{1,5} # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. @@ -83,34 +100,30 @@ pkg_preinst() { } pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then elog elog "Configuration files are now in /etc/fail2ban/" elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" + elog "files before restarting Fail2Ban!" elog - elog "Fail2ban is not installed under /usr/lib anymore. The" + elog "Fail2Ban is not installed under /usr/lib anymore. The" elog "new location is under /usr/share." elog elog "You are upgrading from version 0.6.x, please see:" elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" fi - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" fi - if ! has_version dev-lang/python[sqlite]; then + if ! has_version dev-lang/python[sqlite] ; then elog "If you want to use ${PN}'s persistent database, then reinstall" elog "dev-lang/python with USE=sqlite. If you do not use the" elog "persistent database feature, then you should set" elog "dbfile = :memory: in fail2ban.conf accordingly." fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi } diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild new file mode 100644 index 000000000000..f78595850988 --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch + "${FILESDIR}"/${P}-configreader-warning.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die + + # Incompatible with Python 3.12 in 1.0.x, 9999 uses dev-python/aiosmtpd. + rm fail2ban/tests/action_d/test_smtp.py || die +} + +python_compile() { + ./fail2ban-2to3 || die + distutils-r1_python_compile +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 + bin/fail2ban-testcases \ + --no-network \ + --no-gamin \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild b/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild new file mode 100644 index 000000000000..8f83d3ea20cf --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-1.1.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 + bin/fail2ban-testcases \ + --no-network \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild new file mode 100644 index 000000000000..8f83d3ea20cf --- /dev/null +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit bash-completion-r1 distutils-r1 systemd tmpfiles + +DESCRIPTION="Scans log files and bans IPs that show malicious signs" +HOMEPAGE="https://www.fail2ban.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/fail2ban/fail2ban" + inherit git-r3 +else + SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) + virtual/logger + virtual/mta + selinux? ( sec-policy/selinux-fail2ban ) + systemd? ( + $(python_gen_cond_dep ' + dev-python/python-systemd[${PYTHON_USEDEP}] + ') + ) +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" + +DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch + "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # Replace /var/run with /run, but not in the top source directory + find . -mindepth 2 -type f -exec \ + sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die +} + +python_test() { + # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 + bin/fail2ban-testcases \ + --no-network \ + --ignore databasetestcase.DatabaseTest.testRepairDb \ + --verbosity=4 || die "Tests failed with ${EPYTHON}" + + # Workaround for bug #790251 + rm -rf fail2ban.egg-info || die +} + +python_install_all() { + distutils-r1_python_install_all + + rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die + + newconfd files/fail2ban-openrc.conf ${PN} + + # These two are placed in the ${BUILD_DIR} after being "built" + # in install_scripts(). + newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}" + systemd_dounit "${BUILD_DIR}/${PN}.service" + + dotmpfiles files/${PN}-tmpfiles.conf + + doman man/*.{1,5} + + # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. + # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 + insinto /etc/logrotate.d + newins files/${PN}-logrotate ${PN} + + keepdir /var/lib/${PN} + + newbashcomp files/bash-completion ${PN}-client + bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex +} + +pkg_preinst() { + has_version "<${CATEGORY}/${PN}-0.7" + previous_less_than_0_7=$? +} + +pkg_postinst() { + tmpfiles_process ${PN}-tmpfiles.conf + + if [[ ${previous_less_than_0_7} == 0 ]] ; then + elog + elog "Configuration files are now in /etc/fail2ban/" + elog "You probably have to manually update your configuration" + elog "files before restarting Fail2Ban!" + elog + elog "Fail2Ban is not installed under /usr/lib anymore. The" + elog "new location is under /usr/share." + elog + elog "You are upgrading from version 0.6.x, please see:" + elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" + fi + + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" + fi + + if ! has_version dev-lang/python[sqlite] ; then + elog "If you want to use ${PN}'s persistent database, then reinstall" + elog "dev-lang/python with USE=sqlite. If you do not use the" + elog "persistent database feature, then you should set" + elog "dbfile = :memory: in fail2ban.conf accordingly." + fi +} diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild deleted file mode 100644 index 4bde96c6afe5..000000000000 --- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) -DISTUTILS_SINGLE_IMPL=1 - -inherit bash-completion-r1 distutils-r1 git-r3 systemd - -DESCRIPTION="scans log files and bans IPs that show malicious signs" -HOMEPAGE="https://www.fail2ban.org/" -EGIT_REPO_URI="https://github.com/${PN}/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="selinux systemd" - -RDEPEND=" - virtual/logger - virtual/mta - selinux? ( sec-policy/selinux-fail2ban ) - systemd? ( $(python_gen_cond_dep '|| ( - dev-python/python-systemd[${PYTHON_MULTI_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}] - )' 'python*' ) ) -" - -RESTRICT="test" -DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) - -python_prepare_all() { - default - - # Replace /var/run with /run, but not in the top source directory - find . -mindepth 2 -type f -exec \ - sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die - - sed -i -e 's|runscript|openrc-run|g' files/gentoo-initd || die - - distutils-r1_python_prepare_all -} - -python_compile() { - if python_is_python3; then - ./fail2ban-2to3 || die - fi - distutils-r1_python_compile -} - -python_install_all() { - distutils-r1_python_install_all - - rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die - - # not FILESDIR - newconfd files/gentoo-confd ${PN} - newinitd files/gentoo-initd ${PN} - sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in > "${T}/${PN}.service" || die - systemd_dounit "${T}/${PN}.service" - systemd_dotmpfilesd files/${PN}-tmpfiles.conf - doman man/*.{1,5} - - # Use INSTALL_MASK if you do not want to touch /etc/logrotate.d. - # See http://thread.gmane.org/gmane.linux.gentoo.devel/35675 - insinto /etc/logrotate.d - newins files/${PN}-logrotate ${PN} - - keepdir /var/lib/${PN} - - newbashcomp files/bash-completion ${PN}-client - bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex -} - -pkg_preinst() { - has_version "<${CATEGORY}/${PN}-0.7" - previous_less_than_0_7=$? -} - -pkg_postinst() { - if [[ $previous_less_than_0_7 = 0 ]] ; then - elog - elog "Configuration files are now in /etc/fail2ban/" - elog "You probably have to manually update your configuration" - elog "files before restarting Fail2ban!" - elog - elog "Fail2ban is not installed under /usr/lib anymore. The" - elog "new location is under /usr/share." - elog - elog "You are upgrading from version 0.6.x, please see:" - elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" - fi - - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" - fi - - if ! has_version dev-lang/python[sqlite]; then - elog "If you want to use ${PN}'s persistent database, then reinstall" - elog "dev-lang/python with USE=sqlite. If you do not use the" - elog "persistent database feature, then you should set" - elog "dbfile = :memory: in fail2ban.conf accordingly." - fi - - if has_version sys-apps/systemd[-python]; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi -} diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch new file mode 100644 index 000000000000..3017883f0d5a --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-0.11.2-adjust-apache-logs-paths.patch @@ -0,0 +1,29 @@ +From bda9b88e883207b99781352c68610980e23fa62f Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 11 Aug 2021 01:58:05 +0100 +Subject: [PATCH] Adjust Apache log paths for Gentoo + +Closes: https://bugs.gentoo.org/805485 +--- + config/paths-common.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/config/paths-common.conf b/config/paths-common.conf +index 7383caf..4f4a6e1 100644 +--- a/config/paths-common.conf ++++ b/config/paths-common.conf +@@ -36,9 +36,9 @@ sshd_backend = %(default_backend)s + dropbear_log = %(syslog_authpriv)s + dropbear_backend = %(default_backend)s + +-apache_error_log = /var/log/apache2/*error.log ++apache_error_log = /var/log/apache2/*error_log + +-apache_access_log = /var/log/apache2/*access.log ++apache_access_log = /var/log/apache2/*access_log + + # from /etc/audit/auditd.conf + auditd_log = /var/log/audit/audit.log +-- +2.32.0 + diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch new file mode 100644 index 000000000000..748e507e4a26 --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch @@ -0,0 +1,19 @@ +https://github.com/fail2ban/fail2ban/commit/432e7e1 + +From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" <serg.brester@sebres.de> +Date: Mon, 28 Nov 2022 13:21:15 +0100 +Subject: [PATCH] no warning if no config value but default (debug message now) + +closes #3420 +--- a/fail2ban/client/configreader.py ++++ b/fail2ban/client/configreader.py +@@ -277,7 +277,7 @@ def getOptions(self, sec, options, pOptions=None, shouldExist=False, convert=Tru + # TODO: validate error handling here. + except NoOptionError: + if not optvalue is None: +- logSys.warning("'%s' not defined in '%s'. Using default one: %r" ++ logSys.debug("'%s' not defined in '%s'. Using default one: %r" + % (optname, sec, optvalue)) + values[optname] = optvalue + # elif logSys.getEffectiveLevel() <= logLevel: diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch new file mode 100644 index 000000000000..8feca43412ec --- /dev/null +++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch @@ -0,0 +1,45 @@ +Avoid corrupting umask permanently in the testdir because of fail2ban/server/server.py::start. + +In particular: +* https://bugs.gentoo.org/659010#c11 +* https://bugs.gentoo.org/790251#c10 +* https://bugs.gentoo.org/907350 + +But see also the many dupes. +--- a/fail2ban/tests/fail2banclienttestcase.py ++++ b/fail2ban/tests/fail2banclienttestcase.py +@@ -23,6 +23,7 @@ __author__ = "Serg Brester" + __copyright__ = "Copyright (c) 2014- Serg G. Brester (sebres), 2008- Fail2Ban Contributors" + __license__ = "GPL" + ++import atexit + import fileinput + import os + import re +@@ -40,6 +41,14 @@ from ..client.fail2bancmdline import Fail2banCmdLine + from ..client.fail2banclient import exec_command_line as _exec_client, CSocket, VisualWait + from ..client.fail2banserver import Fail2banServer, exec_command_line as _exec_server + from .. import protocol ++ ++def current_umask(): ++ tmp = os.umask(0o022) ++ os.umask(tmp) ++ return tmp ++ ++old_umask = current_umask() ++ + from ..server import server + from ..server.mytime import MyTime + from ..server.utils import Utils +@@ -48,6 +57,11 @@ from .utils import LogCaptureTestCase, logSys as DefLogSys, with_tmpdir, shutil, + + from ..helpers import getLogger + ++def restore_umask(): ++ os.umask(old_umask) ++ ++atexit.register(restore_umask) ++ + # Gets the instance of the logger. + logSys = getLogger(__name__) + diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml index ece130a93bd2..12bbcacb9196 100644 --- a/net-analyzer/fail2ban/metadata.xml +++ b/net-analyzer/fail2ban/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="github">fail2ban/fail2ban</remote-id> </upstream> diff --git a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild b/net-analyzer/firewalk/firewalk-5.0-r1.ebuild deleted file mode 100644 index e43aa7500b1c..000000000000 --- a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="A tool for determining a firewall's rule set" -HOMEPAGE="http://packetfactory.openwall.net/projects/firewalk/" -SRC_URI="mirror://gentoo/${P}.tgz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -DEPEND=" - dev-libs/libdnet - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/Firewalk" - -DOCS=( README TODO BUGS ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-gcc3.4.diff -} - -src_install() { - default - doman man/firewalk.8 -} diff --git a/net-analyzer/firewalk/firewalk-5.0-r2.ebuild b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild index 40b2b60d3a86..f074571d7ec3 100644 --- a/net-analyzer/firewalk/firewalk-5.0-r2.ebuild +++ b/net-analyzer/firewalk/firewalk-5.0-r2.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tgz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" DEPEND=" dev-libs/libdnet diff --git a/net-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/firewalk/metadata.xml +++ b/net-analyzer/firewalk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/flent/Manifest b/net-analyzer/flent/Manifest deleted file mode 100644 index c281dc19f30c..000000000000 --- a/net-analyzer/flent/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST flent-1.0.1.tar.gz 2285619 BLAKE2B d5ab68144c8520e8077eddd529beb248654d59e05e6b5c90823bae61a86b0dffae959c2089be03b96731e7575eabcfcae2c7b738e9a8a77520a615c48801549a SHA512 868b83a52805cfdb0dc49379aea25e07135a949cea0e6c2388b026099723c20aa7b0146e19110786e763c7f22e1663c42a8bc21bdae2199d00ac85438a3fdf74 diff --git a/net-analyzer/flent/flent-1.0.1-r1.ebuild b/net-analyzer/flent/flent-1.0.1-r1.ebuild deleted file mode 100644 index e9a575668ac4..000000000000 --- a/net-analyzer/flent/flent-1.0.1-r1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -DESCRIPTION="The FLExible Network Tester" -HOMEPAGE="https://flent.org/" -SRC_URI="https://github.com/tohojo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+qt5 +plots" - -RDEPEND="qt5? ( dev-python/PyQt5[${PYTHON_USEDEP}] ) - plots? ( dev-python/matplotlib[${PYTHON_USEDEP}] ) - net-analyzer/netperf[demo] - net-misc/iperf - net-analyzer/fping" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-analyzer/flent/metadata.xml b/net-analyzer/flent/metadata.xml deleted file mode 100644 index d33bba3bd96b..000000000000 --- a/net-analyzer/flent/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> - </maintainer> - <use> - <flag name="plots">Enable drawing plots</flag> - </use> - <upstream> - <remote-id type="github">tohojo/flent</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest index 946ffc26dc21..958d870d3dc3 100644 --- a/net-analyzer/flow-tools/Manifest +++ b/net-analyzer/flow-tools/Manifest @@ -1 +1 @@ -DIST flow-tools-0.68.5.1.tar.bz2 914062 BLAKE2B 8a987c1aac53a1370045ab118888c51ce2de7b8db4074432e86e701153469163870cf1cf9da9e2267ed934d240de4b4bf2391b4681012b82db7e4205207b7fa4 SHA512 ae17ba39854daa8ef3deecd3a554bb6d1fa47648cb791d8225a40bec13f65bf0692871660b2c3490d133b1251875c323d066bb0c0483eceb0707cec9b7714c57 +DIST flow-tools-0.68.6.tar.gz 1078778 BLAKE2B 8a6179e44f2efa90bb2c3ace73bfbb8a928c1d7aabc8f47a778ca7361a92c13f2df168194bdd9c489c175079c1bd977f6ad9852711a62d99649d1f44609d746b SHA512 fc3d0650ace93ec2180340624648b5967fd7f094900f8409e751b439eb659c9623e2ee55effeb74164ec6b15f0a1edd8ed7735ccfacfd72af08e9c5c0d65b740 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch index 14623fa93f36..1f7464919960 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-fno-common.patch @@ -1,5 +1,5 @@ ---- ./src/acl2.h -+++ ./src/acl2.h +--- a/src/acl2.h ++++ b/src/acl2.h @@ -48,7 +48,7 @@ #define ACL_TYPE_STD 1 #define ACL_TYPE_EXT 2 diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch index c6b17743ce91..cbbddcaae68d 100644 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-openssl11.patch @@ -1,21 +1,5 @@ -diff -Nuar --exclude '*~' flow-tools-0.68.5.1.orig/lib/ftxlate.c flow-tools-0.68.5.1/lib/ftxlate.c ---- flow-tools-0.68.5.1.orig/lib/ftxlate.c 2008-01-27 12:48:49.000000000 -0800 -+++ flow-tools-0.68.5.1/lib/ftxlate.c 2018-12-29 15:18:33.739062317 -0800 -@@ -34,6 +34,14 @@ - #include <openssl/ssl.h> - #include <openssl/evp.h> - #undef free_func -+ -+/* fixup LibreSSL OpenSSL version numbering */ -+#include <openssl/opensslv.h> -+#if (defined LIBRESSL_VERSION_NUMBER && OPENSSL_VERSION_NUMBER == 0x20000000L) -+#undef OPENSSL_VERSION_NUMBER -+#define OPENSSL_VERSION_NUMBER 0x1000107fL -+#endif -+ - #endif /* HAVE_OPENSSL */ - - #include <sys/time.h> +--- a/lib/ftxlate.c ++++ b/lib/ftxlate.c @@ -2040,11 +2048,13 @@ diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch deleted file mode 100644 index cb17471072bc..000000000000 --- a/net-analyzer/flow-tools/files/flow-tools-0.68.5.1-syslog.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/lib/fterr.c -+++ b/lib/fterr.c -@@ -112,7 +112,7 @@ - fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2); - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_info */ - -@@ -134,7 +134,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - if (fterr_exit) -@@ -159,7 +159,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - if (fterr_exit) - fterr_exit(code); -@@ -183,7 +183,7 @@ - } - - if (fterr_flags & FTERR_SYSLOG) -- syslog(LOG_INFO, buf); -+ syslog(LOG_INFO, "%s", buf); - - } /* fterr_warnx */ - -@@ -205,7 +205,7 @@ - - if (fterr_flags & FTERR_SYSLOG) { - snprintf(buf2, 1024, "%s: %s", buf, strerror(errno)); -- syslog(LOG_INFO, buf2); -+ syslog(LOG_INFO, "%s", buf2); - } - - } /* fterr_warn */ diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch b/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch new file mode 100644 index 000000000000..a270567fc205 --- /dev/null +++ b/net-analyzer/flow-tools/files/flow-tools-0.68.6-mysql.patch @@ -0,0 +1,15 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -62,11 +62,9 @@ + if test "x$WHERE_MYSQL" != "x"; then + old_LIBS="$LIBS" + old_LDFLAGS="$LDFLAGS" +- LDFLAGS="$LDFLAGS -L$WHERE_MYSQL/lib/mysql" +- AC_CHECK_LIB(mysqlclient, my_init, ++ AC_CHECK_LIB(mysqlclient, mysql_init, + [ + MYSQLCFLAGS="-I$WHERE_MYSQL/include/mysql" +- MYSQLLDFLAGS="-L$WHERE_MYSQL/lib/mysql" + MYSQLLIB="-lmysqlclient" + AC_DEFINE(HAVE_MYSQL, 1, [Do we have to build MySQL support]) + ] diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild index 8656ded05688..aced4bca3177 100644 --- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r10.ebuild +++ b/net-analyzer/flow-tools/flow-tools-0.68.6-r1.ebuild @@ -1,42 +1,48 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user + +inherit autotools DESCRIPTION="library and programs to process reports from NetFlow data" -HOMEPAGE="https://code.google.com/p/flow-tools/" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" +HOMEPAGE="https://github.com/5u623l20/flow-tools/" +SRC_URI="https://github.com/5u623l20/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD GPL-2" +LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug libressl mysql postgres ssl static-libs" +KEYWORDS="amd64 ~ppc x86" +IUSE="debug mysql postgres ssl static-libs" -RDEPEND="sys-apps/tcp-wrappers +RDEPEND=" + acct-group/flows + acct-user/flows + sys-apps/tcp-wrappers sys-libs/zlib mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" - -DEPEND="${RDEPEND} - sys-devel/flex - sys-devel/bison" - -DOCS=( ChangeLog README SECURITY TODO ) - + ssl? ( dev-libs/openssl:0= ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + app-text/docbook-sgml-utils + app-alternatives/yacc + app-alternatives/lex +" +DOCS=( ChangeLog.old README README.fork SECURITY TODO TODO.old ) PATCHES=( - "${FILESDIR}"/${P}-run.patch - "${FILESDIR}"/${P}-syslog.patch - "${FILESDIR}"/${P}-openssl11.patch - "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-0.68.5.1-run.patch + "${FILESDIR}"/${PN}-0.68.5.1-openssl11.patch + "${FILESDIR}"/${PN}-0.68.5.1-fno-common.patch + "${FILESDIR}"/${PN}-0.68.6-mysql.patch ) -pkg_setup() { - pkg_douser +src_prepare() { + default + sed -i -e 's|docbook-to-man|docbook2man|g' docs/Makefile.am || die + eautoreconf } src_configure() { @@ -51,8 +57,6 @@ src_configure() { src_install() { default - find "${D}" -name '*.la' -delete || die - exeinto /var/lib/flows/bin doexe "${FILESDIR}"/linkme @@ -67,13 +71,6 @@ src_install() { fperms 0755 /var/lib/flows fperms 0755 /var/lib/flows/bin -} - -pkg_preinst() { - pkg_douser -} -pkg_douser() { - enewgroup flows - enewuser flows -1 -1 /var/lib/flows flows + find "${ED}" -name '*.la' -delete || die } diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml index e2ec7efaf9f5..52394dd65495 100644 --- a/net-analyzer/flow-tools/metadata.xml +++ b/net-analyzer/flow-tools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> @@ -14,5 +14,6 @@ interface have been contributed and are included in the distribution.</longdescription> <upstream> <remote-id type="google-code">flow-tools</remote-id> + <remote-id type="github">5u623l20/flow-tools</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/flowgrind/Manifest b/net-analyzer/flowgrind/Manifest index 2f29d1cc110a..30f4e0a2a403 100644 --- a/net-analyzer/flowgrind/Manifest +++ b/net-analyzer/flowgrind/Manifest @@ -1,2 +1 @@ -DIST flowgrind-0.7.1.tar.bz2 224678 BLAKE2B e5a6759e57950b2484879f6259f9e17ae3fb5a3b49e1e27dfb6c1c89d476dbc693f29b87bf8ab4975fdde30f57dcd9c279ad6508168136b6e2ddd335bba6fc31 SHA512 fe1bc82d8b1b5bbe37989c0d8f24ba87bca73522983b855e249a3fa5e5fc96d9a63190aa94627db2b1bfea63304e453b4bc1c5fd18260fad9bda38313ad912b8 -DIST flowgrind-0.8.0.tar.bz2 298730 BLAKE2B e924c9900d24565dc025af47d57173d828eea6a0d0bce462ab1e9cb38a14b1ac14b4148797c164212473852f5c0525161766b115b5a435fbfd673dbde8e14765 SHA512 2af250da696c4d0f613191e7a2e3084b2aa1dc995665a4164324cdb2cc56af7b000b8a2f5d5e7ac8ebbad3ae0ba4fc8eb641afe65c1a842a633c19e95ba3e65a +DIST flowgrind-0.8.2.tar.bz2 264486 BLAKE2B f0135abad43066895ce9acfb0050d12a22054d03f59e48164cde0444b3677a7581e86f25a5a967279432c95a65811135a5ce28da0f041553bca6299aabd783fa SHA512 6d1395881f45fb04b2c73bc7e01cea6610795b58f59c297577c8f30942c81334e8e95cefb2331e5e40dc5f4df64a21307a94d471113251fd3127272cd081bb7b diff --git a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild deleted file mode 100644 index 4acc5ca2d459..000000000000 --- a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Network performance measurement tool" -HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug gsl pcap" - -RDEPEND="dev-libs/xmlrpc-c[abyss,curl] - gsl? ( sci-libs/gsl ) - pcap? ( net-libs/libpcap )" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - $(use_enable debug) \ - $(use_enable gsl) \ - $(use_enable pcap) -} diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild index 22232ba540d3..61eabf771920 100644 --- a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild +++ b/net-analyzer/flowgrind/flowgrind-0.8.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Network performance measurement tool" HOMEPAGE="http://flowgrind.net/ https://github.com/flowgrind/flowgrind/" @@ -10,22 +10,18 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug doc gsl pcap" +IUSE="doc gsl pcap" -RDEPEND=" +RDEPEND="dev-libs/xmlrpc-c:=[abyss,curl] sys-apps/util-linux - dev-libs/xmlrpc-c[abyss,curl] - gsl? ( sci-libs/gsl ) - pcap? ( net-libs/libpcap ) -" -DEPEND=" - ${RDEPEND} - doc? ( app-doc/doxygen ) -" + gsl? ( sci-libs/gsl:= ) + pcap? ( net-libs/libpcap )" +DEPEND="${RDEPEND}" +BDEPEND="doc? ( app-text/doxygen )" src_configure() { econf \ - $(use_enable debug) \ + --disable-debug \ $(use_with doc doxygen) \ $(use_with gsl) \ $(use_with pcap) diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml index c16842bb234d..f204a22693f6 100644 --- a/net-analyzer/flowgrind/metadata.xml +++ b/net-analyzer/flowgrind/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest index 08b6cafaf00b..78cb10654baa 100644 --- a/net-analyzer/fping/Manifest +++ b/net-analyzer/fping/Manifest @@ -1,6 +1,2 @@ -DIST fping-3.13.tar.gz 155976 BLAKE2B 6f5b825fd215a4329c35022e326df2e9dc7454b03e9a960074aef451277d2d99af23ccf451379d44a76776fec135983c7948c8bd54bde98c7f79180e59ced616 SHA512 d6c1c5b9edb97ef59cfb6d22f74f6a055e52465d3ba0f93be35b6fc9615ee08490ee927f3cf9efd087e18279519292f353abe6152061985ee166ba5f7e95e29d -DIST fping-4.0.tar.gz 170060 BLAKE2B 1142ed700a28f28ff8710b65300754139734f89123db01fa4a3772f0a804cfa58477b30ab749426be384f7e007437a82138d319ab6a702702314e24c915db44d SHA512 5dca650e9c34dd2e1bdbb981df61cf092230f07a15c4ccef105b9f58aaaa43e0d85dc9665db89631feded503ecc6f6be86446719de18e59349adb7c2f3e9757e -DIST fping-4.1.tar.gz 170851 BLAKE2B 4cad16f05afff5d1755f58be454059d1959cce1c9f50a8af1b20c34f51b3dca9b4238fd934b46ad11cb71c539c3a1f82531b44f585c774a0c28a4786105e3c0c SHA512 cd31ea336985f8d727b0db3c70213b827f0282b0c382694e10c72a89c425f2f7383d07f8f2febdc23aa246ebbf65ac9751b2404be405088963a682945edc80ba -DIST fping-4.2.tar.gz 171409 BLAKE2B 7f61d7bb06e486c327539443bfd441e494d44cdf0f949c73272e51e0867f1b39b2c3ea7df62856b493e05d9964220e03e632df839a84a15ee92168389cc55668 SHA512 2bab34dae539d942eb5e436802e6f74d57c04aa4b782f9adbd6c27830209fdb47707131f20ed966012bcec3d253c9bb3df9033a60b55bfe560af6bb1f572ee8a -DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 BLAKE2B fe229b5042445665403f40c5a7740e024c836176a375c77440a827463adb3ed219a9c6da73375482baa81c1134764d3cfafebc44aef7596dd380e0964ff130e0 SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 -DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 BLAKE2B b3495c304d1108732cf5aedbf3665ce2ce50be5ca051b724e92583197f9aa7f84e41655b9c3438e0715eb8210ec79fb17a020904fa0d1cfef43f7178f622ea87 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 +DIST fping-5.1.tar.gz 191224 BLAKE2B 2fb344e650b5a359fb8780f2c599455d39405ae823edf695ee4385aa2661dc5811e088bafa1b9f53846ee90c0afa959a92832381a03346d1fda048eb4e7ee098 SHA512 1a208da8dcd99093d0512af5d85ba5e7b5743ec97993d24c1fe612bb58d93090ac1ba0952f648aa075f16d390a77c4be65e394ae56dbede2a6914e0e8c68e2bd +DIST fping-5.2.tar.gz 194259 BLAKE2B 7efb445f32ffe2d3766d598da5f1585270ae8e68ceb8b64e418040f330e7736bfaf0313077e28b12031af25ed7952943603d3a5908174c3f78d9a1af0b735da9 SHA512 062896662804c55ffe2d4e3eb7efc2ff796d20a77b367e16f8fa381e302986b5127ca55f0866bbf08f8ae2b2f6795ec4c5d43dc59ebec157fb3e8eff25d0bdb3 diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch deleted file mode 100644 index 38946ac38524..000000000000 --- a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/fping.c -+++ b/fping.c -@@ -106,6 +106,7 @@ - - #include <arpa/inet.h> - #include <netdb.h> -+#include <err.h> /* err() warnx() */ - - /* RS6000 has sys/select.h */ - #ifdef HAVE_SYS_SELECT_H diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch deleted file mode 100644 index a101fd4ae0e1..000000000000 --- a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/fping.c -+++ b/fping.c -@@ -25,6 +25,7 @@ - * Original author: Roland Schemers <schemers@stanford.edu> - * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl> - * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de) -+ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net) - * - * - * RCS header information no longer used. It has been moved to the -@@ -743,7 +744,7 @@ - - if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) ) - { -- fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n", -+ fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n", - prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA ); - usage(); - -@@ -1112,7 +1113,7 @@ - ht = timeval_diff( ¤t_time, &cursor->last_send_time ); - - if( report_interval && ( loop_flag || count_flag ) && -- ( timeval_diff ( ¤t_time, &last_report_time ) > report_interval ) ) -+ ( timeval_diff ( ¤t_time, &last_report_time ) >= report_interval ) ) - { - print_per_system_splits(); - gettimeofday( ¤t_time, &tz ); -@@ -1487,8 +1488,8 @@ - }/* IF */ - - fprintf( stderr, "\n" ); -- h->num_sent_i = h->num_recv_i = h->max_reply_i = -- h->min_reply_i = h->total_time_i = 0; -+ h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0; -+ h->min_reply_i = 10000000; - - }/* FOR */ - -@@ -2377,6 +2378,7 @@ - p->timeout = timeout; - p->running = 1; - p->min_reply = 10000000; -+ p->min_reply_i = 10000000; - - if( strlen( p->host ) > max_hostname_len ) - max_hostname_len = strlen( p->host ); diff --git a/net-analyzer/fping/files/fping-4.1-ipv6.patch b/net-analyzer/fping/files/fping-4.1-ipv6.patch deleted file mode 100644 index 7889b568a194..000000000000 --- a/net-analyzer/fping/files/fping-4.1-ipv6.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/fping.c -+++ b/src/fping.c -@@ -687,7 +687,11 @@ int main(int argc, char** argv) - - /* validate various option settings */ - -- if (socket4 < 0 && socket6 < 0) { -+ if (socket4 < 0 -+#ifdef IPV6 -+ && socket6 < 0 -+#endif -+ ) { - crash_and_burn("can't create socket (must run as root?)"); - } - diff --git a/net-analyzer/fping/files/fping-4.2-fno-common.patch b/net-analyzer/fping/files/fping-4.2-fno-common.patch deleted file mode 100644 index d18af66b0637..000000000000 --- a/net-analyzer/fping/files/fping-4.2-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/fping.h -+++ b/src/fping.h -@@ -11,7 +11,7 @@ - void crash_and_burn( char *message ); - void errno_crash_and_burn( char *message ); - int in_cksum( unsigned short *p, int n ); --int random_data_flag; -+extern int random_data_flag; - - /* socket.c */ - int open_ping_socket_ipv4(); diff --git a/net-analyzer/fping/files/fping-4.2-fping6-6.patch b/net-analyzer/fping/files/fping-4.2-fping6-6.patch deleted file mode 100644 index 63138d3e2d2c..000000000000 --- a/net-analyzer/fping/files/fping-4.2-fping6-6.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 6fd4f8bd91abc43f80078bdd0084cb6d2b1de7f1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Johan=20Str=C3=B6m?= <johan@stromnet.se> -Date: Tue, 25 Jun 2019 14:03:14 +0200 -Subject: [PATCH] Do not fail if using fping6 with -6 flag - -Mostly for backwards compatability ---- - src/fping.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/fping.c -+++ b/src/fping.c -@@ -435,7 +435,7 @@ - break; - case '6': - #ifdef IPV6 -- if (hints_ai_family != AF_UNSPEC) { -+ if (hints_ai_family != AF_UNSPEC && hints_ai_family != AF_INET6) { - fprintf(stderr, "%s: can't specify both -4 and -6\n", prog); - exit(1); - } diff --git a/net-analyzer/fping/files/fping-5.1-c99-musl.patch b/net-analyzer/fping/files/fping-5.1-c99-musl.patch new file mode 100644 index 000000000000..d56bb501682c --- /dev/null +++ b/net-analyzer/fping/files/fping-5.1-c99-musl.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/895182 +https://github.com/schweikert/fping/commit/c0fbccb977c523ba671afdf0f37de40d26351f77 + +From c0fbccb977c523ba671afdf0f37de40d26351f77 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 29 Aug 2022 15:41:51 -0700 +Subject: [PATCH] fping: Initialize msghdr struct in a portable way + +Initializing the structure assuming glibc layout results in +compile errors on musl, therefore do partial intialization and then +assigning the members individually. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/fping.c ++++ b/src/fping.c +@@ -1962,15 +1962,13 @@ int receive_packet(int64_t wait_time, + reply_buf, + reply_buf_len + }; +- struct msghdr recv_msghdr = { +- reply_src_addr, +- reply_src_addr_len, +- &msg_iov, +- 1, +- &msg_control, +- sizeof(msg_control), +- 0 +- }; ++ struct msghdr recv_msghdr = {0}; ++ recv_msghdr.msg_name = reply_src_addr; ++ recv_msghdr.msg_namelen = reply_src_addr_len; ++ recv_msghdr.msg_iov = &msg_iov; ++ recv_msghdr.msg_iovlen = 1; ++ recv_msghdr.msg_control = &msg_control; ++ recv_msghdr.msg_controllen = sizeof(msg_control); + #if HAVE_SO_TIMESTAMPNS + struct cmsghdr *cmsg; + #endif + diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild deleted file mode 100644 index ad06eea4b316..000000000000 --- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic - -DESCRIPTION="A utility to ping multiple hosts at once" -SRC_URI=" - mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6.orig.tar.gz - mirror://debian/pool/main/f/${PN}/${PN}_2.4b2-to-ipv6-16.1.diff.gz - " -HOMEPAGE="http://fping.sourceforge.net/ https://packages.qa.debian.org/f/fping.html" - -SLOT="0" -LICENSE="fping" -KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6" - -S="${WORKDIR}/fping-2.4b2_to-ipv6" - -src_prepare() { - epatch \ - "${WORKDIR}"/fping_2.4b2-to-ipv6-16.1.diff \ - "${FILESDIR}"/${P}-err.h.patch \ - "${FILESDIR}"/${P}-min-time.patch - eautoreconf - - if use ipv6; then - cp -a "${S}" "${S}-6" - fi -} - -src_configure() { - econf - if use ipv6; then - cd "${S}-6" - append-flags -DIPV6 - econf - fi -} - -src_compile() { - emake - if use ipv6; then - cd "${S}-6" - emake - fi -} - -src_install () { - dosbin "${S}"/${PN} - if use ipv6; then - newsbin "${S}"-6/fping fping6 - fperms 4555 /usr/sbin/fping6 #241930 - fi - fperms 4555 /usr/sbin/fping #241930 - doman fping.8 - dodoc ChangeLog README -} diff --git a/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild deleted file mode 100644 index fa15e77e7f97..000000000000 --- a/net-analyzer/fping/fping-3.13.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A utility to ping multiple hosts at once" -HOMEPAGE="http://fping.org/" -SRC_URI="http://fping.org/dist/${P}.tar.gz" - -LICENSE="fping" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 suid" - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid ; then - fperms u+s /usr/sbin/fping - use ipv6 && fperms u+s /usr/sbin/fping6 - fi -} diff --git a/net-analyzer/fping/fping-4.0.ebuild b/net-analyzer/fping/fping-4.0.ebuild deleted file mode 100644 index 82fc433b4cc2..000000000000 --- a/net-analyzer/fping/fping-4.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A utility to ping multiple hosts at once" -HOMEPAGE="http://fping.org/" -SRC_URI="http://fping.org/dist/${P}.tar.gz" - -LICENSE="fping" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 suid" - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid ; then - fperms u+s /usr/sbin/fping - fi -} diff --git a/net-analyzer/fping/fping-4.1.ebuild b/net-analyzer/fping/fping-4.1.ebuild deleted file mode 100644 index 0c25ab5c1df4..000000000000 --- a/net-analyzer/fping/fping-4.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A utility to ping multiple hosts at once" -HOMEPAGE="http://fping.org/" -SRC_URI="http://fping.org/dist/${P}.tar.gz" - -LICENSE="fping" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 suid" - -PATCHES=( - "${FILESDIR}"/${PN}-4.1-ipv6.patch -) - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid ; then - fperms u+s /usr/sbin/fping - fi -} diff --git a/net-analyzer/fping/fping-4.2.ebuild b/net-analyzer/fping/fping-4.2.ebuild deleted file mode 100644 index fff3fa9ccd77..000000000000 --- a/net-analyzer/fping/fping-4.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A utility to ping multiple hosts at once" -HOMEPAGE="https://fping.org/" -SRC_URI="https://fping.org/dist/${P}.tar.gz" - -LICENSE="fping" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 suid" - -PATCHES=( - "${FILESDIR}"/${PN}-4.2-fno-common.patch -) - -src_configure() { - econf $(use_enable ipv6) -} - -src_install() { - default - - if use suid ; then - fperms u+s /usr/sbin/fping - fi -} diff --git a/net-analyzer/fping/fping-4.2-r1.ebuild b/net-analyzer/fping/fping-5.1-r1.ebuild index 0e1b61dd97e7..0b69f0dcac00 100644 --- a/net-analyzer/fping/fping-4.2-r1.ebuild +++ b/net-analyzer/fping/fping-5.1-r1.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit fcaps DESCRIPTION="A utility to ping multiple hosts at once" -HOMEPAGE="https://fping.org/" +HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/" SRC_URI="https://fping.org/dist/${P}.tar.gz" LICENSE="fping" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 suid" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="suid" FILECAPS=( cap_net_raw+ep usr/sbin/fping ) + PATCHES=( - "${FILESDIR}"/${PN}-4.2-fno-common.patch - "${FILESDIR}"/${PN}-4.2-fping6-6.patch + "${FILESDIR}"/${PN}-5.1-c99-musl.patch ) src_configure() { - econf $(use_enable ipv6) + econf --enable-ipv6 } src_install() { @@ -30,7 +31,5 @@ src_install() { fperms u+s /usr/sbin/fping fi - if use ipv6; then - dosym fping /usr/sbin/fping6 - fi + dosym fping /usr/sbin/fping6 } diff --git a/net-analyzer/fping/fping-5.1.ebuild b/net-analyzer/fping/fping-5.1.ebuild new file mode 100644 index 000000000000..5ff5eaf654b1 --- /dev/null +++ b/net-analyzer/fping/fping-5.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps + +DESCRIPTION="A utility to ping multiple hosts at once" +HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/" +SRC_URI="https://fping.org/dist/${P}.tar.gz" + +LICENSE="fping" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +IUSE="suid" + +FILECAPS=( cap_net_raw+ep usr/sbin/fping ) + +src_configure() { + econf --enable-ipv6 +} + +src_install() { + default + + if use suid; then + fperms u+s /usr/sbin/fping + fi + + dosym fping /usr/sbin/fping6 +} diff --git a/net-analyzer/fping/fping-5.2.ebuild b/net-analyzer/fping/fping-5.2.ebuild new file mode 100644 index 000000000000..4cd7221d0476 --- /dev/null +++ b/net-analyzer/fping/fping-5.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps + +DESCRIPTION="Utility to ping multiple hosts at once" +HOMEPAGE="https://fping.org/ https://github.com/schweikert/fping/" +SRC_URI=" + https://fping.org/dist/${P}.tar.gz + https://github.com/schweikert/fping/releases/download/v${PV}/${P}.tar.gz +" + +LICENSE="fping" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="debug suid" +# There are some tests in ci/* but they don't seem to be for packaging +# (they want to modify the live FS by e.g. copying to /tmp.) +RESTRICT="test" + +FILECAPS=( cap_net_raw+ep usr/sbin/fping ) + +src_configure() { + econf \ + $(use_enable debug) \ + --enable-ipv6 +} + +src_install() { + default + + if use suid; then + fperms u+s /usr/sbin/fping + fi + + dosym fping /usr/sbin/fping6 +} diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml index 1801de2b7670..162af0fb9eae 100644 --- a/net-analyzer/fping/metadata.xml +++ b/net-analyzer/fping/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>A utility to ping multiple hosts at once</longdescription> <upstream> <remote-id type="sourceforge">fping</remote-id> + <remote-id type="github">schweikert/fping</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/fprobe/files/conf.d-fprobe b/net-analyzer/fprobe/files/conf.d-fprobe-r1 index a93c5c10b207..ca7aff4e4341 100644 --- a/net-analyzer/fprobe/files/conf.d-fprobe +++ b/net-analyzer/fprobe/files/conf.d-fprobe-r1 @@ -6,8 +6,9 @@ # Interface IFACE=eth0 -# If configured, only capture packets matching this tcpdump expression -#FILTER="" +# required: only capture packets matching this tcpdump expression +# default is all IP + IPv6 +FILTER="ip or ip6" # Flow state timers #TIMER_EXPIRED=5 diff --git a/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch new file mode 100644 index 000000000000..9adccbe127e3 --- /dev/null +++ b/net-analyzer/fprobe/files/fprobe-1.1-autoconf.patch @@ -0,0 +1,315 @@ +https://bugs.gentoo.org/921189 + +Fix various underquoting issues and use of old macros. +--- a/configure.in ++++ b/configure.in +@@ -3,44 +3,42 @@ define([AC_CACHE_LOAD], ) + define([AC_CACHE_SAVE], ) + + AC_INIT +-AC_CANONICAL_SYSTEM +-AM_INIT_AUTOMAKE(fprobe,1.1) +-AM_CONFIG_HEADER(config.h) ++AC_CANONICAL_HOST ++AM_INIT_AUTOMAKE([fprobe], [1.1]) ++AM_CONFIG_HEADER([config.h]) + + AC_PROG_CC + AC_PROG_INSTALL + +-AC_CHECK_LIB(pthread, pthread_create, , +- AC_CHECK_LIB(c_r, pthread_create), , +- [AC_ERROR(POSIX threads not found)]) +-AC_SEARCH_LIBS(socket, socket) +-AC_SEARCH_LIBS(gethostbyname, nsl) +-AC_SEARCH_LIBS(sched_setscheduler, rt) ++AC_CHECK_LIB([pthread], [pthread_create], [], [AC_CHECK_LIB([c_r], [pthread_create], [], [AC_MSG_ERROR(POSIX threads not found)])]) ++AC_SEARCH_LIBS([socket], [socket]) ++AC_SEARCH_LIBS([gethostbyname], [nsl]) ++AC_SEARCH_LIBS([sched_setscheduler], [rt]) + + dnl ************************************************ + dnl inttypes + +-AC_CHECK_HEADER(inttypes.h, , +- [AC_CHECK_SIZEOF(int, 8) +- AC_CHECK_SIZEOF(long, 8) +- AC_CHECK_SIZEOF(long long, 8)] +-) ++AC_CHECK_HEADER([inttypes.h], [], [ ++ AC_CHECK_SIZEOF([int], [8]) ++ AC_CHECK_SIZEOF([long], [8]) ++ AC_CHECK_SIZEOF([long long], [8]) ++]) + + dnl ************************************************ + dnl OS type + +-case "${target}" in ++case "${host}" in + *-*-*linux*) +- AC_DEFINE_UNQUOTED(OS_LINUX, , OS type) +- AC_DEFINE_UNQUOTED(CLONEBASED_THREADS, , clone()-based threads) ++ AC_DEFINE_UNQUOTED([OS_LINUX], [], [OS type]) ++ AC_DEFINE_UNQUOTED([CLONEBASED_THREADS], [], [clone()-based threads]) + CFLAGS="$CFLAGS -D_BSD_SOURCE" + ;; + *-*-solaris*) +- AC_DEFINE_UNQUOTED(OS_SOLARIS, , OS type) ++ AC_DEFINE_UNQUOTED([OS_SOLARIS], [], [OS type]) + CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" + ;; + *-*-freebsd*) +- AC_DEFINE_UNQUOTED(OS_FREEBSD, , OS type) ++ AC_DEFINE_UNQUOTED([OS_FREEBSD], [], [OS type]) + CFLAGS="$CFLAGS -pthread" + ;; + esac +@@ -48,12 +46,12 @@ esac + dnl ************************************************ + dnl pcap.h location + +-AC_ARG_WITH(pcap, ++AC_ARG_WITH([pcap], + [ --with-pcap=DIR pcap.h location], +- pcap="$withval") ++ [pcap="$withval"]) + +-AC_CHECK_HEADER(pcap.h, , [ +- AC_MSG_CHECKING(for pcap.h in alternative location) ++AC_CHECK_HEADER([pcap.h], [] , [ ++ AC_MSG_CHECKING([for pcap.h in alternative location]) + found="" + pcap_dirs="$pcap /usr/include/pcap" + for pcap in $pcap_dirs; do +@@ -64,18 +62,18 @@ AC_CHECK_HEADER(pcap.h, , [ + fi + done + +- AC_MSG_RESULT($found) ++ AC_MSG_RESULT([$found]) + if test -z "$found"; then +- AC_ERROR(pcap.h not found) ++ AC_MSG_ERROR([pcap.h not found]) + fi + ]) + + dnl ************************************************ + dnl libpcap location + +-AC_ARG_WITH(libpcap, ++AC_ARG_WITH([libpcap], + [ --with-libpcap=DIR libpcap location], +- libpcap="$withval") ++ [libpcap="$withval"]) + + if test "$libpcap" = "yes"; then + libpcap="" +@@ -85,15 +83,15 @@ if test "$libpcap"; then + LDFLAGS="$LDFLAGS -L$libpcap" + fi + +-AC_CHECK_LIB(pcap, pcap_loop, , AC_ERROR(libpcap not found), $LDFLAGS) ++AC_CHECK_LIB([pcap], [pcap_loop], [], [AC_MSG_ERROR(libpcap not found)], [$LDFLAGS]) + + dnl ************************************************ + dnl Memory bulk indexing mode + +-AC_MSG_CHECKING(which memory bulk indexing mode to use) +-AC_ARG_WITH(membulk, ++AC_MSG_CHECKING([which memory bulk indexing mode to use]) ++AC_ARG_WITH([membulk], + [ --with-membulk=MODE indexing mode: index8|index16|ptr [default=ptr]], +- mem="$withval", mem="ptr") ++ [mem="$withval"], [mem="ptr"]) + + case "$mem" in + ptr) +@@ -106,95 +104,95 @@ case "$mem" in + mem_bits="16" + ;; + *) +- AC_ERROR(Invalid argument: "$mem") ++ AC_MSG_ERROR([Invalid argument: "$mem"]) + ;; + esac + +-AC_MSG_RESULT("$mem") +-AC_DEFINE_UNQUOTED(MEM_BITS, $mem_bits, Memory bulk indexing mode) ++AC_MSG_RESULT([$mem]) ++AC_DEFINE_UNQUOTED([MEM_BITS], [$mem_bits], [Memory bulk indexing mode]) + + dnl ************************************************ + dnl Hash type + +-AC_MSG_CHECKING(which hash type and size to use) +-AC_ARG_WITH(hash, ++AC_MSG_CHECKING([which hash type and size to use]) ++AC_ARG_WITH([hash], + [ --with-hash=TYPE hash type: crc16|xor16|xor8 [default=crc16]], +- hash="$withval", hash="crc16") ++ [hash="$withval"], [hash="crc16"]) + + hash_type=`echo "$hash"|cut -b -3` + hash_bits=`echo "$hash"|cut -b 4-` + + if test "$hash_type" = "xor"; then +- AC_DEFINE_UNQUOTED(HASH_TYPE_XOR, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_XOR], [], [Hash type]) + if test "$hash_bits" != "8" -a "$hash_bits" != "16"; then +- AC_ERROR(Invalid argument: "$withval") ++ AC_MSG_ERROR([Invalid argument: "$withval"]) + fi + else + if test "$hash" != "crc16"; then +- AC_ERROR(Invalid argument: "$hash") ++ AC_MSG_ERROR([Invalid argument: "$hash"]) + fi +- AC_DEFINE_UNQUOTED(HASH_TYPE_CRC, , Hash type) ++ AC_DEFINE_UNQUOTED([HASH_TYPE_CRC], [], [Hash type]) + fi + +-AC_DEFINE_UNQUOTED(HASH_BITS, $hash_bits , Hash size) +-AC_MSG_RESULT("$hash") ++AC_DEFINE_UNQUOTED([HASH_BITS], [$hash_bits], [Hash size]) ++AC_MSG_RESULT([$hash]) + + dnl ************************************************ + dnl Uptime trick + +-AC_MSG_CHECKING(whether to enable uptime trick) +-AC_ARG_ENABLE(uptime_trick, ++AC_MSG_CHECKING([whether to enable uptime trick]) ++AC_ARG_ENABLE([uptime_trick], + [ --enable-uptime_trick enable uptime trick [default=yes]], +- uptime_trick="$enableval", uptime_trick="yes") ++ [uptime_trick="$enableval"], [uptime_trick="yes"]) + case "$uptime_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(UPTIME_TRICK, , Uptime trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([UPTIME_TRICK], [], [Uptime trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl ICMP trick + +-AC_MSG_CHECKING(whether to enable icmp trick) +-AC_ARG_ENABLE(icmp_trick, ++AC_MSG_CHECKING([whether to enable icmp trick]) ++AC_ARG_ENABLE([icmp_trick], + [ --enable-icmp_trick enable icmp trick: yes|cisco|no [default=yes]], +- icmp_trick="$enableval", icmp_trick="yes") ++ [icmp_trick="$enableval"], [icmp_trick="yes"]) + case "$icmp_trick" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(ICMP_TRICK, , ICMP trick) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK], [], [ICMP trick]) + ;; + cisco) +- AC_MSG_RESULT(yes: cisco) +- AC_DEFINE_UNQUOTED(ICMP_TRICK_CISCO, , ICMP trick) ++ AC_MSG_RESULT([yes: cisco]) ++ AC_DEFINE_UNQUOTED([ICMP_TRICK_CISCO], [], [ICMP trick]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Debugging output + +-AC_MSG_CHECKING(whether to enable debugging) ++AC_MSG_CHECKING([whether to enable debugging]) + AC_ARG_ENABLE(debug, + [ --enable-debug enable debugging [default=no]], +- debug="$enableval", debug="no") ++ [debug="$enableval"], [debug="no"]) + case "$debug" in + no) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + debug_val="0" + ;; + yes) +- AC_MSG_RESULT(all) ++ AC_MSG_RESULT([all]) + debug_val="-1" + ;; + *) +- AC_MSG_RESULT(custom: $debug) ++ AC_MSG_RESULT([custom: $debug]) + debug_val="0" + debug=`echo $debug|tr , " "` + for i in $debug; do +@@ -202,43 +200,44 @@ case "$debug" in + done + ;; + esac +-AC_DEFINE_UNQUOTED(DEBUG, ($debug_val) , Debugging output) ++AC_DEFINE_UNQUOTED([DEBUG], [$debug_val], [Debugging output]) + + dnl ************************************************ + dnl Runtime messages + +-AC_MSG_CHECKING(whether to enable runtime messages) +-AC_ARG_ENABLE(messages, ++AC_MSG_CHECKING([whether to enable runtime messages]) ++AC_ARG_ENABLE([messages], + [ --enable-messages enable runtime messages [default=no]], +- messages="$enableval", messages="no") ++ [messages="$enableval"], [messages="no"]) + case "$messages" in + yes) +- AC_MSG_RESULT(yes) +- AC_DEFINE_UNQUOTED(MESSAGES, , Runtime messages) ++ AC_MSG_RESULT([yes]) ++ AC_DEFINE_UNQUOTED([MESSAGES], [], [Runtime messages]) + ;; + *) +- AC_MSG_RESULT(no) ++ AC_MSG_RESULT([no]) + ;; + esac + + dnl ************************************************ + dnl Pidfiles location + +-AC_MSG_CHECKING(directory to store pidfiles) +-AC_ARG_WITH(piddir, ++AC_MSG_CHECKING([directory to store pidfiles]) ++AC_ARG_WITH([piddir], + [ --with-piddir=DIR pidfiles location [default=/var/run]], +- piddir="$withval", piddir="/var/run") +- AC_DEFINE_UNQUOTED(PID_DIR, "$piddir", Pidfiles location) +- AC_MSG_RESULT("$piddir") ++ [piddir="$withval"], [piddir="/var/run"]) ++AC_DEFINE_UNQUOTED([PID_DIR], ["$piddir"], [Pidfiles location]) ++AC_MSG_RESULT([$piddir]) + + dnl ************************************************ + + CFLAGS="$CFLAGS -D_REENTRANT" + CFLAGS="$CFLAGS -DWALL -W -Wall" + +-AC_SUBST(PACKAGE) +-AC_SUBST(VERSION) ++AC_SUBST([PACKAGE]) ++AC_SUBST([VERSION]) + DATE=`date +%Y-%m-%d` +-AC_SUBST(DATE) ++AC_SUBST([DATE]) + +-AC_OUTPUT(Makefile src/Makefile) ++AC_CONFIG_FILES([Makefile src/Makefile]) ++AC_OUTPUT diff --git a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch index 803a2a9ce43a..948c6fee29c1 100644 --- a/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch +++ b/net-analyzer/fprobe/files/fprobe-1.1-setgroups.patch @@ -4,15 +4,12 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> --- a/src/fprobe.c +++ b/src/fprobe.c -@@ -1541,10 +1541,10 @@ - } - +@@ -1543,7 +1543,7 @@ if (pw) { - if (setgroups(0, NULL) < 0) { - my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); + if (setgroups(0, NULL) < 0) { + my_log(LOG_CRIT, "setgroups: %s", strerror(errno)); - exit(1); + //exit(1); - } + } if (setregid(pw->pw_gid, pw->pw_gid)) { my_log(LOG_CRIT, "setregid(%u): %s", pw->pw_gid, strerror(errno)); - exit(1); diff --git a/net-analyzer/fprobe/files/init.d-fprobe b/net-analyzer/fprobe/files/init.d-fprobe-r1 index c470af432c9c..2dc84b8bfbe9 100644 --- a/net-analyzer/fprobe/files/init.d-fprobe +++ b/net-analyzer/fprobe/files/init.d-fprobe-r1 @@ -15,7 +15,6 @@ start() { ebegin "Starting fprobe" local OPTS="" [ "${PROMISC}" = "yes" ] || OPTS="${OPTS} -p" - [ -n "${FILTER}" ] && OPTS="${OPTS} -f '${FILTER}'" for optname in i:IFACE s:TIMER_EXPIRED g:TIME_FRAGMENTED d:TIMER_IDLE \ e:TIMER_ACTIVE n:FLOW_VER a:LOCALIP x:SNMP_IFACE b:MEMBULK \ m:MEMLIMIT q:PENDING B:KERNBUF r:RTPRIO t:DELAY S:SNAPLEN \ @@ -27,7 +26,7 @@ start() { OPTS="${OPTS} -l 1:${PIDFILE_ID} ${COLLECTORS}" start-stop-daemon --start --exec $BIN \ --pidfile ${PIDFILE} \ - -- ${OPTS} + -- -f "${FILTER}" ${OPTS} eend $? } diff --git a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild index d86d043a9c3f..31aa5507e0c1 100644 --- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild +++ b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild @@ -1,43 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" -HOMEPAGE="http://fprobe.sourceforge.net" -LICENSE="GPL-2" +HOMEPAGE="https://fprobe.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/fprobe/${P}.tar.bz2" -SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - +KEYWORDS="amd64 ppc x86" IUSE="debug messages" -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + PATCHES=( "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch "${FILESDIR}"/fprobe-1.1-setgroups.patch ) +src_prepare() { + default + + # Clang 16, bug #899924 + eautoreconf +} + src_configure() { econf \ $(use_enable debug) \ $(use_enable messages) } -DOCS=( AUTHORS NEWS README TODO ) - src_install() { default docinto contrib dodoc contrib/tg.sh - newinitd "${FILESDIR}"/init.d-fprobe fprobe - newconfd "${FILESDIR}"/conf.d-fprobe fprobe + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe } diff --git a/net-analyzer/fprobe/fprobe-1.1-r7.ebuild b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild new file mode 100644 index 000000000000..6fcab549b32c --- /dev/null +++ b/net-analyzer/fprobe/fprobe-1.1-r7.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows" +HOMEPAGE="https://fprobe.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/fprobe/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="debug messages" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/fprobe-1.1-pidfile-sanity.patch + "${FILESDIR}"/fprobe-1.1-setgroups.patch + "${FILESDIR}"/fprobe-1.1-autoconf.patch +) + +src_prepare() { + default + + # Clang 16, bug #899924 + eautoreconf +} + +src_configure() { + econf \ + $(use_enable debug) \ + $(use_enable messages) +} + +src_install() { + default + + docinto contrib + dodoc contrib/tg.sh + + newinitd "${FILESDIR}"/init.d-fprobe-r1 fprobe + newconfd "${FILESDIR}"/conf.d-fprobe-r1 fprobe +} diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml index 0fd136315cb2..e0651bda4243 100644 --- a/net-analyzer/fprobe/metadata.xml +++ b/net-analyzer/fprobe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch b/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch new file mode 100644 index 000000000000..69fa067859aa --- /dev/null +++ b/net-analyzer/fragroute/files/fragroute-1.2.6-libdir.patch @@ -0,0 +1,160 @@ +--- a/configure.in ++++ b/configure.in +@@ -22,157 +22,12 @@ + AC_PROG_LN_S + AC_PROG_RANLIB + +-dnl XXX - we need MingW32 under Cygwin for win32 +-AC_CYGWIN +-if test "$CYGWIN" = yes ; then +- if test -d /usr/include/mingw; then +- CPPFLAGS="$CPPFLAGS -mno-cygwin" +- CFLAGS="$CFLAGS -mno-cygwin" +- AC_DEFINE(WIN32_LEAN_AND_MEAN, 1, +- [Define for faster code generation.]) +- AC_DEFINE(snprintf, _snprintf, [Use MingW32's internal snprintf]) +- AC_DEFINE(vsnprintf, _vsnprintf, [Use MingW32's internal vsnprintf]) +- else +- AC_MSG_ERROR([need MingW32 package to build under Cygwin]) +- fi +- dnl XXX - use our internal event-win32 hack +- EVENTINC="-I${srcdir}/win32" +- AC_LIBOBJ([event-win32]) +- AC_SUBST(EVENTINC) +- +-else +-dnl XXX - BEGIN !CYGWIN +- +- +-dnl Checks for libevent +-AC_MSG_CHECKING(for libevent) +-AC_ARG_WITH(libevent, +-[ --with-libevent=DIR use libevent in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/include/event.h -a -f $withval/lib/libevent.so; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- EVENTINC="-I$withval/include" +- EVENTLIB="-L$withval/lib -levent" +- elif test -f $withval/include/event.h -a -f $withval/lib64/libevent.so; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- EVENTINC="-I$withval/include" +- EVENTLIB="-L$withval/lib64 -levent" +- elif test -f $withval/event.h -a -f $withval/libevent.so; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- EVENTINC="-I$withval" +- EVENTLIB="-L$withval -levent" +- else +- AC_ERROR(event.h or libevent.so not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/event.h -a -f ${prefix}/lib/libevent.so; then +- EVENTINC="-I${prefix}/include" +- EVENTLIB="-L${prefix}/lib -levent" +- elif test -f ${prefix}/include/event.h -a -f ${prefix}/lib64/libevent.so; then +- EVENTINC="-I${prefix}/include" +- EVENTLIB="-L${prefix}/lib64 -levent" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libevent not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(EVENTINC) + AC_SUBST(EVENTLIB) + +-dnl XXX - END !CYGWIN +-fi +- +-dnl Checks for libpcap +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, +-[ --with-libpcap=DIR use libpcap in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.so; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- elif test -f $withval/include/pcap.h -a \ +- -f $withval/include/pcap-bpf.h; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval/include" +- if test -f $withval/lib/libwpcap.a; then +- PCAPLIB="-L$withval/lib -lwpcap" +- else +- PCAPLIB="-L$withval/lib -lpcap" +- fi +- else +- AC_ERROR(pcap.h, pcap-bpf.h, or libpcap.so not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/pcap.h; then +- PCAPINC="-I${prefix}/include" +- if test -f ${prefix}/lib/libwpcap.a; then +- PCAPLIB="-L${prefix}/lib -lwpcap" +- else +- PCAPLIB="-L${prefix}/lib -lpcap" +- fi +- elif test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- PCAPLIB="-lpcap" +- elif test -f /usr/include/pcap.h; then +- PCAPLIB="-lpcap" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libpcap not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(PCAPINC) + AC_SUBST(PCAPLIB) + +-dnl Checks for (installed) libdnet +-AC_MSG_CHECKING(for libdnet) +-AC_ARG_WITH(libdnet, +-[ --with-libdnet=DIR use libdnet in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/src/libdnet.so; then +- DNETINC="-I$withval/include" +- DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`" +- elif test -x $withval/bin/dnet-config; then +- DNETINC="`$withval/bin/dnet-config --cflags`" +- DNETLIB="`$withval/bin/dnet-config --libs`" +- else +- AC_ERROR(dnet-config not found in $withval/bin) +- fi +- ;; +- esac ], +-[ if test -x ${prefix}/bin/dnet-config; then +- DNETINC="`${prefix}/bin/dnet-config --cflags`" +- DNETLIB="`${prefix}/bin/dnet-config --libs`" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libdnet not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(DNETINC) + AC_SUBST(DNETLIB) + diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild deleted file mode 100644 index 53aaa81ffc3d..000000000000 --- a/net-analyzer/fragroute/fragroute-1.2.6-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${P}-ipv6" - -inherit autotools - -DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks" -HOMEPAGE="https://github.com/stsi/fragroute-ipv6" -SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86" - -RDEPEND=" - dev-libs/libevent - net-libs/libpcap - >=dev-libs/libdnet-1.12[ipv6] -" -DEPEND=" - ${RDEPEND} - virtual/awk -" -DOCS=( INSTALL README TODO ) -PATCHES=( - "${FILESDIR}"/${P}-pcap_open.patch -) -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - # Remove broken and old files, autotools will regen needed files - rm *.m4 acconfig.h missing Makefile.in || die - # Add missing includes - sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die - eautoreconf -} - -src_configure() { - econf \ - --with-libdnet="${EPREFIX}"/usr \ - --with-libevent="${EPREFIX}"/usr \ - --with-libpcap="${EPREFIX}"/usr -} diff --git a/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild index 1043d0fd9879..4dabe888f8a2 100644 --- a/net-analyzer/fragroute/fragroute-1.2.6-r2.ebuild +++ b/net-analyzer/fragroute/fragroute-1.2.6-r4.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 - MY_P="${P}-ipv6" - inherit autotools DESCRIPTION="Testing of network intrusion detection systems, firewalls and TCP/IP stacks" @@ -13,35 +11,44 @@ SRC_URI="https://fragroute-ipv6.googlecode.com/files/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" RDEPEND=" + >=dev-libs/libdnet-1.14-r1 dev-libs/libevent:= net-libs/libpcap - >=dev-libs/libdnet-1.12[ipv6] " DEPEND=" ${RDEPEND} - virtual/awk +" +BDEPEND=" + app-alternatives/awk " DOCS=( INSTALL README TODO ) PATCHES=( + "${FILESDIR}"/${P}-libdir.patch "${FILESDIR}"/${P}-pcap_open.patch ) S="${WORKDIR}/${MY_P}" src_prepare() { default + # Remove broken and old files, autotools will regen needed files rm *.m4 acconfig.h missing Makefile.in || die + # Add missing includes sed -i -e "/#define IPUTIL_H/a#include <stdio.h>\n#include <stdint.h>" iputil.h || die + eautoreconf } src_configure() { econf \ - --with-libdnet="${EPREFIX}"/usr \ - --with-libevent="${EPREFIX}"/usr \ - --with-libpcap="${EPREFIX}"/usr + DNETINC='' \ + DNETLIB=-ldnet \ + EVENTINC='' \ + EVENTLIB=-levent \ + PCAPINC='' \ + PCAPLIB=-lpcap } diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml index f8f153715435..0a1a4df8d8a0 100644 --- a/net-analyzer/fragroute/metadata.xml +++ b/net-analyzer/fragroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ftester/ftester-1.0.ebuild b/net-analyzer/ftester/ftester-1.0.ebuild index aabe8017d39e..a14b04707519 100644 --- a/net-analyzer/ftester/ftester-1.0.ebuild +++ b/net-analyzer/ftester/ftester-1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Firewall and Intrusion Detection System testing tool" HOMEPAGE="http://dev.inversepath.com/trac/ftester" diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml index f7f593381e2c..d5af4bcfaf13 100644 --- a/net-analyzer/ftester/metadata.xml +++ b/net-analyzer/ftester/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription> - Ftester - Firewall and Intrusion Detection System testing tool - </longdescription> </pkgmetadata> diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest index aa622d9eff42..5572520f8b49 100644 --- a/net-analyzer/fwlogwatch/Manifest +++ b/net-analyzer/fwlogwatch/Manifest @@ -1,2 +1 @@ -DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6 DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85 diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild deleted file mode 100644 index 54a2095f9c3d..000000000000 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="A packet filter and firewall log analyzer" -HOMEPAGE="http://fwlogwatch.inside-security.de/" -SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" - -KEYWORDS="amd64 ~ppc sparc x86" -LICENSE="GPL-1" -SLOT="0" -IUSE="nls zlib" - -RDEPEND=" - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - sys-devel/flex - nls? ( sys-devel/gettext ) -" - -src_prepare() { - if use nls; then - strip-linguas -i po/ - local lingua pofile - for pofile in po/*.po; do - lingua=${pofile/po\/} - lingua=${lingua/.po} - if ! has ${lingua} ${LINGUAS}; then - sed -i \ - -e "/${lingua}.[mp]o/d" \ - Makefile po/Makefile || die - fi - done - fi - - sed -i \ - -e '/^INSTALL_/s|$| -D|g' \ - -e 's|make|$(MAKE)|g ' \ - Makefile || die -} - -src_configure() { - if ! use zlib; then - sed -i Makefile -e '/^LIBS/ s|-lz||g' || die - else - append-cflags -DHAVE_ZLIB - fi - - use nls && append-cflags -DHAVE_GETTEXT -} - -src_compile() { - emake \ - CC=$(tc-getCC) \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" - use nls && emake -C po -} - -src_install() { - emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install - use nls && emake \ - LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ - install-i18n - - dosbin contrib/fwlw_notify - dosbin contrib/fwlw_respond - - dodoc AUTHORS ChangeLog CREDITS README - - insinto /usr/share/fwlogwatch/contrib - - doins contrib/fwlogsummary.cgi - doins contrib/fwlogsummary_small.cgi - doins contrib/fwlogwatch.php - - insinto /etc - doins fwlogwatch.config -} diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild index 93b1e6a2a352..ed6ff796ace8 100644 --- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild +++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5-r1.ebuild @@ -1,30 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils flag-o-matic toolchain-funcs +inherit flag-o-matic strip-linguas toolchain-funcs DESCRIPTION="A packet filter and firewall log analyzer" HOMEPAGE="http://fwlogwatch.inside-security.de/" SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" LICENSE="GPL-1" SLOT="0" +KEYWORDS="amd64 ~ppc sparc x86" IUSE="geoip nls zlib" RDEPEND=" + virtual/libcrypt:= geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${RDEPEND} - sys-devel/flex +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex nls? ( sys-devel/gettext ) " src_prepare() { + default + if use nls; then strip-linguas -i po/ local lingua pofile @@ -62,7 +65,7 @@ src_configure() { src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" use nls && emake -C po @@ -72,6 +75,7 @@ src_install() { emake \ LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ install + use nls && emake \ LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \ install-i18n diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/fwlogwatch/metadata.xml +++ b/net-analyzer/fwlogwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild index 5a99e658ec60..808eea74cb25 100644 --- a/net-analyzer/gensink/gensink-4.1-r2.ebuild +++ b/net-analyzer/gensink/gensink-4.1-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit base toolchain-funcs +inherit toolchain-funcs DESCRIPTION="A simple TCP benchmark suite" HOMEPAGE="http://jes.home.cern.ch/jes/gensink/" @@ -12,7 +12,9 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -PATCHES=( "${FILESDIR}/${P}-make.patch" ) +PATCHES=( + "${FILESDIR}/${P}-make.patch" +) src_compile() { tc-export CC diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/gensink/metadata.xml +++ b/net-analyzer/gensink/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest index d63b7d4fc227..3bf87fa30249 100644 --- a/net-analyzer/gnome-nettool/Manifest +++ b/net-analyzer/gnome-nettool/Manifest @@ -1 +1 @@ -DIST gnome-nettool-3.8.1.tar.xz 589024 BLAKE2B f12c43b713ae81a2460b12c150e2c52baf98900b14ce0ff188b3fb1a55aa636391fb62d9c20b40d3a60ff322d4af9744d072c2727a77bced056ef0df042e21cf SHA512 c1c90fa727ebbf21442c4d0f5f4e98acf91fdd68a476f5f378167f92c3d7938ef33598525b62b838dc9b485abeb40171bdffb0fe3cb060fd3982db013a30bbed +DIST gnome-nettool-42.0.tar.xz 422880 BLAKE2B 847f14781865eb936f0ded28a3f45ffa4ed02a20d335aea95a623795a2bb40bf57a49ecb28b26088c2818d028a401b3ef346806ea60305022bcafc9972094f4e SHA512 a640cd7f2008be870c4c457d3f793e6d31a10457b826641ef3cb9b831ea1d80756abc2a39aef7cb093905adafe41f27ee3c5648b1a6a3a01aa3d3ee7988330ce diff --git a/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch new file mode 100644 index 000000000000..e1da4288a742 --- /dev/null +++ b/net-analyzer/gnome-nettool/files/42.0-meson-drop-unused-positional-arguments.patch @@ -0,0 +1,38 @@ +https://gitlab.gnome.org/GNOME/gnome-nettool/-/merge_requests/3 + +From 1124c3e1fdb8472d30b7636500229aa16cdc1244 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha <jeremy.bicha@canonical.com> +Date: Wed, 6 Apr 2022 13:05:25 -0400 +Subject: [PATCH] meson: drop unused positional arguments + +This fixes a build error with newer meson +--- + data/meson.build | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 585e6d3..ed1e8bb 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -20,16 +20,14 @@ desktop_in = configure_file(input: 'gnome-nettool.desktop.in.in', + output: 'gnome-nettool.desktop.in', + configuration: desktop_conf) + +-i18n.merge_file('desktop', +- type: 'desktop', ++i18n.merge_file(type: 'desktop', + input: desktop_in, + output: 'gnome-nettool.desktop', + po_dir: po_dir, + install: true, + install_dir: join_paths(prefix, datadir, 'applications')) + +-i18n.merge_file('appdata', +- type: 'xml', ++i18n.merge_file(type: 'xml', + input: 'gnome-nettool.appdata.xml.in', + output: 'gnome-nettool.appdata.xml', + po_dir: po_dir, +-- +GitLab + diff --git a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild deleted file mode 100644 index c168c33de958..000000000000 --- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" - -inherit eutils gnome2 - -DESCRIPTION="Graphical front-ends to various networking command-line" -HOMEPAGE="https://git.gnome.org/browse/gnome-nettool/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -COMMON_DEPEND=" - >=dev-libs/glib-2.25.10:2 - gnome-base/libgtop:2= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.90.4:3 - x11-libs/pango -" -RDEPEND="${COMMON_DEPEND} - || ( - net-misc/iputils - net-analyzer/tcptraceroute - net-analyzer/traceroute - sys-freebsd/freebsd-usbin ) - net-analyzer/nmap - net-dns/bind-tools - userland_GNU? ( net-misc/netkit-fingerd net-misc/whois ) - userland_BSD? ( net-misc/bsdwhois ) -" -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext -" - -src_configure() { - gnome2_src_configure $(use_enable debug) -} diff --git a/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild new file mode 100644 index 000000000000..43103575b16d --- /dev/null +++ b/net-analyzer/gnome-nettool/gnome-nettool-42.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit gnome.org gnome2-utils meson python-any-r1 xdg + +DESCRIPTION="Graphical front-ends to various networking command-line" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-nettool" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" + +DEPEND=" + >=x11-libs/gtk+-3.0.0:3 + >=dev-libs/glib-2.26:2 + gnome-base/libgtop:2= +" +RDEPEND="${DEPEND} + || ( + net-misc/iputils + net-analyzer/tcptraceroute + net-analyzer/traceroute + ) + net-analyzer/nmap + net-dns/bind-tools + net-misc/netkit-fingerd + net-misc/whois +" +BDEPEND=" + ${PYTHON_DEPS} + app-text/yelp-tools + virtual/pkgconfig + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/${PV}-meson-drop-unused-positional-arguments.patch +) + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml index 39980802b1da..fc638e18fbe9 100644 --- a/net-analyzer/gnome-nettool/metadata.xml +++ b/net-analyzer/gnome-nettool/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gnome-nettool</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/goaccess/Manifest b/net-analyzer/goaccess/Manifest index 39e756052332..4fe953157e67 100644 --- a/net-analyzer/goaccess/Manifest +++ b/net-analyzer/goaccess/Manifest @@ -1,2 +1,3 @@ -DIST goaccess-1.2.tar.gz 423103 BLAKE2B 87c527a52db9fa69d6e6a02ffbda64a6a32e6214ca6bc1f2654e1451fe5d73e7caa02cf1416c93c511bee329b7885e4914fb7dfd37562ef5347ea3912d030c14 SHA512 bc31ef1e4c92608635856fa73e69b58267c161a7e3c6f2e3ca8860b862ed1c47575b93943dd975a5f8503774ee90ee0649d380563639e30908d876416638f889 -DIST goaccess-1.3.tar.gz 541374 BLAKE2B 55942e35d06f1467df9b80a3fc42211e867b08963a7334783c0279ba7b9e0fd8d6e197277bee780547a9b8f6264ae15844374604f6d7c1b3b57f57768c2b2019 SHA512 7ab8a42670c2009459eee6979cb14e32e7e776e89912077882652631d0ce6ff801fba46d91ab5c23af1229f000e220863e9b70336fcd9fe11521d0ae1fd3bde1 +DIST goaccess-1.6.3.tar.gz 658827 BLAKE2B 48378235a75c11e7392bcaca98c64689032e74377696cf6fd3e0e230dd35a2e0f78e5f4283da2c4693ec072942ae6be4d3dc27f91f23d8390f81a330d9955c93 SHA512 7890fc35700db9ce1d3c720607cce6008a3140a14d143fcdd02f11a79f5344a26c648c9b7e6316a21d3ff07f588815bcdfb33072b5e0a18c429e9bfdb8bf99f4 +DIST goaccess-1.7.2.tar.gz 679321 BLAKE2B a423553fcbac76eb1358bffda9ec413da48241f9702d01872cede4999fa2baef60758f48ad621986789ddf2f514ca77ac72a4d367469ec493d792dea01c3f957 SHA512 0e057c9d49d5a9189af0b8f12e867d4402326ca0d2f562771b4d2c73fcfc2e5d79a826465ee56e03e036fbcddb7c6171005cd06ba28a2c25fc1683fe37bd59a7 +DIST goaccess-1.8.1.tar.gz 740177 BLAKE2B cc1f17c72adeeaf50d3b6c7bef47a044a3bbf06fb44d73da9b1ae68ea71d8e276dbe02c6a89cf0a72f3327e817e8d59235f788d29aeb7c7c889bacf81b64292a SHA512 96f0b73f13cfb77ad57748bce7d8791f8486bfd5ce47420d1c0016826a4deb9ab2d2742f4afd5d8b0eed003f9b596aae51f232fa71bf47f823b6ff8119f91354 diff --git a/net-analyzer/goaccess/files/goaccess.confd b/net-analyzer/goaccess/files/goaccess.confd new file mode 100644 index 000000000000..4ff75a1a4ff6 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.confd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/goaccess + +# Various options. +# run `goaccess --help` for valid cmdline options +OPTS="--user-name=goaccess --pid-file=/run/goaccess/goaccess.pid -o /var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log" + +# GoAccess config file +#CONFIG="/etc/goaccess/goaccess.conf" diff --git a/net-analyzer/goaccess/files/goaccess.initd b/net-analyzer/goaccess/files/goaccess.initd new file mode 100644 index 000000000000..be0059588396 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.initd @@ -0,0 +1,14 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/goaccess" +name="GoAccess" +description="Real-time web log analyzer" +config="${CONFIG:-/etc/goaccess/goaccess.conf}" +command_args="--real-time-html --daemonize -p $config ${OPTS}" +start_stop_daemon_args="-q" + +depend() { + need net +} diff --git a/net-analyzer/goaccess/files/goaccess.service b/net-analyzer/goaccess/files/goaccess.service new file mode 100644 index 000000000000..8fab5f9b7c56 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.service @@ -0,0 +1,15 @@ +[Unit] +Description=Real-time web log analyzer +After=network.target + +[Service] +Type=simple +User=root +Group=root +Restart=always +ExecStart=/usr/bin/goaccess --real-time-html --daemonize -p /etc/goaccess/goaccess.conf --user-name=goaccess -o /var/lib/goaccess/goaccess.html -l /var/log/goaccess/goaccess.log +StandardOutput=null +StandardError=null + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/goaccess/files/goaccess.tmpfile b/net-analyzer/goaccess/files/goaccess.tmpfile new file mode 100644 index 000000000000..caee9ffff853 --- /dev/null +++ b/net-analyzer/goaccess/files/goaccess.tmpfile @@ -0,0 +1 @@ +d /run/goaccess 0755 goaccess goaccess diff --git a/net-analyzer/goaccess/goaccess-1.2.ebuild b/net-analyzer/goaccess/goaccess-1.2.ebuild deleted file mode 100644 index fc4075601073..000000000000 --- a/net-analyzer/goaccess/goaccess-1.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal" -HOMEPAGE="https://goaccess.io" -SRC_URI="https://tar.goaccess.io/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib" - -RDEPEND="sys-libs/ncurses:0=[unicode?] - geoip? ( - !geoipv2? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb:0= ) - ) - !tokyocabinet? ( dev-libs/glib:2 ) - tokyocabinet? ( - dev-db/tokyocabinet[bzip2?,zlib?] - btree? ( - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )" - -src_configure() { - econf \ - $(use_enable bzip2 bzip) \ - $(use_enable zlib) \ - $(use_enable debug) \ - $(use_enable geoip geoip $(usex geoipv2 mmdb legacy)) \ - $(use_enable tokyocabinet tcb $(usex btree btree memhash)) \ - $(use_enable unicode utf8) \ - $(use_with getline) \ - $(use_with ssl openssl) -} - -pkg_preinst() { - # Change path to GeoIP bases in config - sed -e s':/usr/local:/usr:' -i "${ED%/}"/etc/goaccess.conf || die "sed failed for goaccess.conf" -} diff --git a/net-analyzer/goaccess/goaccess-1.3.ebuild b/net-analyzer/goaccess/goaccess-1.3.ebuild deleted file mode 100644 index 5d70b028d3d3..000000000000 --- a/net-analyzer/goaccess/goaccess-1.3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal" -HOMEPAGE="https://goaccess.io" -SRC_URI="https://tar.goaccess.io/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib" -REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )" - -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:0=[unicode?] - geoip? ( - !geoipv2? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb:0= ) - ) - !tokyocabinet? ( dev-libs/glib:2 ) - tokyocabinet? ( - dev-db/tokyocabinet[bzip2?,zlib?] - btree? ( - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" -DEPEND="${RDEPEND}" - -src_configure() { - econf \ - "$(use_enable bzip2 bzip)" \ - "$(use_enable zlib)" \ - "$(use_enable debug)" \ - "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \ - "$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \ - "$(use_enable unicode utf8)" \ - "$(use_with getline)" \ - "$(use_with ssl openssl)" -} - -pkg_preinst() { - # Change path to GeoIP bases in config - sed -e s':/usr/local:/usr:' -i "${ED}"/etc/goaccess/goaccess.conf || die "sed failed for goaccess.conf" -} - -pkg_postinst() { - ewarn "Upstream moved config to /etc/goaccess/goaccess.conf" -} diff --git a/net-analyzer/goaccess/goaccess-1.6.3.ebuild b/net-analyzer/goaccess/goaccess-1.6.3.ebuild new file mode 100644 index 000000000000..52788637826a --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.6.3.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools optfeature systemd tmpfiles + +DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" +HOMEPAGE="https://goaccess.io" +SRC_URI="https://tar.goaccess.io/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug geoip geoipv2 getline ssl unicode" +REQUIRED_USE="geoipv2? ( geoip )" + +RDEPEND="acct-group/goaccess + acct-user/goaccess + sys-libs/ncurses:=[unicode(+)?] + geoip? ( + !geoipv2? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb:0= ) + ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Enable log-format, define log file and db path, + # change path to GeoIP bases in config + sed -i -e '/log-format COMBINED/s/#//' \ + -e '/log-file/s/#//' \ + -e '/db-path/s|tmp|var/lib/goaccess|' \ + -e '/geoip-database/s|local/||' config/goaccess.conf \ + || die "sed failed for goaccess.conf" + + eautoreconf +} + +src_configure() { + local myeconfargs=() + readarray -t myeconfargs < <( + use_enable debug + use_enable geoip geoip "$(usex geoipv2 mmdb legacy)" + use_enable unicode utf8 + use_with getline + use_with ssl openssl + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/goaccess.initd goaccess + newconfd "${FILESDIR}"/goaccess.confd goaccess + systemd_dounit "${FILESDIR}"/goaccess.service + newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf + + diropts -o goaccess -g goaccess -m 0700 + keepdir /var/lib/goaccess/db /var/log/goaccess +} + +pkg_postinst() { + optfeature "update GeoIP databases" net-misc/geoipupdate + tmpfiles_process goaccess.conf +} diff --git a/net-analyzer/goaccess/goaccess-1.7.2.ebuild b/net-analyzer/goaccess/goaccess-1.7.2.ebuild new file mode 100644 index 000000000000..483e675fa316 --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.7.2.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2207 + +EAPI=8 + +inherit autotools optfeature systemd tmpfiles + +DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" +HOMEPAGE="https://goaccess.io" +SRC_URI="https://tar.goaccess.io/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug geoip geoipv2 getline ssl unicode" +REQUIRED_USE="geoipv2? ( geoip )" + +RDEPEND="acct-group/goaccess + acct-user/goaccess + sys-libs/ncurses:=[unicode(+)?] + geoip? ( + !geoipv2? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb:0= ) + ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Enable log-format, define log file and db path, + # change path to GeoIP bases in config + sed -i -e '/log-format COMBINED/s/#//' \ + -e '/log-file/s/#//' \ + -e '/db-path/s|tmp|var/lib/goaccess|' \ + -e '/geoip-database/s|local/||' config/goaccess.conf \ + || die "sed failed for goaccess.conf" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)") + $(use_enable unicode utf8) + $(use_with getline) + $(use_with ssl openssl) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/goaccess.initd goaccess + newconfd "${FILESDIR}"/goaccess.confd goaccess + systemd_dounit "${FILESDIR}"/goaccess.service + newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf + + diropts -o goaccess -g goaccess -m 0700 + keepdir /var/lib/goaccess/db /var/log/goaccess +} + +pkg_postinst() { + optfeature "update GeoIP databases" net-misc/geoipupdate + tmpfiles_process goaccess.conf +} diff --git a/net-analyzer/goaccess/goaccess-1.8.1.ebuild b/net-analyzer/goaccess/goaccess-1.8.1.ebuild new file mode 100644 index 000000000000..483e675fa316 --- /dev/null +++ b/net-analyzer/goaccess/goaccess-1.8.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2207 + +EAPI=8 + +inherit autotools optfeature systemd tmpfiles + +DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" +HOMEPAGE="https://goaccess.io" +SRC_URI="https://tar.goaccess.io/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug geoip geoipv2 getline ssl unicode" +REQUIRED_USE="geoipv2? ( geoip )" + +RDEPEND="acct-group/goaccess + acct-user/goaccess + sys-libs/ncurses:=[unicode(+)?] + geoip? ( + !geoipv2? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb:0= ) + ) + ssl? ( dev-libs/openssl:0= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + + # Enable log-format, define log file and db path, + # change path to GeoIP bases in config + sed -i -e '/log-format COMBINED/s/#//' \ + -e '/log-file/s/#//' \ + -e '/db-path/s|tmp|var/lib/goaccess|' \ + -e '/geoip-database/s|local/||' config/goaccess.conf \ + || die "sed failed for goaccess.conf" + + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable debug) + $(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)") + $(use_enable unicode utf8) + $(use_with getline) + $(use_with ssl openssl) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/goaccess.initd goaccess + newconfd "${FILESDIR}"/goaccess.confd goaccess + systemd_dounit "${FILESDIR}"/goaccess.service + newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf + + diropts -o goaccess -g goaccess -m 0700 + keepdir /var/lib/goaccess/db /var/log/goaccess +} + +pkg_postinst() { + optfeature "update GeoIP databases" net-misc/geoipupdate + tmpfiles_process goaccess.conf +} diff --git a/net-analyzer/goaccess/goaccess-9999.ebuild b/net-analyzer/goaccess/goaccess-9999.ebuild index a5512dc51d48..f865c1c79c2b 100644 --- a/net-analyzer/goaccess/goaccess-9999.ebuild +++ b/net-analyzer/goaccess/goaccess-9999.ebuild @@ -1,59 +1,73 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +# shellcheck disable=SC2207 + +EAPI=8 EGIT_REPO_URI="https://github.com/allinurl/${PN}.git" -inherit autotools git-r3 +inherit autotools git-r3 optfeature systemd tmpfiles -DESCRIPTION="A real-time web log analyzer and interactive viewer that runs in a terminal" +DESCRIPTION="A real-time web log analyzer and interactive viewer in a terminal" HOMEPAGE="https://goaccess.io" SRC_URI="" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="btree bzip2 debug geoip geoipv2 getline libressl tokyocabinet ssl unicode zlib" -REQUIRED_USE="btree? ( tokyocabinet ) bzip2? ( btree ) geoipv2? ( geoip ) zlib? ( btree )" +IUSE="debug geoip geoipv2 getline ssl unicode" +REQUIRED_USE="geoipv2? ( geoip )" -BDEPEND="virtual/pkgconfig" -RDEPEND="sys-libs/ncurses:0=[unicode?] +RDEPEND="acct-group/goaccess + acct-user/goaccess + sys-libs/ncurses:=[unicode(+)?] geoip? ( !geoipv2? ( dev-libs/geoip ) geoipv2? ( dev-libs/libmaxminddb:0= ) ) - !tokyocabinet? ( dev-libs/glib:2 ) - tokyocabinet? ( - dev-db/tokyocabinet[bzip2?,zlib?] - btree? ( - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - ) - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default - # Change path to GeoIP bases in config - sed -i -e s':/usr/local:/usr:' config/goaccess.conf || die "sed failed for goaccess.conf" + # Enable log-format, define log file and db path, + # change path to GeoIP bases in config + sed -i -e '/log-format COMBINED/s/#//' \ + -e '/log-file/s/#//' \ + -e '/db-path/s|tmp|var/lib/goaccess|' \ + -e '/geoip-database/s|local/||' config/goaccess.conf \ + || die "sed failed for goaccess.conf" eautoreconf } src_configure() { - econf \ - "$(use_enable bzip2 bzip)" \ - "$(use_enable zlib)" \ - "$(use_enable debug)" \ - "$(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)")" \ - "$(use_enable tokyocabinet tcb "$(usex btree btree memhash)")" \ - "$(use_enable unicode utf8)" \ - "$(use_with getline)" \ - "$(use_with ssl openssl)" + local myeconfargs=( + $(use_enable debug) + $(use_enable geoip geoip "$(usex geoipv2 mmdb legacy)") + $(use_enable unicode utf8) + $(use_with getline) + $(use_with ssl openssl) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + newinitd "${FILESDIR}"/goaccess.initd goaccess + newconfd "${FILESDIR}"/goaccess.confd goaccess + systemd_dounit "${FILESDIR}"/goaccess.service + newtmpfiles "${FILESDIR}"/goaccess.tmpfile goaccess.conf + + diropts -o goaccess -g goaccess -m 0700 + keepdir /var/lib/goaccess/db /var/log/goaccess +} + +pkg_postinst() { + optfeature "update GeoIP databases" net-misc/geoipupdate + tmpfiles_process goaccess.conf } diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml index 708d4dfe667e..cf961e4f268e 100644 --- a/net-analyzer/goaccess/metadata.xml +++ b/net-analyzer/goaccess/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -16,10 +16,8 @@ that require a visual server report on the fly. </longdescription> <use> - <flag name="btree">Enable Tokyo Cabinet's on-disk B+ Tree database backend</flag> <flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> <flag name="getline">Use GNU getline() to parse full line requests</flag> - <flag name="tokyocabinet">Enable Tokyo Cabinet's on-memory hash database backend</flag> </use> <upstream> <remote-id type="github">allinurl/goaccess</remote-id> diff --git a/net-analyzer/gr-fosphor/Manifest b/net-analyzer/gr-fosphor/Manifest new file mode 100644 index 000000000000..d483f1e5b1d9 --- /dev/null +++ b/net-analyzer/gr-fosphor/Manifest @@ -0,0 +1 @@ +DIST gr-fosphor-0.0_p20210108.tar.gz 223873 BLAKE2B 4c44ea026760a12fbc9f50c439f47b9af3956270d8f0a05c951fb19cc4f23a7064476a0a111d39e79183d52e8c6e686d17bf17f76df92e052f81d8940df588fe SHA512 fa2e4c28f8910eb82de42c76f2c00e8b832c023844f1d61aedb5ef3b0fafa7f3f7f26ab535a936d4ad8a42bedb380e71fe6c03f5e1b767afe731d70e080d241e diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch new file mode 100644 index 000000000000..16a4475299bf --- /dev/null +++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20200131-htmldir.patch @@ -0,0 +1,8 @@ +--- a/docs/doxygen/CMakeLists.txt ++++ b/docs/doxygen/CMakeLists.txt +@@ -50,4 +50,4 @@ + + add_custom_target(doxygen_target ALL DEPENDS ${BUILT_DIRS}) + +-install(DIRECTORY ${BUILT_DIRS} DESTINATION ${GR_PKG_DOC_DIR}) ++install(DIRECTORY ${BUILT_DIRS} DESTINATION ${CMAKE_INSTALL_DOCDIR}) diff --git a/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch new file mode 100644 index 000000000000..da3287f35496 --- /dev/null +++ b/net-analyzer/gr-fosphor/files/gr-fosphor-0.0_p20210108-fix-use.patch @@ -0,0 +1,18 @@ +diff --git a/python/bindings/CMakeLists.txt b/python/bindings/CMakeLists.txt +index b7054da..86e5461 100644 +--- a/python/bindings/CMakeLists.txt ++++ b/python/bindings/CMakeLists.txt +@@ -54,10 +54,11 @@ endmacro(GR_PYBIND_MAKE) + + list(APPEND fosphor_python_files + base_sink_c_python.cc +- glfw_sink_c_python.cc +- qt_sink_c_python.cc + python_bindings.cc) + ++list_cond_append(ENABLE_GLFW fosphor_python_files glfw_sink_c_python.cc) ++list_cond_append(ENABLE_QT fosphor_python_files qt_sink_c_python.cc) ++ + GR_PYBIND_MAKE(fosphor + ../.. + gr::fosphor diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild new file mode 100644 index 000000000000..3a6f011748ef --- /dev/null +++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20210108.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 + +DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" +HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" +else + COMMIT="974ab2fe54c25e8b6c37aa4de148ba0625eef652" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="glfw qt5" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + dev-libs/boost:= + dev-libs/log4cpp + media-libs/freetype + >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') + glfw? ( >=media-libs/glfw-3 ) + virtual/opencl + virtual/opengl + ${PYTHON_DEPS} + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" + +PATCHES=( "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch + "${FILESDIR}"/${P}-fix-use.patch ) + +src_prepare() { + cmake_src_prepare + + # adapt python bindings to use flags + use glfw || sed -i -e "s#bind_glfw_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + use qt5 || sed -i -e "s#bind_qt_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + + eapply_user +} + +src_configure() { + # tries to run OpenCL test program, but failing doesn't hurt + addpredict /dev/dri + + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GLFW="$(usex glfw)" + -DENABLE_QT="$(usex qt5)" + -DENABLE_PYTHON=ON + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name '*.py[oc]' -delete || die + python_optimize +} diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index 0eceaac74e02..accf82083f3d 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -1,52 +1,62 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) +EAPI=8 -inherit cmake-utils python-single-r1 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-single-r1 DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" -if [[ ${PV} == 9999* ]]; then +if [[ ${PV} == *9999 ]]; then inherit git-r3 - #EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" - EGIT_BRANCH="gr3.7-qt5" else - SRC_URI="mirror://gentoo/${P}.tar.xz" + COMMIT="974ab2fe54c25e8b6c37aa4de148ba0625eef652" + SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" fi -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - LICENSE="GPL-3+" SLOT="0" -IUSE="glfw qt5 wxwidgets" +IUSE="glfw qt5" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - ) - >=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_SINGLE_USEDEP}] - media-libs/freetype +RDEPEND=" dev-libs/boost:= + dev-libs/log4cpp + media-libs/freetype + >=net-wireless/gnuradio-3.9:0=[qt5,${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep 'dev-python/pygccxml[${PYTHON_USEDEP}]') glfw? ( >=media-libs/glfw-3 ) virtual/opencl virtual/opengl ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - dev-lang/swig:0 - dev-util/cppunit -" + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + )" +DEPEND="${RDEPEND}" +BDEPEND="$(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')" + +PATCHES=( "${FILESDIR}"/${PN}-0.0_p20200131-htmldir.patch + "${FILESDIR}"/${PN}-0.0_p20210108-fix-use.patch ) src_prepare() { - cmake-utils_src_prepare - default + cmake_src_prepare + + # adapt python bindings to use flags + use glfw || sed -i -e "s#bind_glfw_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + use qt5 || sed -i -e "s#bind_qt_sink_c(m)##" \ + "${S}"/python/bindings/python_bindings.cc ||die + + eapply_user } src_configure() { @@ -57,8 +67,13 @@ src_configure() { -DENABLE_DEFAULT=OFF -DENABLE_GLFW="$(usex glfw)" -DENABLE_QT="$(usex qt5)" - -DENABLE_WX="$(usex wxwidgets)" -DENABLE_PYTHON=ON ) - cmake-utils_src_configure + cmake_src_configure +} + +src_install() { + cmake_src_install + find "${D}" -name '*.py[oc]' -delete || die + python_optimize } diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml index ccd32e8fbac8..2b496fa3b1f7 100644 --- a/net-analyzer/gr-fosphor/metadata.xml +++ b/net-analyzer/gr-fosphor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>radio@gentoo.org</email> @@ -8,4 +8,7 @@ <use> <flag name="glfw">enable GLFW based interface</flag> </use> + <upstream> + <remote-id type="github">osmocom/gr-fosphor</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest deleted file mode 100644 index b2a84682aab5..000000000000 --- a/net-analyzer/graphite-web/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch deleted file mode 100644 index aa6ea74ff93f..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch +++ /dev/null @@ -1,63 +0,0 @@ -Install FHS-style paths - ---- a/conf/graphite.wsgi.example -+++ b/conf/graphite.wsgi.example -@@ -1,4 +1,4 @@ - import sys --sys.path.append('/opt/graphite/webapp') -+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') - - from graphite.wsgi import application ---- a/setup.py -+++ b/setup.py -@@ -59,8 +59,8 @@ - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, -- scripts=glob('bin/*'), -+ scripts=['bin/graphite-web-build-index'], -- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -+ data_files=list(webapp_content.items()), - install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], - classifiers=[ - 'Intended Audience :: Developers', ---- a/webapp/graphite/local_settings.py.example -+++ b/webapp/graphite/local_settings.py.example -@@ -101,6 +101,7 @@ - # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite - # to somewhere else - #GRAPHITE_ROOT = '/opt/graphite' -+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' - - # Most installs done outside of a separate tree such as /opt/graphite will - # need to change these settings. Note that the default settings for each -@@ -110,6 +111,11 @@ - #STATIC_ROOT = '/opt/graphite/static' - #LOG_DIR = '/opt/graphite/storage/log/webapp' - #INDEX_FILE = '/opt/graphite/storage/index' # Search index file -+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' -+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' -+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' -+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' -+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file - - # To further or fully customize the paths, modify the following. Note that the - # default settings for each of these are relative to CONF_DIR and STORAGE_DIR -@@ -127,6 +133,8 @@ - #CERES_DIR = '/opt/graphite/storage/ceres' - #WHISPER_DIR = '/opt/graphite/storage/whisper' - #RRD_DIR = '/opt/graphite/storage/rrd' -+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' -+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' - # - # Data directories using the "Standard" metrics finder (i.e. not Ceres) - #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables -@@ -244,7 +244,7 @@ - # - #DATABASES = { - # 'default': { --# 'NAME': '/opt/graphite/storage/graphite.db', -+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', - # 'ENGINE': 'django.db.backends.sqlite3', - # 'USER': '', - # 'PASSWORD': '', diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch deleted file mode 100644 index 4cbbe7213b35..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch +++ /dev/null @@ -1,63 +0,0 @@ -Install FHS-style paths - ---- a/conf/graphite.wsgi.example -+++ b/conf/graphite.wsgi.example -@@ -1,4 +1,4 @@ - import sys --sys.path.append('/opt/graphite/webapp') -+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp') - - from graphite.wsgi import application ---- a/setup.py -+++ b/setup.py -@@ -107,8 +107,8 @@ - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, -- scripts=glob('bin/*'), -- data_files=list(webapp_content.items()) + storage_dirs + conf_files + examples, -+ scripts=['bin/graphite-web-build-index'], -+ data_files=list(webapp_content.items()), - install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'], - classifiers=[ - 'Intended Audience :: Developers', ---- a/webapp/graphite/local_settings.py.example -+++ b/webapp/graphite/local_settings.py.example -@@ -101,6 +101,7 @@ - # Change only GRAPHITE_ROOT if your install is merely shifted from /opt/graphite - # to somewhere else - #GRAPHITE_ROOT = '/opt/graphite' -+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web' - - # Most installs done outside of a separate tree such as /opt/graphite will - # need to change these settings. Note that the default settings for each -@@ -110,6 +111,11 @@ - #STATIC_ROOT = '/opt/graphite/static' - #LOG_DIR = '/opt/graphite/storage/log/webapp' - #INDEX_FILE = '/opt/graphite/storage/index' # Search index file -+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web' -+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon' -+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content' -+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web' -+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search index file - - # To further or fully customize the paths, modify the following. Note that the - # default settings for each of these are relative to CONF_DIR and STORAGE_DIR -@@ -127,6 +133,8 @@ - #CERES_DIR = '/opt/graphite/storage/ceres' - #WHISPER_DIR = '/opt/graphite/storage/whisper' - #RRD_DIR = '/opt/graphite/storage/rrd' -+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper' -+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd' - # - # Data directories using the "Standard" metrics finder (i.e. not Ceres) - #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables -@@ -244,7 +244,7 @@ - # - #DATABASES = { - # 'default': { --# 'NAME': '/opt/graphite/storage/graphite.db', -+# 'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db', - # 'ENGINE': 'django.db.backends.sqlite3', - # 'USER': '', - # 'PASSWORD': '', diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild deleted file mode 100644 index 25a6afa9f356..000000000000 --- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 ) # 3.7 dropped due to dep-hell - -inherit distutils-r1 prefix - -DESCRIPTION="Enterprise scalable realtime graphing" -HOMEPAGE="https://graphiteapp.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+carbon ldap mysql memcached postgres +sqlite" - -DEPEND="" -RDEPEND=" - carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) - mysql? ( - || ( - dev-python/mysql-python[${PYTHON_USEDEP}] - dev-python/mysqlclient[${PYTHON_USEDEP}] - ) - ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}] - <dev-python/django-2.1.99[sqlite?,${PYTHON_USEDEP}] - >=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/scandir[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - media-libs/fontconfig -" - -PATCHES=( - # Do not install the configuration and data files. We install them - # somewhere sensible by hand. - "${FILESDIR}"/${PN}-1.1.5-fhs-paths.patch -) - -python_prepare_all() { - # Use a less common name - mv bin/build-index bin/${PN}-build-index || die - # use FHS-style paths - export GRAPHITE_NO_PREFIX=yes - distutils-r1_python_prepare_all - eprefixify \ - conf/graphite.wsgi.example \ - webapp/graphite/local_settings.py.example -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /var/{lib,log}/${PN} - docinto examples - docompress -x "/usr/share/doc/${PF}/examples" - dodoc \ - examples/example-graphite-vhost.conf \ - conf/dashboard.conf.example \ - conf/graphite.wsgi.example -} - -python_install() { - distutils-r1_python_install \ - --install-data="${EPREFIX}"/usr/share/${PN} - - insinto /etc/${PN} - newins webapp/graphite/local_settings.py.example local_settings.py - pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die - ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die - popd > /dev/null || die -} - -pkg_config() { - "${EROOT}"/usr/bin/django-admin.py migrate \ - --settings=graphite.settings --run-syncdb - "${EROOT}"/usr/bin/${PN}-build-index -} - -pkg_postinst() { - # Only display this for new installs - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "You need to configure ${PN} to run with a WSGI server of your choice." - elog "For example using Apache, you can use www-apache/mod_wsgi," - elog " using Nginx, you can use www-servers/uwsgi." - elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" - elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" - elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." - elog "" - elog "If you want to update the search index regularily, you should consider running" - elog "the '${PN}-build-index' script in a crontab." - fi -} diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml deleted file mode 100644 index d4f9fa582626..000000000000 --- a/net-analyzer/graphite-web/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>grobian@gentoo.org</email> - <name>Fabian Groffen</name> - </maintainer> - <use> - <flag name="memcached">Enable memcached support</flag> - <flag name="carbon">Enable carbon support</flag> - </use> - <upstream> - <remote-id type="pypi">graphite-web</remote-id> - <remote-id type="github">graphite-project/graphite-web</remote-id> - <bugs-to>https://github.com/graphite-project/graphite-web/issues</bugs-to> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/greenbone-feed-sync/Manifest b/net-analyzer/greenbone-feed-sync/Manifest new file mode 100644 index 000000000000..23d120d9afc1 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/Manifest @@ -0,0 +1,2 @@ +DIST greenbone-feed-sync-23.10.0.tar.gz 63001 BLAKE2B 5566cef8649e578cb498f0a5bc1e41f237a3702698b2012f3a62d8f5f647e6b1e3253c7d92e4a9fc82ad7991de8010b94ba8c1194a820511c49e5f5262e471ff SHA512 fe5864c4e650f17a072cd6e4153779ea33ad8f0ac28e92114b40c465a04b70791b603ccbe82934dcdad13fce2003e2d9786cec75854efecf8aefa74c7ce178f4 +DIST greenbone-feed-sync-24.3.0.tar.gz 58949 BLAKE2B 10260850dad8781682e9f3e3eb31faa4139080b3c5661261770fe28053df472b21b4e2ef98f258b5c634c26d543313da30bb01d9eadfdb8ea8e7b7b57205b7f5 SHA512 ac1ce1f0a2898997e5a330e9a186b6203b7593e5b847d23202c28e7b3b7be1556001cc6d8ba5abd7077d1b51e0f21640728f78659ecf9a60eede28ea483344b4 diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron new file mode 100644 index 000000000000..5b3755982966 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.cron @@ -0,0 +1,7 @@ +#!/bin/sh +# +# To enable sync via cron, execute "sudo -u gvm touch /etc/gvm/cron-feed-sync-enabled" +if [[ ! -f /etc/gvm/cron-feed-sync-enabled ]]; then + exit +fi +sudo -u gvm /usr/bin/greenbone-feed-sync --quiet --type all diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service new file mode 100644 index 000000000000..987fe731d47b --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.service @@ -0,0 +1,11 @@ +[Unit] +Description=sync the Greenbone Community Feed + +[Service] +Type=oneshot +ExecStart=/usr/bin/greenbone-feed-sync --quiet --type all +SyslogIdentifier=greenbone-feed-sync +User=gvm + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer new file mode 100644 index 000000000000..9faf470e013c --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/files/greenbone-feed-sync.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite + +[Timer] +OnCalendar=daily +RandomizedDelaySec=2hour + +[Install] +WantedBy=timers.target diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild new file mode 100644 index 000000000000..53a297aa1af6 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-23.10.0.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="New script for syncing the Greenbone Community Feed" +HOMEPAGE="https://github.com/greenbone/greenbone-feed-sync" +SRC_URI="https://github.com/greenbone/greenbone-feed-sync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="cron" +RESTRICT="test" + +DEPEND=" + acct-user/gvm + net-misc/rsync + >=net-analyzer/gvmd-22.5.0 + dev-python/tomli[${PYTHON_USEDEP}] + >=dev-python/rich-13.2.0[${PYTHON_USEDEP}] +" + +RDEPEND=" + ${DEPEND} + cron? ( virtual/cron ) +" + +python_install() { + distutils-r1_python_install + + #greenbone-feed-sync should not be run as root to avoid changing file permissions + insinto /etc/sudoers.d + newins - greenbone-feed-sync <<-EOF + gvm ALL = NOPASSWD: /usr/bin/greenbone-feed-sync +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/greenbone-feed-sync + + if use cron; then + exeinto /etc/cron.daily + newexe "${FILESDIR}"/${PN}.cron ${PN} + fi + + systemd_dounit "${FILESDIR}/${PN}.timer" "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + return + fi + + if use cron; then + elog + elog "Edit ${EROOT}/etc/cron.weekly/greenbone-feed-sync to activate daily feed update!" + elog + fi + + if systemd_is_booted; then + elog + elog "To enable the systemd timer, run the following command:" + elog " systemctl enable --now greenbone-feed-sync.timer" + elog + fi +} diff --git a/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild new file mode 100644 index 000000000000..a29bec692a29 --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/greenbone-feed-sync-24.3.0.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="New script for syncing the Greenbone Community Feed" +HOMEPAGE="https://github.com/greenbone/greenbone-feed-sync" +SRC_URI="https://github.com/greenbone/greenbone-feed-sync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="cron" + +COMMON_DEPEND=" + acct-user/gvm + net-misc/rsync + >=net-analyzer/gvmd-22.5.0 + >=dev-python/tomli-2.0.1[${PYTHON_USEDEP}] + >=dev-python/rich-13.2.0[${PYTHON_USEDEP}] + >=dev-python/shtab-1.7.0[${PYTHON_USEDEP}] +" +DEPEND=" + ${COMMON_DEPEND} + test? ( >=net-analyzer/pontos-22.12.2[${PYTHON_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + cron? ( virtual/cron ) +" + +distutils_enable_tests unittest + +src_test() { + # Disable tests that require network access. + sed -i \ + -e 's:test_do_not_run_as_root:_&:' \ + -e 's:test_sync_nvts:_&:' \ + -e 's:test_sync_nvts_quiet:_&:' \ + -e 's:test_sync_nvts_rsync_error:_&:' \ + -e 's:test_sync_nvts_verbose:_&:' \ + -e 's:test_sync_nvts:_&:' \ + -e 's:test_sync_nvts_error:_&:' \ + tests/test_main.py || die + + distutils-r1_src_test +} + +python_install() { + distutils-r1_python_install + + # greenbone-feed-sync should not be run as root to avoid changing file permissions + insinto /etc/sudoers.d + newins - greenbone-feed-sync <<-EOF + gvm ALL = NOPASSWD: /usr/bin/greenbone-feed-sync + EOF + + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/greenbone-feed-sync + + if use cron; then + exeinto /etc/cron.daily + newexe "${FILESDIR}"/${PN}.cron ${PN} + fi + + systemd_dounit "${FILESDIR}/${PN}.timer" "${FILESDIR}/${PN}.service" +} + +pkg_postinst() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + return + fi + + if use cron; then + elog + elog "Edit ${EROOT}/etc/cron.weekly/greenbone-feed-sync to activate daily feed update!" + elog + fi + + if systemd_is_booted; then + elog + elog "To enable the systemd timer, run the following command:" + elog " systemctl enable --now greenbone-feed-sync.timer" + elog + fi +} diff --git a/net-analyzer/greenbone-feed-sync/metadata.xml b/net-analyzer/greenbone-feed-sync/metadata.xml new file mode 100644 index 000000000000..7f358764088e --- /dev/null +++ b/net-analyzer/greenbone-feed-sync/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="cron">Adds file to enable daily cron job to update Greenbone Community Feed's data"</flag> + </use> + <longdescription lang="en"> + This is the new script for syncing the Greenbone Community Feed. + The greenbone-nvt-sync script was previously installed by net-analyzer/openvas-scanner. + </longdescription> + <upstream> + <remote-id type="github">greenbone/greenbone-feed-sync</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest deleted file mode 100644 index ff6ec73e1a93..000000000000 --- a/net-analyzer/greenbone-security-assistant/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST greenbone-security-assistant-8.0.1-node_modules.tar.gz 34084175 BLAKE2B 17c9e24961b63b957f932e4c5970113499ad65655b42e624284fb22a495d50c12e5f8289da4e17db717885b65909a6e18213fa312052c9c06c9bdc37816204f1 SHA512 552ea55fe218ae2345fa45b43af349825f255ccd86137dd245679efe6abc805d16c4ced3599f644d9b9f2686047b486d5e0c8aa4eaa0cbbf13157b9e2dbc8cc2 -DIST greenbone-security-assistant-8.0.1.tar.gz 1558918 BLAKE2B 75287784ed215300cfb30101d39b06b134092ca2d4311bcca976be23cc289529c6a8d661b99cb28e890c68f27e93a9259681add067749a772b7e3aea28761f3b SHA512 b91c1c4b8073c3ad3d3d636abbaa7881393f1448eae7366636ff618391c199c240e6bc4c848740a4267b4142aa872fb91c0798b8034d152d16016e650fbda2b8 diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch deleted file mode 100644 index d0fc7963a501..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-cmakelist.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/gsad/config/CMakeLists.txt 2019-07-18 20:39:10.331949702 +0300 -+++ b/gsad/config/CMakeLists.txt 2019-07-18 20:40:18.946830294 +0300 -@@ -16,27 +16,3 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - --if (NOT SYSTEMD_SERVICE_DIR) -- set (SYSTEMD_SERVICE_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system") --endif (NOT SYSTEMD_SERVICE_DIR) -- --if (NOT DEFAULT_CONFIG_DIR) -- set (DEFAULT_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/default") --endif (NOT DEFAULT_CONFIG_DIR) -- --if (NOT LOGROTATE_DIR) -- set (LOGROTATE_DIR "${CMAKE_INSTALL_PREFIX}/etc/logrotate.d") --endif (NOT LOGROTATE_DIR) -- --configure_file (gsad.service.in gsad.service) --configure_file (gsad.logrotate.in gsad.logrotate) -- --install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.service -- DESTINATION ${SYSTEMD_SERVICE_DIR}/) -- --install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/gsad.default -- DESTINATION ${DEFAULT_CONFIG_DIR}/ RENAME gsad) -- --install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gsad.logrotate -- DESTINATION ${LOGROTATE_DIR}/ RENAME gsad) -- diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch deleted file mode 100644 index 116bd48264dd..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-node.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/gsa/CMakeLists.txt 2019-07-17 16:45:39.000000000 +0300 -+++ b/gsa/CMakeLists.txt 2019-07-17 22:24:49.466906757 +0300 -@@ -1095,28 +1095,17 @@ - ${GSA_JS_SRC_FILES} - PARENT_SCOPE) - -- --add_custom_command (OUTPUT node-modules.stamp -- DEPENDS ${GSA_PKG_FILES} -- COMMAND ${INSTALLER} "${INSTALLER_ARGS}" "install" -- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- WORKING_DIRECTORY ${GSA_SRC_DIR} -- COMMENT "Install gsa-ng js dependencies") -- -- - add_custom_command (OUTPUT bundle.stamp -- COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} "${INSTALLER_ARGS}" run build -+ COMMAND ${CMAKE_COMMAND} -E env REACT_APP_VERSION=${PROJECT_VERSION_STRING} ${INSTALLER} --offline run build - COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- ${GSA_PKG_FILES} -+ DEPENDS ${GSA_PKG_FILES} - ${GSA_STATIC_SRC_FILES} - ${GSA_JS_SRC_FILES} - COMMENT "Build gsa-ng install files") - - add_custom_target (gsa-ng ALL -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/node-modules.stamp -- ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp) -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.stamp) - - set (GSA_STATIC_BUILD_FILES - ${GSA_BUILD_DIR}/index.html) diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch deleted file mode 100644 index a318c87225e1..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-pid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -222,7 +222,7 @@ if (NOT DATADIR) - endif (NOT DATADIR) - - if (NOT GSAD_PID_DIR) -- set (GSAD_PID_DIR "${LOCALSTATEDIR}/run") -+ set (GSAD_PID_DIR "/run") - endif (NOT GSAD_PID_DIR) - - set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas") diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch deleted file mode 100644 index 19a4731db75b..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-reactjs.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/gsa/package.json 2019-07-17 16:45:39.000000000 +0300 -+++ b/gsa/package.json 2019-07-17 22:40:31.371899489 +0300 -@@ -66,12 +66,12 @@ - "x2js": "^3.2.6" - }, - "scripts": { -- "test": "react-scripts test", -- "test:coverage": "react-scripts test --coverage --maxWorkers 2", -+ "test": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test", -+ "test:coverage": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js test --coverage --maxWorkers 2", - "lint": "eslint --max-warnings 0 src", -- "start": "react-scripts start", -- "build": "react-scripts build", -- "eject": "react-scripts eject" -+ "start": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js start", -+ "build": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js build", -+ "eject": "NODE_ENV=production node_modules/react-scripts/bin/react-scripts.js eject" - }, - "devDependencies": { - "@types/jest": "^24.0.12", diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch deleted file mode 100644 index c1825ba3f5db..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-sbin.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gsad/src/CMakeLists.txt 2019-07-21 23:07:38.375683800 +0300 -+++ a/gsad/src/CMakeLists.txt 2019-07-21 23:08:17.301651451 +0300 -@@ -175,7 +175,7 @@ - ## Install - - install (TARGETS gsad -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} - ARCHIVE DESTINATION ${LIBDIR}/static) - - diff --git a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch b/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch deleted file mode 100644 index 3b075951aba6..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/greenbone-security-assistant-8.0.1-uninstall-snippet.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gsa/CMakeLists.txt 2019-07-18 23:14:04.639202986 +0300 -+++ b/gsa/CMakeLists.txt 2019-07-18 23:21:54.568052589 +0300 -@@ -1116,9 +1116,6 @@ - install (FILES public/robots.txt - DESTINATION ${GSA_DEST_DIR}) - --# remove old generated files --install (CODE "file(REMOVE_RECURSE ${GSA_DEST_DIR}/static)") -- - install (DIRECTORY - ${GSA_BUILD_DIR}/static - ${GSA_BUILD_DIR}/img diff --git a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example b/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example deleted file mode 100644 index b233911a2f1d..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsa.nginx.reverse.proxy.example +++ /dev/null @@ -1,78 +0,0 @@ -upstream backend { - server 127.0.0.1:9392; - keepalive 64; -} - -server { - listen IP:80; - server_name openvas.domain.tdl; - return 301 https://openvas.domain.tdl$request_uri; -} - -server { - listen IP:443 ssl http2; - server_name openvas.domain.tdl; - access_log /var/log/nginx/openvas.domain.tdl.access.log; - error_log /var/log/nginx/openvas.domain.tdl.error.log; - # Not sourcing directly from file - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param SERVER_PROTOCOL $server_protocol; - fastcgi_param REQUEST_SCHEME $scheme; - fastcgi_param HTTPS $https; - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - fastcgi_param REDIRECT_STATUS 200; - fastcgi_param HTTP_PROXY ""; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info; - fastcgi_param DOCUMENT_ROOT $document_root; - - location / { - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header REMOTE_HOST $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-FORWARDED-PROTOCOL $scheme; - proxy_pass https://backend; - proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; - gzip on; - gzip_proxied any; - gzip_types *; - } - - resolver 127.0.0.1; - resolver_timeout 6s; - ssl_certificate /openvas.domain.tdl/fullchain.pem; - ssl_certificate_key /openvas.domain.tdl/privkey.pem; - ssl_trusted_certificate /openvas.domain.tdl/chain.pem; - ssl_dhparam /openvas.domain.tdl/dhparam.pem; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_prefer_server_ciphers on; - ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS; - ssl_ecdh_curve secp384r1; - ssl_stapling on; - ssl_stapling_verify on; - ssl_session_cache shared:SSL:40m; - ssl_session_timeout 21h; - ssl_session_tickets off; - ssl_buffer_size 4k; - add_header Referrer-Policy no-referrer-when-downgrade; - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-Content-Type-Options "nosniff"; - add_header X-XSS-Protection "1; mode=block"; -} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.init b/net-analyzer/greenbone-security-assistant/files/gsad.init deleted file mode 100644 index 6d431bd21196..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsad.init +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${GSAD_USER:=gvm} -: ${GSAD_GROUP:=gvm} -: ${GSAD_TIMEOUT:=30} - -name="Greenbone Security Assistant (GSA)" -command="/usr/bin/gsad" -command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" -command_background="true" -command_user="${GSAD_USER}:${GSAD_GROUP}" -pidfile="/run/gsad.pid" -retry="${GSAD_TIMEOUT}" - -depend() { - after bootmisc - need localmount net gvmd -} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.service b/net-analyzer/greenbone-security-assistant/files/gsad.service deleted file mode 100644 index 91e791878008..000000000000 --- a/net-analyzer/greenbone-security-assistant/files/gsad.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Greenbone Security Assistant -After=network.target -After=openvassd.service -After=gvmd.service -Wants=gvmd.service - -[Service] -Type=forking -User=gvm -Group=gvm -EnvironmentFile=-/etc/gvm/sysconfig/gsad-daemon.conf -ExecStart=/usr/bin/gsad $GSAD_OPTIONS $GSAD_LISTEN_ADDRESS $GSAD_LISTEN_PORT $GVMD_LISTEN_ADDRESS $GVMD_LISTEN_PORT $GSAD_GNUTLS_PRIORITIES -Restart=always -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild deleted file mode 100644 index d616891de50b..000000000000 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -MY_PN="gsa" -MY_DN="gsad" -MY_NODE_N="node_modules" - -DESCRIPTION="Greenbone Security Assistant" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/greenbone/gsa/releases/download/v8.0.1/gsa-node-modules-8.0.1.tar.gz -> ${P}-${MY_NODE_N}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -DEPEND=" - dev-libs/libgcrypt:0= - dev-libs/libxslt - >=net-analyzer/gvm-libs-10.0.1 - net-libs/gnutls:= - net-libs/libmicrohttpd" - -RDEPEND=" - ${DEPEND} - ~net-analyzer/openvas-scanner-6.0.1 - >=net-analyzer/gvmd-8.0.1" - -BDEPEND=" - >=net-libs/nodejs-8.12.0 - >=sys-apps/yarn-1.15.2 - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-python/polib - sys-devel/gettext - )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" -MY_NODE_DIR="${S}/${MY_PN}/" - -PATCHES=( - # QA fix for 8.0.0. - "${FILESDIR}/${P}-pid.patch" - # Disable yarn-fetch during compile. - "${FILESDIR}/${P}-node.patch" - # Fix react-env path for react.js. - "${FILESDIR}/${P}-reactjs.patch" - # Remove ugly uninstall-snippet that causes failing re-emerge. - "${FILESDIR}/${P}-uninstall-snippet.patch" - # Remove unnecessary install paths/files. - "${FILESDIR}/${P}-cmakelist.patch" - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" -) - -src_prepare() { - cmake_src_prepare - # We will use pre-generated npm stuff. - mv "${WORKDIR}/${MY_NODE_N}" "${MY_NODE_DIR}" || die "couldn't move node_modules" - # Update .yarnrc accordingly. - echo "--modules-folder ${MY_NODE_DIR}" >> "${S}/${MY_PN}/.yarnrc" || die "echo failed" - # QA-Fix | Remove !CLANG doxygen warnings for 8.0.1 - if use extras; then - if ! tc-is-clang; then - local f - for f in gsad/doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - ) - # Add release hardening flags for 8.0.1 - append-cflags -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}/${MY_DN}/doc/generated/html/." ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${MY_DN}-daemon.conf" - - dodir /etc/gvm/reverse-proxy - insinto /etc/gvm/reverse-proxy - doins "${FILESDIR}/${MY_PN}.nginx.reverse.proxy.example" - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" - newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - systemd_dounit "${FILESDIR}/${MY_DN}.service" -} diff --git a/net-analyzer/gsa/Manifest b/net-analyzer/gsa/Manifest new file mode 100644 index 000000000000..c7dc9a59b4b6 --- /dev/null +++ b/net-analyzer/gsa/Manifest @@ -0,0 +1,2 @@ +DIST gsa-23.0.0.tar.gz 3605974 BLAKE2B c3797a20427754e0bee32d6e64599f04d1ed474435172efdeb0f3200aaec0d7a7dae0d80c035a762e3b6483f6b629a32e5225737ba521047ef90d564f2d1a036 SHA512 d2dfe12777a8b7610ebc1e7eceb079d38ae1f83085c5a411c115950e55254c82151f77ce16d12342d40b457999f50348a48e66f236a83d145697f68ef9caf993 +DIST gsa-node-modules-23.0.0.tar.xz 28474728 BLAKE2B f16b863d4a052cfbbc2758d66ca7f7715b2d0a303b916c149e562e9b2f4c2eeb9696447613fa382cc951d72c54758ea285402149f77793c94a0b39f71c39379d SHA512 ab3aedc50f1f9802b2a986a6b2e905b858f42722ef821d9b6d5aac44f113c62142a22292ce90badeb588276391ae64d68de177da727dcf09279105a9b635f4ab diff --git a/net-analyzer/gsa/gsa-23.0.0.ebuild b/net-analyzer/gsa/gsa-23.0.0.ebuild new file mode 100644 index 000000000000..34f8965050e2 --- /dev/null +++ b/net-analyzer/gsa/gsa-23.0.0.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_NODE_N="node-modules" +MY_NODE_D="node_modules" +MY_NODE_PV="${PV}" + +DESCRIPTION="Greenbone Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsa" +SRC_URI=" + https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/greenbone/${PN}/releases/download/v${PV}/${PN}-${MY_NODE_N}-${PV}.tar.xz +" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" + +BDEPEND=" + >=net-libs/nodejs-18.0.0[ssl] + >=sys-apps/yarn-1.22 +" + +MY_NODE_DIR="${S}/${MY_NODE_D}/" + +src_prepare() { + default + # We will use pre-generated npm stuff. + mv "${WORKDIR}/${MY_NODE_D}" "${MY_NODE_DIR}" || die "couldn't move node_modules" + + # Make SVGR not traverse the path up to / looking for a + # configuration file. Fixes + # Error: EACCES: permission denied, open '/.config/svgrrc' + # in case a directory /.config exists, see https://bugs.gentoo.org/909731 + echo "runtimeConfig: false" > .svgrrc.yml || die +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="${PATH}:${MY_NODE_DIR}/.bin/" \ + yarn --offline build || die +} + +src_install() { + insinto "usr/share/gvm/gsad/web" + doins -r build/* +} diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/gsa/metadata.xml index 5a350f963a3c..6fb56eca5155 100644 --- a/net-analyzer/greenbone-security-assistant/metadata.xml +++ b/net-analyzer/gsa/metadata.xml @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="extras">Pdf results, extra fonts, html docs support</flag> - </use> <longdescription lang="en"> The Greenbone Security Assistant is the web interface developed for the Greenbone Security Manager appliances. It connects to the Greenbone Vulnerability Manager GVM to provide a full-featured user interface for vulnerability management. - Greenbone Security Assistant consists of GSA - The webpage written in React and - GSAD - The HTTP server talking to the GVM daemon. + Greenbone Security Assistant consists of GSA - The webpage written in React and </longdescription> <upstream> <remote-id type="github">greenbone/gsa</remote-id> diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest new file mode 100644 index 000000000000..63f1c795315c --- /dev/null +++ b/net-analyzer/gsad/Manifest @@ -0,0 +1,2 @@ +DIST gsad-22.9.0.tar.gz 224735 BLAKE2B da1ee149f6937ef2bb6d23391bf8594b776c8396d2a9fb0733b6d6933e1bd002ae560c178f8c300a09fd0d73c92615b750728fe8302f00b91e11926fe1a15aaa SHA512 ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004 +DIST gsad-22.9.1.tar.gz 222663 BLAKE2B e65c8ecfa613a1653d36234d00e95da690e32c1c7ffc8904f509d568533079138115fcd389aaafa6d6cb96d5df42c9071e04edbbc95ea77731627ab7036adbde SHA512 25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init new file mode 100644 index 000000000000..a17f2dc1c084 --- /dev/null +++ b/net-analyzer/gsad/files/gsad-22.init @@ -0,0 +1,35 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GSAD_USER:=gvm} +: ${GSAD_GROUP:=gvm} +: ${GSAD_TIMEOUT:=30} +: ${GSAD_PIDFILE:="/run/gsad/gsad.pid"} + +name="Greenbone Security Assistant (GSA)" +command="/usr/bin/gsad" +command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES} --drop-privileges=${GSAD_USER}" +retry="${GSAD_TIMEOUT}" + +depend() { + after bootmisc + need localmount net + want gvmd +} + +start_pre() { + checkpath -d --mode 0755 --owner root /run/gsad +} + +start_post() { + checkpath -f --mode 0644 --owner "${GSAD_USER}:${GSAD_GROUP}" /var/log/gvm/gsad.log +} + +stop_post() { + if [ -f "${GSAD_PIDFILE}" ]; then + ebegin "Removing PID file" + rm --force "${GSAD_PIDFILE}" + eend $? + fi +} diff --git a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf index f7c7ee514e50..e74b409cc84a 100644 --- a/net-analyzer/greenbone-security-assistant/files/gsad-daemon.conf +++ b/net-analyzer/gsad/files/gsad-daemon.conf @@ -1,7 +1,7 @@ # Greenbone Security Assistant command args # e.g. --foreground | e.g. --no-redirect -GSAD_OPTIONS="--no-redirect" +GSAD_OPTIONS="--no-redirect --http-only" # GSAD listen adress GSAD_LISTEN_ADDRESS="--listen=127.0.0.1" diff --git a/net-analyzer/gsad/files/gsad.service.conf b/net-analyzer/gsad/files/gsad.service.conf new file mode 100644 index 000000000000..23d1db6f96bc --- /dev/null +++ b/net-analyzer/gsad/files/gsad.service.conf @@ -0,0 +1,2 @@ +[Unit] +PartOf=gvm.target diff --git a/net-analyzer/gsad/gsad-22.9.0.ebuild b/net-analyzer/gsad/gsad-22.9.0.ebuild new file mode 100644 index 000000000000..2230d3f5a627 --- /dev/null +++ b/net-analyzer/gsad/gsad-22.9.0.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad" +SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="brotli doc" + +DEPEND=" + acct-user/gvm + >=net-libs/libmicrohttpd-0.9.0:= + dev-libs/libxml2:2 + >=dev-libs/glib-2.42:2 + >=net-analyzer/gvm-libs-22.6 + >=net-libs/gnutls-3.2.15:= + >=sys-libs/zlib-1.2 + dev-libs/libgcrypt:0= + brotli? ( + app-arch/brotli + ) +" + +RDEPEND=" + ${DEPEND} + >=net-analyzer/gvmd-22.4 + >=net-analyzer/gsa-22.4 + net-analyzer/ospd-openvas +" + +BDEPEND=" + dev-python/polib + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + ) +" + +src_prepare() { + cmake_src_prepare + + # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" + "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" + ) + cmake_src_configure +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." ) + fi + cmake_src_install + + systemd_install_serviced "${FILESDIR}/gsad.service.conf" \ + ${PN}.service + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" +} diff --git a/net-analyzer/gsad/gsad-22.9.1.ebuild b/net-analyzer/gsad/gsad-22.9.1.ebuild new file mode 100644 index 000000000000..1dcd0909a14a --- /dev/null +++ b/net-analyzer/gsad/gsad-22.9.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone Security Assistant" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad" +SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="brotli doc" + +DEPEND=" + acct-user/gvm + >=net-libs/libmicrohttpd-0.9.0:= + dev-libs/libxml2:2 + >=dev-libs/glib-2.42:2 + >=net-analyzer/gvm-libs-22.6 + >=net-libs/gnutls-3.2.15:= + >=sys-libs/zlib-1.2 + dev-libs/libgcrypt:0= + brotli? ( + app-arch/brotli + ) +" + +RDEPEND=" + ${DEPEND} + >=net-analyzer/gvmd-22.4 + >=net-analyzer/gsa-22.4 + net-analyzer/ospd-openvas +" + +BDEPEND=" + dev-python/polib + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + ) +" + +src_prepare() { + cmake_src_prepare + + # QA-Fix | Remove !CLANG doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" + "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" + ) + cmake_src_configure +} + +src_compile() { + # setting correct PATH for finding react-js + NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/" cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." ) + fi + cmake_src_install + + systemd_install_serviced "${FILESDIR}/gsad.service.conf" \ + ${PN}.service + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" +} diff --git a/net-analyzer/gsad/metadata.xml b/net-analyzer/gsad/metadata.xml new file mode 100644 index 000000000000..27bf47cfefc0 --- /dev/null +++ b/net-analyzer/gsad/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">greenbone/gsad</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch b/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch new file mode 100644 index 000000000000..c91a54231150 --- /dev/null +++ b/net-analyzer/gspoof/files/gspoof-3.2-fno-common.patch @@ -0,0 +1,221 @@ +--- a/ginclude.h ++++ b/ginclude.h +@@ -22,8 +22,8 @@ struct FLAGS + urg:1, + ece:1, + cwr:1; +-} +-f; ++}; ++extern struct FLAGS f; + + struct CHECKS + { +@@ -31,33 +31,33 @@ struct CHECKS + data:1, /* include payload */ + linkl:1, /* work with datalink */ + debug:1; /* enable debug mode */ +-} +-ck; ++}; ++extern struct CHECKS ck; + + struct MULTI + { + u_long number; + u_long delay; +-} +-m; ++}; ++extern struct MULTI m; + + struct ECN + { + u_int dscp:8; + u_int ecn_ct:2; + u_int ecn_ce:1; +-} +-ipv4_tos; ++}; ++extern struct ECN ipv4_tos; + +-u_long shost; +-u_long dhost; +-u_long seq; +-u_long ack; +-u_short id; +-u_short urgp; +-u_short tos; ++extern u_long shost; ++extern u_long dhost; ++extern u_long seq; ++extern u_long ack; ++extern u_short id; ++extern u_short urgp; ++extern u_short tos; + +-char device[10]; +-char data[128]; ++extern char device[10]; ++extern char data[128]; + +-u_char ebuf[LIBNET_ERRBUF_SIZE]; ++extern u_char ebuf[LIBNET_ERRBUF_SIZE]; +--- a/interface.h ++++ b/interface.h +@@ -20,47 +20,47 @@ GtkWidget* create_ECNWin (void); + /* Define common Widget */ + + /* MainWin */ +-GtkWidget *iface_entry; +-GtkWidget *srcmac_entry; +-GtkWidget *dstmac_entry; +-GtkWidget *ethtype_combo; +-GtkWidget *ethtype_combo_entry; +-GtkWidget *DatalinkFrame; ++extern GtkWidget *iface_entry; ++extern GtkWidget *srcmac_entry; ++extern GtkWidget *dstmac_entry; ++extern GtkWidget *ethtype_combo; ++extern GtkWidget *ethtype_combo_entry; ++extern GtkWidget *DatalinkFrame; + +-GtkWidget *srcaddr_entry; +-GtkWidget *dstaddr_entry; +-GtkWidget *ttl_entry; +-GtkWidget *id_entry; +-GtkWidget *tos_entry; ++extern GtkWidget *srcaddr_entry; ++extern GtkWidget *dstaddr_entry; ++extern GtkWidget *ttl_entry; ++extern GtkWidget *id_entry; ++extern GtkWidget *tos_entry; + +-GtkWidget *srcport_entry; +-GtkWidget *dstport_entry; +-GtkWidget *flags_table; +-GtkWidget *syn_checkbutton; +-GtkWidget *fin_checkbutton; +-GtkWidget *push_checkbutton; +-GtkWidget *ack_checkbutton; +-GtkWidget *rst_checkbutton; +-GtkWidget *urg_checkbutton; +-GtkWidget *ece_checkbutton; +-GtkWidget *cwr_checkbutton; +-GtkWidget *seq_entry; +-GtkWidget *ack_entry; +-GtkWidget *win_entry; +-GtkWidget *urg_entry; ++extern GtkWidget *srcport_entry; ++extern GtkWidget *dstport_entry; ++extern GtkWidget *flags_table; ++extern GtkWidget *syn_checkbutton; ++extern GtkWidget *fin_checkbutton; ++extern GtkWidget *push_checkbutton; ++extern GtkWidget *ack_checkbutton; ++extern GtkWidget *rst_checkbutton; ++extern GtkWidget *urg_checkbutton; ++extern GtkWidget *ece_checkbutton; ++extern GtkWidget *cwr_checkbutton; ++extern GtkWidget *seq_entry; ++extern GtkWidget *ack_entry; ++extern GtkWidget *win_entry; ++extern GtkWidget *urg_entry; + + /* Info TextView */ +-GtkWidget *TextView; +-GtkTextBuffer *TextBuffer; +-GtkWidget *VerticalScroll; ++extern GtkWidget *TextView; ++extern GtkTextBuffer *TextBuffer; ++extern GtkWidget *VerticalScroll; + + /* DataWin */ +-GtkWidget *DataEntry; ++extern GtkWidget *DataEntry; + + /* Multi */ +-GtkWidget *table2; +-GtkWidget *NumberEntryMulti; +-GtkWidget *DelayEntryMulty; ++extern GtkWidget *table2; ++extern GtkWidget *NumberEntryMulti; ++extern GtkWidget *DelayEntryMulty; + + /* ECN */ +-GtkWidget *dscpEntry; ++extern GtkWidget *dscpEntry; +--- a/gfuncts.c ++++ b/gfuncts.c +@@ -19,9 +19,12 @@ + + #include "interface.h" + ++struct FLAGS f; ++struct CHECKS ck; ++struct MULTI m; ++ + /* private functions */ + int CheckValues(); +-u_short datalen; /* data (tcp payload) lenght */ + + int Initialize() + { +@@ -139,6 +142,7 @@ int SendPacket() + /* BEGIN of variables ' declaration */ + libnet_t *l; + char *dataptr; ++ u_short datalen; /* data (tcp payload) lenght */ + + u_short sport, dport; + u_short flag=0x00; +--- a/interface.c ++++ b/interface.c +@@ -27,6 +27,47 @@ + #include "ginclude.h" /* define payload and multi options */ + #include "common.h" + ++GtkWidget *iface_entry; ++GtkWidget *srcmac_entry; ++GtkWidget *dstmac_entry; ++GtkWidget *ethtype_combo; ++GtkWidget *ethtype_combo_entry; ++GtkWidget *DatalinkFrame; ++ ++GtkWidget *srcaddr_entry; ++GtkWidget *dstaddr_entry; ++GtkWidget *ttl_entry; ++GtkWidget *id_entry; ++GtkWidget *tos_entry; ++ ++GtkWidget *srcport_entry; ++GtkWidget *dstport_entry; ++GtkWidget *flags_table; ++GtkWidget *syn_checkbutton; ++GtkWidget *fin_checkbutton; ++GtkWidget *push_checkbutton; ++GtkWidget *ack_checkbutton; ++GtkWidget *rst_checkbutton; ++GtkWidget *urg_checkbutton; ++GtkWidget *ece_checkbutton; ++GtkWidget *cwr_checkbutton; ++GtkWidget *seq_entry; ++GtkWidget *ack_entry; ++GtkWidget *win_entry; ++GtkWidget *urg_entry; ++ ++GtkWidget *TextView; ++GtkTextBuffer *TextBuffer; ++GtkWidget *VerticalScroll; ++ ++GtkWidget *DataEntry; ++ ++GtkWidget *table2; ++GtkWidget *NumberEntryMulti; ++GtkWidget *DelayEntryMulty; ++ ++GtkWidget *dscpEntry; ++ + #define GLADE_HOOKUP_OBJECT(component,widget,name) \ + g_object_set_data_full (G_OBJECT (component), name, \ + gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) diff --git a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild index 81f4bbad8ce7..b44beb880250 100644 --- a/net-analyzer/gspoof/gspoof-3.2-r3.ebuild +++ b/net-analyzer/gspoof/gspoof-3.2-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools desktop +inherit autotools desktop flag-o-matic DESCRIPTION="A simple GTK/command line TCP/IP packet generator" HOMEPAGE="http://gspoof.sourceforge.net/" @@ -12,8 +12,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" - DEPEND=" x11-libs/gtk+:2 dev-libs/glib:2 @@ -22,9 +20,10 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-def-values.patch - "${FILESDIR}"/${P}-icon.patch - "${FILESDIR}"/${PN}-3.2-libdir.patch + "${FILESDIR}/${PN}-def-values.patch" + "${FILESDIR}/${PN}-3.2-icon.patch" + "${FILESDIR}/${PN}-3.2-libdir.patch" + "${FILESDIR}/${PN}-3.2-fno-common.patch" ) src_prepare() { @@ -32,6 +31,17 @@ src_prepare() { eautoreconf } +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/861158 + # + # Upstream sourceforge is dead. Software last updated in December 2003. + # No bug filed. + filter-lto + + default +} + src_compile() { emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } diff --git a/net-analyzer/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml index c08e67a93e3e..5e297da92ed0 100644 --- a/net-analyzer/gspoof/metadata.xml +++ b/net-analyzer/gspoof/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index 02d15c5c6a56..19c9c6ddd694 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1 +1,2 @@ -DIST gvm-libs-10.0.1.tar.gz 198483 BLAKE2B 4f4ddc7a3a1b4d45a51868cf03844365a9c4dd07f17ab53957ac4a1452ecba595885abdf01402a78aa784163aaba60b5c452fb9c2b5a11d38c40706e820c22c2 SHA512 961570e8fa8f89f0b462991bff1bf4e512ed6419cff6871c7432899847fb9edcc9f0adb7c280d12ee69fbb5c8e306c9e4366e2cbbb05fc3bae06795dcfb42206 +DIST gvm-libs-22.8.0.tar.gz 310304 BLAKE2B ed880ca924d5f9c6d376c1b6b0711adecb095b0b79c565da6d62bf53d71ef0f49892263dc7e28e08841d33db0c480d691f4d4d95b3883d4f0751088fcf0b1d90 SHA512 5daa9157399fc8cf52cdfbdfeffe5e10a282cbe2f7b8eb6a3fefb202984f9df3bca91ef80d1d9d1bf37307cc475bd41d4b64b4f1ad0644975b295b6f32b294a6 +DIST gvm-libs-22.9.0.tar.gz 314119 BLAKE2B 481ca7a977647a53ef21079b054ed1294c0ce081693abe373dc9bb241725a141c11ab54a4eb2716b7543c678400ca933f9611d9a6615c4d39a9877a8cb40406a SHA512 39049d0eea3cca632ed25f3a807d03568213cf0daac4e7ab8d088458212e76db881644421dd44a2b34f6490eab35c171339e52e6b4ba4204ff2d9b7422578876 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch b/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch deleted file mode 100644 index 29c2a4cd83a6..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-10.0.1-pid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2019-04-05 11:27:07.000000000 +0300 -+++ b/CMakeLists.txt 2019-07-14 23:42:42.723081614 +0300 -@@ -172,7 +172,7 @@ - endif (NOT DATADIR) - - if (NOT GVM_PID_DIR) -- set (GVM_PID_DIR "${LOCALSTATEDIR}/run") -+ set (GVM_PID_DIR "/var/lib/gvm") - endif (NOT GVM_PID_DIR) - - if (NOT GVM_SYSCONF_DIR) diff --git a/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch b/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch new file mode 100644 index 000000000000..11130f5c209d --- /dev/null +++ b/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch @@ -0,0 +1,23 @@ +Fixes underlinking math lib in base/CMakeLists.txt +Bug: https://bugs.gentoo.org/9889 +Upstream PR: https://github.com/greenbone/gvm-libs/pull/811 + +--- a/base/CMakeLists.txt ++++ b/base/CMakeLists.txt +@@ -37,6 +37,7 @@ set (HEADERS array.h credentials.h cvss.h drop_privileges.h hosts.h logging.h + if (BUILD_STATIC) + set (LIBGVM_BASE_NAME gvm_base_static) + add_library (gvm_base_static STATIC ${FILES}) ++ target_link_libraries(gvm_base_static m) + set_target_properties (gvm_base_static PROPERTIES OUTPUT_NAME "gvm_base") + set_target_properties (gvm_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties (gvm_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}") +@@ -51,7 +52,7 @@ if (BUILD_SHARED) + set_target_properties (gvm_base_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") + set_target_properties (gvm_base_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") + +- target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS}) ++ target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS} m) + endif (BUILD_SHARED) + + set (LIBGVM_BASE_NAME diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild deleted file mode 100644 index ebcbd5996319..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic toolchain-funcs user - -DESCRIPTION="Greenbone vulnerability management libraries, previously named openvas-libraries" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras ldap radius" - -DEPEND=" - app-crypt/gpgme:= - dev-libs/hiredis - dev-libs/libgcrypt:= - dev-perl/UUID - net-libs/gnutls:= - net-libs/libssh:= - sys-libs/zlib - ldap? ( net-nds/openldap ) - radius? ( net-dialup/freeradius-client )" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - )" - -PATCHES=( - # Creating pid on build time instead of relying daemon! - # QA fix for 10.0.1. - "${FILESDIR}/${P}-pid.patch" -) - -pkg_setup() { - enewgroup gvm 495 - enewuser gvm 495 -1 /var/lib/gvm gvm -} - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove doxygen warnings for !CLANG - if use extras; then - if ! tc-is-clang; then - local f - for f in doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - $(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1) - $(usex radius -DBUILD_WITHOUT_RADIUS=0 -DBUILD_WITHOUT_RADIUS=1) - ) - # Add release hardening flags for 10.0.1 - append-cflags -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm - fowners -R gvm:gvm /var/lib/gvm -} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild new file mode 100644 index 000000000000..337879f76695 --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +PATCHES=( + # Fix bug 925932 + # See https://github.com/greenbone/gvm-libs/pull/811 + "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild new file mode 100644 index 000000000000..5c0ad0faa80c --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild new file mode 100644 index 000000000000..337879f76695 --- /dev/null +++ b/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" +SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc ldap test radius" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=app-crypt/gpgme-1.7.0:= + >=dev-libs/glib-2.42:2 + >=dev-libs/hiredis-0.10.1:= + dev-libs/libgcrypt:= + dev-libs/libgpg-error + >=dev-libs/libxml2-2.0:2 + >=net-libs/gnutls-3.2.15:= + net-libs/libnet:1.1 + net-libs/libpcap + >=net-libs/libssh-0.6.0:= + >=sys-apps/util-linux-2.25.0 + sys-libs/libxcrypt:= + >=sys-libs/zlib-1.2.8 + net-libs/paho-mqtt-c:1.3 + ldap? ( net-nds/openldap:= ) + radius? ( net-dialup/freeradius-client ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-vcs/git + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + ) + test? ( dev-libs/cgreen ) +" + +PATCHES=( + # Fix bug 925932 + # See https://github.com/greenbone/gvm-libs/pull/811 + "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag | Bug: #909558 + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die + # QA-Fix | Remove doxygen warnings for !CLANG + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in; do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (networking-test networking-test)/ /g' base/CMakeLists.txt || die + sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" + "-DBUILD_TESTS=$(usex test)" + "-DBUILD_WITH_RADIUS=$(usex radius)" + "-DBUILD_WITH_LDAP=$(usex ldap)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi +} diff --git a/net-analyzer/gvm-libs/metadata.xml b/net-analyzer/gvm-libs/metadata.xml index dbbfe2e9f17b..df3bcf4ee54f 100644 --- a/net-analyzer/gvm-libs/metadata.xml +++ b/net-analyzer/gvm-libs/metadata.xml @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> <longdescription lang="en"> This is the libraries module for the Greenbone Vulnerability Management Solution. - It is used for the Greenbone Security Manager appliances and provides various + It is used for the Greenbone Security Manager appliances and provides various functionalities to support the integrated service daemons. </longdescription> <upstream> diff --git a/net-analyzer/gvm-tools/Manifest b/net-analyzer/gvm-tools/Manifest index e19d6a3bdec6..3bc6024ec7e8 100644 --- a/net-analyzer/gvm-tools/Manifest +++ b/net-analyzer/gvm-tools/Manifest @@ -1 +1,2 @@ -DIST gvm-tools-2.0.0.tar.gz 114592 BLAKE2B 73532138f4153ce625e68d4feb477bea4504be910266d6dac113caff1da096bc6072649ddc456b3348e1aba79c9b7e147ba019a70e4163267c474850019a076e SHA512 0adf7e06b1208c91fbc02dab42593280c95f6572e27d96d6f8777d710747a9e427c79678d9aef785b7ecd6d4fd30e79a1c063fe4256025ac0616c1d242f45025 +DIST gvm-tools-24.1.0.tar.gz 218801 BLAKE2B ddc17406e5253696dca652c5e583fd5cc64505202f81496372d8b26ee7d4dafa1457cf4ae3249e7a183c123b3bd51b2de566ccdb2fa5f251d4edac90175e1b95 SHA512 6138c6c85421c7b011b73c2c857e9481cd46622ad3627a8d85c50563ebbd3c6d5cae80f43118ec85ef243fb965dcbe1cd7c1df29326f1d81b21c56ad117bef28 +DIST gvm-tools-24.3.0.tar.gz 213334 BLAKE2B 0a09dc1e1c637996de306d5ecebed861f6a92caab16d6fa7d437886bc280ad078d3ef8bef019ba19541d9566a2a77ebf3e498b1bc0a6e956a649777cf78c5b6e SHA512 bf482a9bfdb9a65851ecf0ad2b66d773cb3dd3b5a0bace1b8ac7d52add4042134f83d95f41d275a426016d3bf21d2b64d42fcaa1ac84aa87ab6f73a5b0a1237f diff --git a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild deleted file mode 100644 index 5a3779fa72e7..000000000000 --- a/net-analyzer/gvm-tools/gvm-tools-2.0.0.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -inherit distutils-r1 - -DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}] - dev-python/pythondialog:0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - !net-analyzer/openvas-cli - !net-analyzer/openvas-tools" - -DEPEND=" - ${RDEPEND}" - -src_prepare() { - distutils-r1_python_prepare_all - # Exlude tests & correct FHS/Gentoo policy paths - sed -i "s/packages=find_packages(),.*/packages=find_packages(exclude=['tests*', 'docs']),/" "$S"/setup.py || die - sed -i -e "s*''*'/usr/share/doc/${P}'*g" "$S"/setup.py || die -} diff --git a/net-analyzer/gvm-tools/gvm-tools-24.1.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-24.1.0.ebuild new file mode 100644 index 000000000000..486de1f6273a --- /dev/null +++ b/net-analyzer/gvm-tools/gvm-tools-24.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 + +DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-tools/" +SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=net-analyzer/python-gvm-23.4.2[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest diff --git a/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild b/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild new file mode 100644 index 000000000000..ee65c28046f4 --- /dev/null +++ b/net-analyzer/gvm-tools/gvm-tools-24.3.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 + +DESCRIPTION="Remote control for Greenbone Vulnerability Manager, previously named openvas-cli" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-tools/" +SRC_URI="https://github.com/greenbone/gvm-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=net-analyzer/python-gvm-23.4.2[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest diff --git a/net-analyzer/gvm-tools/metadata.xml b/net-analyzer/gvm-tools/metadata.xml index f85b386b890f..49aa4756bce9 100644 --- a/net-analyzer/gvm-tools/metadata.xml +++ b/net-analyzer/gvm-tools/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/gvm/files/gvm.init b/net-analyzer/gvm/files/gvm.init new file mode 100644 index 000000000000..22a736c403b3 --- /dev/null +++ b/net-analyzer/gvm/files/gvm.init @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${GVM_TIMEOUT:=30} + +name="Greenbone Vulnerability Manager" +command="/bin/true" +command_background="true" +command_user="${GVM_USER}:${GVM_GROUP}" +pidfile="/run/gvm/gvm.pid" +retry="${GVM_TIMEOUT}" + +depend() { + after bootmisc + need localmount net redis-openvas ospd-openvas gvmd gsad + want notus-scanner +} + +start_pre() { + mkdir /run/gvm + chown -R gvm:gvm /run/gvm/ +} diff --git a/net-analyzer/gvm/files/gvm.target b/net-analyzer/gvm/files/gvm.target new file mode 100644 index 000000000000..783f8781579a --- /dev/null +++ b/net-analyzer/gvm/files/gvm.target @@ -0,0 +1,5 @@ +[Unit] +Description=Greenbone Vulnerability Manager +Requires=multi-user.target redis-openvas.service ospd-openvas.service gvmd.service gsad.service +Wants=notus-scanner.service +After=syslog.target network.target networking.service multi-user.target notus-scanner.service redis-openvas.service ospd-openvas.service gvmd.service gsad.service diff --git a/net-analyzer/gvm/gvm-10.0.1.ebuild b/net-analyzer/gvm/gvm-10.0.1.ebuild deleted file mode 100644 index 7624312b1a47..000000000000 --- a/net-analyzer/gvm/gvm-10.0.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils - -DESCRIPTION="Greenbone Vulnerability Management,previously named OpenVAS" -HOMEPAGE="https://www.greenbone.net/en/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="cli +cron +extras +gsa ldap ospd postgres radius +sqlite" -REQUIRED_USE="|| ( postgres sqlite )" - -RDEPEND=" - >=net-analyzer/gvm-libs-10.0.1[extras?,ldap?,radius?] - >=net-analyzer/gvmd-8.0.1[extras?,postgres?,sqlite?] - >=net-analyzer/openvas-scanner-6.0.1[cron?,extras?] - cli? ( >=net-analyzer/gvm-tools-2.0.0 ) - gsa? ( >=net-analyzer/greenbone-security-assistant-8.0.1[extras?] ) - ospd? ( >=net-analyzer/ospd-2.0.0[extras?] )" - -pkg_postinst() { - elog "Additional support for extra checks can be get from" - optfeature "Web server scanning and testing tool" net-analyzer/nikto - optfeature "Portscanner" net-analyzer/nmap - optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan - optfeature "Application protocol detection tool" net-analyzer/amap - optfeature "ovaldi (OVAL) — an OVAL Interpreter" app-forensics/ovaldi - optfeature "Linux-kernel-based portscanner" net-analyzer/portbunny - optfeature "Web application attack and audit framework" net-analyzer/w3af -} diff --git a/net-analyzer/gvm/gvm-22.4-r1.ebuild b/net-analyzer/gvm/gvm-22.4-r1.ebuild new file mode 100644 index 000000000000..1fce1de5e626 --- /dev/null +++ b/net-analyzer/gvm/gvm-22.4-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit optfeature systemd + +DESCRIPTION="Greenbone Vulnerability Management, previously named OpenVAS" +HOMEPAGE="https://www.greenbone.net" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="cli doc +gsa ldap ospd snmp radius" + +RDEPEND=" + >=net-analyzer/gvm-libs-${PV}[doc?,ldap?,radius?] + >=net-analyzer/gvmd-${PV}[doc?] + >=net-analyzer/openvas-scanner-${PV}[doc?,snmp?] + >=net-analyzer/greenbone-feed-sync-23.6.0 + cli? ( >=net-analyzer/gvm-tools-21.10.0 ) + gsa? ( >=net-analyzer/gsad-${PV}[doc?] ) + ospd? ( >=net-analyzer/ospd-openvas-${PV}[doc?] ) +" + +src_unpack() { + mkdir "${WORKDIR}/${P}" +} + +src_install() { + systemd_dounit "${FILESDIR}/${PN}.target" + newinitd "${FILESDIR}/${PN}.init" "${PN}" +} + +pkg_postinst() { + optfeature "web server scanning and testing tool" net-analyzer/nikto + optfeature "IPsec VPN scanning, fingerprinting and testing tool" net-analyzer/ike-scan + optfeature "port scanner" net-analyzer/nmap + optfeature "create results from local security checks" net-analyzer/notus-scanner +} diff --git a/net-analyzer/gvm/metadata.xml b/net-analyzer/gvm/metadata.xml index 8f3369bf5f0d..588dd28fa08c 100644 --- a/net-analyzer/gvm/metadata.xml +++ b/net-analyzer/gvm/metadata.xml @@ -1,27 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <use> <flag name="cli">Command Line Interface for OpenVAS Scanner</flag> - <flag name="cron">A cron job to update GVM's vulnerability feeds daily</flag> - <flag name="extras">Extra fonts, pdf-results! and html docs support</flag> <flag name="gsa">Greenbone Security Assistant (WebUI)</flag> <flag name="ospd">Enable support for scanner wrappers</flag> </use> <longdescription lang="en"> - GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner - with associated tools like a graphical user front-end. + GVM previously named OpenVAS stands for Open Vulnerability Assessment System and is a network security scanner + with associated tools like a graphical user front-end. The core component is a server with a set of network vulnerability tests (NVTs) to detect security problems in remote systems and applications. </longdescription> - <upstream> - <remote-id type="github">greenbone</remote-id> - </upstream> </pkgmetadata> diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index 328c523e0674..c3c366b7f8c7 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -1 +1,3 @@ -DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8 +DIST gvmd-23.1.0.tar.gz 1050719 BLAKE2B 9ff3e679ac4c4ff0e4a5eb1ee9ed4c9d243a96b5c4d63934576ec86d70f15f6ff6dee839e29c0de50af3a829e141fa416ac993935f0a683ca135f68f17e1489a SHA512 77d08067a168065bb3b4fd10ba94c48a3207378c9b8c0be42a9570c390c92b985ebf94c53cbbe04f78c2a802de430d599593e1971bc7b93d3f0652bfe59022a4 +DIST gvmd-23.4.0.tar.gz 1064194 BLAKE2B a74ed75c69f3f793058133ec6aca93ddba34efc51267b20333916d7291484f1b1eefa5527f3bb34137584a290e4d7d150d799f9f9b0f1473dfa8c3b4d83f9cfb SHA512 0c5b0d933444d25253e234f387e9063ebbeb379d330cab9ca4eaaddc0effe6fbda312b8de51b5f9784141d149f83b6f0069d7e1f72674857b8d041ab9bff6dfd +DIST gvmd-23.5.2.tar.gz 1064064 BLAKE2B 84d2861f274a71b8a681cb1bfff01ee06f6bc9ab8ae0cb430e65b3f36e9f75076365efa9d5b5d6a5954d328fbc5e3aa6b942a4e1e875ca640ac814dbcc8d98be SHA512 4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4 diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf deleted file mode 100644 index d31a7331d341..000000000000 --- a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data" diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf deleted file mode 100644 index 967c41dec2e3..000000000000 --- a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed" diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf deleted file mode 100644 index 4a7426bc8057..000000000000 --- a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf +++ /dev/null @@ -1 +0,0 @@ -COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data" diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init new file mode 100644 index 000000000000..fdae00af6317 --- /dev/null +++ b/net-analyzer/gvmd/files/gvmd-22.init @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVMD_USER:=gvm} +: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})} +: ${GVMD_TIMEOUT:=30} + +name="Greenbone Vulnerability Manager" +command=/usr/bin/gvmd +command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" +command_user="${GVMD_USER}:${GVMD_GROUP}" +pidfile="/run/gvmd/gvmd.pid" +retry="${GVMD_TIMEOUT}" + +depend() { + after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 + want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 + need localmount net ospd-openvas +} + +start_pre() { + checkpath -d --owner ${GVMD_USER} /run/gvmd +} diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch deleted file mode 100644 index bf21acb7b01f..000000000000 --- a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/src/CMakeLists.txt 2019-07-17 17:11:52.000000000 +0300 -+++ b/src/CMakeLists.txt 2019-07-21 22:43:17.299106863 +0300 -@@ -248,12 +248,12 @@ - ## Install - - install (TARGETS ${BINARY_NAME} -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - LIBRARY DESTINATION ${LIBDIR} - ARCHIVE DESTINATION ${LIBDIR}/static) - - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd -- DESTINATION ${SBINDIR}) -+ DESTINATION ${BINDIR}) - - if (BACKEND STREQUAL POSTGRESQL) - install (TARGETS gvm-pg-server ---- a/CMakeLists.txt 2019-07-22 11:31:13.430827400 +0300 -+++ b/CMakeLists.txt 2019-07-22 11:32:29.034765809 +0300 -@@ -571,17 +571,17 @@ - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ) - - install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -@@ -593,13 +593,13 @@ - WORLD_READ WORLD_EXECUTE) - - install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - if (BACKEND STREQUAL SQLITE3) - install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif (BACKEND STREQUAL SQLITE3) diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch deleted file mode 100644 index 40b1e0095578..000000000000 --- a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/tools/greenbone-certdata-sync.in 2019-07-17 17:11:52.000000000 +0300 -+++ b/tools/greenbone-certdata-sync.in 2019-07-22 21:11:36.173099530 +0300 -@@ -494,13 +494,11 @@ - fi - ( - flock -n 9 -- date > $LOCK_FILE - if [ $? -eq 1 ] ; then - log_notice "Sync in progress, exiting." - exit 1 - fi - sync_certdata -- echo -n > $LOCK_FILE --) 9>$LOCK_FILE -+) - - exit 0 ---- a/tools/greenbone-scapdata-sync.in 2019-07-17 17:11:52.000000000 +0300 -+++ b/tools/greenbone-scapdata-sync.in 2019-07-22 21:12:49.193161531 +0300 -@@ -517,13 +517,11 @@ - fi - ( - flock -n 9 -- date > $LOCK_FILE - if [ $? -eq 1 ] ; then - log_notice "Sync in progress, exiting." - exit 1 - fi - sync_scapdata -- echo -n > $LOCK_FILE --) 9>$LOCK_FILE -+) - - exit 0 diff --git a/net-analyzer/gvmd/files/gvmd-daemon.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf index d97da00c7688..061609e1c45c 100644 --- a/net-analyzer/gvmd/files/gvmd-daemon.conf +++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf @@ -5,7 +5,7 @@ GVMD_OPTIONS="" # Manager listen address unix socket # Failing under non-root user (looking for solution) -GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/var/run/gvmd.sock" +GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/run/gvmd/gvmd.sock" # Manager listen address TCP GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1" @@ -23,7 +23,10 @@ GVMD_LISTEN_GROUP="--listen-group=gvm" GVMD_LISTEN_MODE="--listen-mode=755" # Scanner listen address unix socket -GVMD_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock" +GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock" + +# Update vt +GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock" # TLS settings GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0" diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh deleted file mode 100644 index d04daa09b0a2..000000000000 --- a/net-analyzer/gvmd/files/gvmd-startpre.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# Greenbone Vulnerability Manager Systemd ExecStartPre -touch /var/run/gvm-{checking,create-functions,helping,migrating,serving} -chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving} diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init deleted file mode 100644 index 9686c9b5398e..000000000000 --- a/net-analyzer/gvmd/files/gvmd.init +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -: ${GVMD_USER:=gvm} -: ${GVMD_GROUP:=gvm} -: ${GVMD_TIMEOUT:=30} - -name="Greenbone Vulnerability Manager" -command=/usr/bin/gvmd -command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}" -command_background="true" -command_user="${GVMD_USER}:${GVMD_GROUP}" -pidfile="/run/gvmd.pid" -retry="${GVMD_TIMEOUT}" - -depend() { - after bootmisc - need localmount net openvassd -} - -start_pre() { - /bin/bash /etc/gvm/gvmd-startpre.sh -} diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service deleted file mode 100644 index 2e3ad84c85a5..000000000000 --- a/net-analyzer/gvmd/files/gvmd.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Greenbone Vulnerability Manager -After=network.target -After=openvassd.service -Wants=openvassd.service -Before=gsad.service - -[Service] -Type=forking -PrivateTmp=yes -User=gvm -Group=gvm -PermissionsStartOnly=true -EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf -ExecStartPre=-/etc/gvm/gvmd-startpre.sh -ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/gvmd/files/gvmd.service.conf b/net-analyzer/gvmd/files/gvmd.service.conf new file mode 100644 index 000000000000..2e22ddab18c3 --- /dev/null +++ b/net-analyzer/gvmd/files/gvmd.service.conf @@ -0,0 +1,23 @@ +[Unit] +After=postgresql-9.6.service +After=postgresql-10.service +After=postgresql-11.service +After=postgresql-12.service +After=postgresql-13.service +After=postgresql-14.service +After=postgresql-15.service +After=postgresql-16.service +Wants=postgresql-9.6.service +Wants=postgresql-10.service +Wants=postgresql-11.service +Wants=postgresql-12.service +Wants=postgresql-13.service +Wants=postgresql-14.service +Wants=postgresql-15.service +Wants=postgresql-16.service +PartOf=gvm.target + +[Service] +Type=exec +ExecStart= +ExecStart=/usr/bin/gvmd --foreground --osp-vt-update=/run/ospd/ospd-openvas.sock --listen-group=gvm diff --git a/net-analyzer/gvmd/gvmd-23.1.0.ebuild b/net-analyzer/gvmd/gvmd-23.1.0.ebuild new file mode 100644 index 000000000000..0730bd7ff8ed --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.1.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + dev-libs/libbsd + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0:= + >=net-analyzer/gvm-libs-22.7 + >=net-libs/gnutls-3.2.15:=[tools] +" + +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/gvmd/gvmd-23.4.0.ebuild b/net-analyzer/gvmd/gvmd-23.4.0.ebuild new file mode 100644 index 000000000000..f9f321120a6e --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.4.0.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + dev-libs/libbsd + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0:= + >=net-analyzer/gvm-libs-22.8 + >=net-libs/gnutls-3.2.15:=[tools] +" + +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/gvmd/gvmd-23.5.2.ebuild b/net-analyzer/gvmd/gvmd-23.5.2.ebuild new file mode 100644 index 000000000000..963a13a3b4ad --- /dev/null +++ b/net-analyzer/gvmd/gvmd-23.5.2.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd toolchain-funcs + +DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/" +SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3+" +KEYWORDS="~amd64 ~x86" +IUSE="doc test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:1= + dev-libs/libbsd + >=dev-db/postgresql-9.6:=[uuid] + >=dev-libs/glib-2.42:2 + >=dev-libs/libical-1.0.0:= + >=net-analyzer/gvm-libs-22.9 + >=net-libs/gnutls-3.2.15:=[tools] +" + +# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive +# and xmlstartlet are used for (PDF) report generator at runtime. +RDEPEND=" + ${DEPEND} + app-text/xmlstarlet + dev-perl/XML-Twig + dev-texlive/texlive-latexextra + >=net-analyzer/ospd-openvas-22.4 + >=dev-db/pg-gvm-22.4 +" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-libs/libxslt + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 + sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die + sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die + # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" + "-DGVM_DEFAULT_DROP_USER=gvm" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doc + cmake_build doc-full -C "${BUILD_DIR}" doc + fi + if use test; then + cmake_build tests + fi + cmake_build rebuild_cache +} + +src_install() { + if use doc; then + local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) + fi + cmake_src_install + + insinto /etc/gvm/sysconfig + newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf" + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}" + + # Set proper permissions on required files/directories + keepdir /var/lib/gvm/gvmd + if ! use prefix; then + fowners -R gvm:gvm /var/lib/gvm + fi + + systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \ + ${PN}.service +} + +pkg_postinst() { + elog "If you are upgrading from a previous version, you need to update the database version." + elog "Please, create the running directory and give write permission to the database user" + elog "then run gvmd as the gvm user with --migrate option:" + elog "~# mkdir /run/gvmd" + elog "~# setfacl -m u:gvm:rwx /run/gvmd/" + elog "~# sudo -u gvm gvmd --migrate" +} diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild deleted file mode 100644 index 7289dcd5f82a..000000000000 --- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="extras postgres sqlite" -REQUIRED_USE="|| ( postgres sqlite )" - -DEPEND=" - dev-libs/libgcrypt:0= - dev-libs/libical - >=net-analyzer/gvm-libs-10.0.1 - net-libs/gnutls:=[tools] - extras? ( app-text/xmlstarlet - dev-texlive/texlive-latexextra ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 )" - -RDEPEND=" - ${DEPEND} - ~net-analyzer/openvas-scanner-6.0.1" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-libs/libxslt - )" - -PATCHES=( - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" - # Fix permissions for user gvm. - "${FILESDIR}/${P}-tmplock.patch" -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1 - sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die - sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die - # QA-Fix | Remove !CLANG Doxygen warnings for 8.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 8.0.1 - append-cflags -Wno-nonnull -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/gvm - insinto /etc/gvm - doins -r "${FILESDIR}"/*sync* - - dodir /etc/gvm/sysconfig - insinto /etc/gvm/sysconfig - doins "${FILESDIR}/${PN}-daemon.conf" - - exeinto /etc/gvm - doexe "${FILESDIR}"/gvmd-startpre.sh - - fowners -R gvm:gvm /etc/gvm - - newinitd "${FILESDIR}/${PN}.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" - - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotate" "${PN}" - - systemd_dounit "${FILESDIR}/${PN}.service" - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm/gvmd - fowners -R gvm:gvm /var/lib/gvm -} diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml index 36ce32a69a9f..362c0017dc23 100644 --- a/net-analyzer/gvmd/metadata.xml +++ b/net-analyzer/gvmd/metadata.xml @@ -1,22 +1,23 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> <longdescription lang="en"> The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients. It manages the storage of any vulnerability management configurations and of the scan results. Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP). - The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other + The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other remote scanner is coupled with the Open Scanner Protocol (OSP). </longdescription> <upstream> diff --git a/net-analyzer/hexinject/Manifest b/net-analyzer/hexinject/Manifest index dfec39c623d0..8edb0618ffb3 100644 --- a/net-analyzer/hexinject/Manifest +++ b/net-analyzer/hexinject/Manifest @@ -1,2 +1 @@ -DIST hexinject-1.5.tar.gz 14449 BLAKE2B e7c3fc34cce5b004622d6fe30584d90d8739fcc218d485317ddab178807caa4bf82e86b66f45df3311e05ca96c58aa9590108ffaa53c703feaafa64af8804e2e SHA512 cd145b6f2ae9d739effca03959fb474df11d28ff015c0e5bd1e30c341f60085154795f3c8a601b7241623944b3868b6fc9a3e1530a3aa4e7aaa2b3794a5aa34a DIST hexinject-1.6.tar.gz 16876 BLAKE2B ac2951a5b4705ec84ed72fa5513e84b8bf031bd7e43b05c76fe83fc601cf3a245352afb0f226cc128bb028124ba898bc67394f2d839554ee01e25ee25c8f0c4d SHA512 7432122a7ca42b7ac066cc55daec2d4a656b08e0f390db1a49f626181080d07687026d04a150573e3341e4e76f87a20b6466deddcc9d022e7d66fadcb8dac1ad diff --git a/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch deleted file mode 100644 index 046d083710df..000000000000 --- a/net-analyzer/hexinject/files/hexinject-1.5-fix-build-system.patch +++ /dev/null @@ -1,15 +0,0 @@ -Respect user flags - ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - all: -- gcc -o hexinject hexinject.c -lpcap -- gcc -o prettypacket prettypacket.c -- gcc -o hex2raw hex2raw.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hexinject hexinject.c -lpcap -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c - - clean: - rm -f hexinject prettypacket hex2raw *~ diff --git a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch index fbe91199bbfa..9d22337afa93 100644 --- a/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch +++ b/net-analyzer/hexinject/files/hexinject-1.6-fix-build-system.patch @@ -1,18 +1,22 @@ Author: holgersson <holgersson@posteo.de> Date: Fri Oct 20 18:30:00 2017 +0200 -Don’t call gcc directly, and respect CFLAGS. As this project -is plain C I don’t care fore CXXFLAGS here. +Respect CC, CFLAGS, CPPFLAGS and LDFLAGS. ---- a/Makefile 2017-10-20 18:15:11.743805540 +0200 -+++ b/Makefile 2017-10-20 18:24:55.120009439 +0200 -@@ -1,6 +1,6 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,11 +1,7 @@ -CC = gcc -CFLAGS = -Wall -LDFLAGS = -lpcap -+CC ?= gcc +CFLAGS += -Wall -+LDFLAGS = -lpcap ++LDLIBS = -lpcap - all: - $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +-all: +- $(CC) $(CFLAGS) $(LDFLAGS) -o hexinject hexinject.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o prettypacket prettypacket.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o hex2raw hex2raw.c ++all: hexinject prettypacket hex2raw + + clean: + rm -f hexinject prettypacket hex2raw *~ diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild deleted file mode 100644 index b33f5f0bda0c..000000000000 --- a/net-analyzer/hexinject/hexinject-1.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Network packet sniffer and injector" -HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+tools experimental" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND} - experimental? ( dev-lang/tcl )" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${FILESDIR}"/${PN}-1.5-fix-build-system.patch ) - -src_prepare() { - default - append-cflags -std=gnu89 - tc-export CC -} - -src_install() { - dobin hexinject - use tools && dobin hex2raw prettypacket - use experimental && dobin packets.tcl - einstalldocs -} diff --git a/net-analyzer/hexinject/hexinject-1.6-r1.ebuild b/net-analyzer/hexinject/hexinject-1.6-r2.ebuild index e36c1803461e..06bb1f199fdf 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-2024 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" +SRC_URI="https://downloads.sourceforge.net/${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/hexinject/hexinject-1.6.ebuild b/net-analyzer/hexinject/hexinject-1.6.ebuild deleted file mode 100644 index 5d8011ced352..000000000000 --- a/net-analyzer/hexinject/hexinject-1.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Network packet sniffer and injector" -HOMEPAGE="http://hexinject.sourceforge.net/" -SRC_URI="http://downloads.sourceforge.net/project/${PN}/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+tools experimental" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND} - experimental? ( dev-lang/tcl )" - -S="${WORKDIR}/${PN}" - -src_prepare() { - default - append-cflags -std=gnu89 - tc-export CC -} - -src_install() { - dobin hexinject - use tools && dobin hex2raw prettypacket - use experimental && dobin packets.tcl - einstalldocs -} diff --git a/net-analyzer/hexinject/metadata.xml b/net-analyzer/hexinject/metadata.xml index e3ef4f8b00b1..531e51708740 100644 --- a/net-analyzer/hexinject/metadata.xml +++ b/net-analyzer/hexinject/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>holgersson@posteo.de</email> <name>Nils Freydank</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest index 0c59b8f10d76..783db30a88d5 100644 --- a/net-analyzer/hping/Manifest +++ b/net-analyzer/hping/Manifest @@ -1,2 +1 @@ -DIST hping-3_pre20141226.zip 648502 BLAKE2B 4c75bdb886a37180a4561a8179e00ea5bb6534e32b6fa749cd53824e36dfbeaa38b1a772b58f61d68056f510a294f6c3363f56705adb75f42fec11f4f4cd8fa1 SHA512 33ca573d66d7f6285f69a060f56a95e7307bc24d6c81b5e1752c72b8487ab9c85ac6e4499f9c4897e2656a67e12d608a0a149ca5502bdcf18cf97c88d4a2309b -DIST hping3-20051105.tar.gz 584001 BLAKE2B b99b7d2310e1706926ec5c649cd03a8889e3cff36f2a8e1f899799ddb1f4e6e432ab2b83c82b741ab827f715dbf8649a94831e75ef22793c7730e80d49c576c1 SHA512 3b3faa836e70054c8f9f004d876b7eb5f668b64826a6aaf8ca3685619111d9df4eb494a7d38b83cea6cb5f0bd164956461039bf4f73f7c7e90d80cede639b2b3 +DIST hping-3_pre20141226.tar.gz 572322 BLAKE2B d7bacdd6ae7ba7589825bb9157fc6501740f2a684bc9045483a57c40af3ccf89a09f2f7ddc31c939886e5173b7c4d29233d87e044df14b86e6fcba7bda4f8abc SHA512 d03c27ec25b813c74d57b4e26acf1a5b1ade15abd93c5f8cbf29a5464c6dc3a8679e1d255d99ad232462d6cda70dcd3b68df13e70e950cac0943cb69bdb14b4c diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch deleted file mode 100644 index 872321d41bfd..000000000000 --- a/net-analyzer/hping/files/bytesex.h.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/bytesex.h -+++ b/bytesex.h -@@ -9,11 +9,15 @@ - - #if defined(__i386__) \ - || defined(__alpha__) \ -+ || defined(__arm__) \ -+ || defined(__x86_64__) \ -+ || defined(__ia64__) \ - || (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__))) - #define BYTE_ORDER_LITTLE_ENDIAN - #elif defined(__mc68000__) \ - || defined (__sparc__) \ - || defined (__sparc) \ -+ || defined (__hppa__) \ - || defined (__PPC__) \ - || defined (__BIG_ENDIAN__) \ - || (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__))) diff --git a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch b/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch deleted file mode 100644 index 39814bff0d8c..000000000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-ldflags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -50,11 +50,11 @@ - $(RANLIB) $@ - - hping3: byteorder.h $(OBJ) -- $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -+ $(CC) -o hping3 $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ - @echo - - hping3-static: byteorder.h $(OBJ) -- $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl -+ $(CC) -static -o hping3-static $(CCOPT) $(LDFLAGS) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl - - byteorder.h: - ./configure diff --git a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch b/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch deleted file mode 100644 index 2c3e01bf697a..000000000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-scan-overflow.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scan.c -+++ b/scan.c -@@ -456,7 +456,7 @@ - continue; - /* time to copy headers in a safe place */ - p = packet+linkhdr_size+iphdrlen; -- memcpy(&icmp, p, sizeof(subtcp)); -+ memcpy(&icmp, p, sizeof(icmp)); - p += sizeof(icmp); - memcpy(&subip, p, sizeof(ip)); - p += sizeof(ip); diff --git a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch b/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch deleted file mode 100644 index 692cd93102fb..000000000000 --- a/net-analyzer/hping/files/hping-3_pre20051105-strlen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ip_opt_build.c -+++ b/ip_opt_build.c -@@ -25,7 +25,7 @@ - unsigned char optlen = 0; - unsigned long ip; - -- memset(ip_opt, 1, sizeof(ip_opt)); -+ memset(ip_opt, 1, strlen(ip_opt)); - - if (opt_lsrr) - { diff --git a/net-analyzer/hping/files/hping-3_pre20051105.patch b/net-analyzer/hping/files/hping-3_pre20051105.patch deleted file mode 100644 index e3133f2b6b42..000000000000 --- a/net-analyzer/hping/files/hping-3_pre20051105.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/libpcap_stuff.c -+++ b/libpcap_stuff.c -@@ -17,7 +17,7 @@ - #include <stdlib.h> - #include <sys/ioctl.h> - #include <pcap.h> --#include <net/bpf.h> -+#include <pcap-bpf.h> - - #include "globals.h" - ---- a/script.c -+++ b/script.c -@@ -24,7 +24,7 @@ - - #include <sys/ioctl.h> - #include <pcap.h> --#include <net/bpf.h> -+#include <pcap-bpf.h> - - #include "release.h" - #include "hping2.h" ---- a/configure -+++ b/configure -@@ -93,7 +93,7 @@ - else - USE_TCL="" - TCL_LIB="" -- echo "==> WARNING: no Tcl header files found!" -+ echo "==> WARNING: no Tcl header files found." - fi - fi - if [ -n $USE_TCL ] ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,9 +52,6 @@ - hping3: byteorder.h $(OBJ) - $(CC) -o hping3 $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ - @echo -- ./hping3 -v -- @echo "use \`make strip' to strip hping3 binary" -- @echo "use \`make install' to install hping3" - - hping3-static: byteorder.h $(OBJ) - $(CC) -static -o hping3-static $(CCOPT) $(DEBUG) $(OBJ) -L/usr/local/lib $(PCAP) @SOLARISLIB@ @TCL_LIB@ -ldl diff --git a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild b/net-analyzer/hping/hping-3_pre20051105-r6.ebuild deleted file mode 100644 index 48310b956eee..000000000000 --- a/net-analyzer/hping/hping-3_pre20051105-r6.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils multilib toolchain-funcs - -MY_P="${PN}${PV//_pre/-}" -DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" -HOMEPAGE="http://www.hping.org" -SRC_URI="http://www.hping.org/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc sparc x86" -IUSE="tcl" - -S="${WORKDIR}/${MY_P}" - -DEPEND=" - net-libs/libpcap - tcl? ( dev-lang/tcl:0= ) -" -RDEPEND=" - ${DEPEND} -" -PATCHES=( - "${FILESDIR}"/${P}.patch - "${FILESDIR}"/bytesex.h.patch - "${FILESDIR}"/${P}-tcl.patch - "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-libtcl.patch - "${FILESDIR}"/${P}-scan-overflow.patch - "${FILESDIR}"/${P}-tclsh-proper-escaping.patch - "${FILESDIR}"/${P}-strlen.patch -) - -src_prepare() { - default - - # Correct hard coded values - sed -i Makefile.in \ - -e '/^CC=/d' \ - -e '/^AR=/d' \ - -e '/^RANLIB=/d' \ - -e 's:/usr/local/lib:/usr/$(LIBDIR):g' \ - -e 's:-O2:$(CFLAGS):' \ - || die - - # Change name from hping2 to hping3 - sed -i docs/hping3.8 \ - -e 's|HPING2|HPING|g' \ - -e 's|hping2|hping|g' \ - || die -} - -src_configure() { - tc-export CC - - # Not an autotools type configure: - sh configure $(usex tcl '' --no-tcl) || die -} - -src_compile() { - emake \ - DEBUG="" \ - "CFLAGS=${CFLAGS}" \ - "AR=$(tc-getAR)" \ - "RANLIB=$(tc-getRANLIB)" \ - "LIBDIR=$(get_libdir)" -} - -src_install () { - dosbin hping3 - dosym /usr/sbin/hping3 /usr/sbin/hping - dosym /usr/sbin/hping3 /usr/sbin/hping2 - - newman docs/hping3.8 hping.8 - - dodoc AUTHORS BUGS CHANGES INSTALL NEWS README TODO -} diff --git a/net-analyzer/hping/hping-3_pre20141226.ebuild b/net-analyzer/hping/hping-3_pre20141226.ebuild index 3c3a3f166ea6..ea7237270ec2 100644 --- a/net-analyzer/hping/hping-3_pre20141226.ebuild +++ b/net-analyzer/hping/hping-3_pre20141226.ebuild @@ -1,28 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils multilib toolchain-funcs +EAPI=7 +inherit flag-o-matic toolchain-funcs + +HPING_COMMIT="3547c7691742c6eaa31f8402e0ccbb81387c1b99" DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer" HOMEPAGE="http://www.hping.org" -HPING_COMMIT="3547c7691742c6eaa31f8402e0ccbb81387c1b99" -SRC_URI="https://github.com/antirez/${PN}/archive/${HPING_COMMIT}.zip -> ${P}.zip" +SRC_URI="https://github.com/antirez/${PN}/archive/${HPING_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${HPING_COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc sparc x86" IUSE="tcl" -S=${WORKDIR}/${PN}-${HPING_COMMIT} - DEPEND=" net-libs/libpcap tcl? ( dev-lang/tcl:0= ) " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" + PATCHES=( "${FILESDIR}"/${PN}-3_pre20051105-libtcl.patch "${FILESDIR}"/${PN}-3_pre20051105-tcl.patch @@ -37,6 +36,9 @@ PATCHES=( ) src_configure() { + # bug #861161 + filter-lto + tc-export CC # Not an autotools type configure: @@ -52,7 +54,7 @@ src_compile() { "LIBDIR=$(get_libdir)" } -src_install () { +src_install() { dosbin hping3 dosym hping3 /usr/sbin/hping dosym hping3 /usr/sbin/hping2 diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml index 74c2baebb4ec..1a63b0126d8d 100644 --- a/net-analyzer/hping/metadata.xml +++ b/net-analyzer/hping/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">antirez/hping</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest index 50d7e99a616d..c94047bd1d9c 100644 --- a/net-analyzer/httping/Manifest +++ b/net-analyzer/httping/Manifest @@ -1 +1,2 @@ DIST httping-2.5.tgz 71400 BLAKE2B da261827a4e2276816dbb2f9a6bac989f4ec0e7fc4b7686d51e57f8d4078ec3f94acef032b7042774e9cff57c8158696026e45d44ae1fbb00e52175c9c08b9a5 SHA512 397ce2eac91c9aede0eb19823bfca4e7f98c263937f5954c8a48d5248a251d2030e31f18decb7f7f8b0118ec0e16ec0a84ea4c943ccde7056b80de162954c355 +DIST httping-2.9.tar.gz 83674 BLAKE2B aa1e2b74756ebf62896ad2a4b89e68eff61f73f98ff881bba2fe4e14d2ed2a63af84a2780122ad845d1057ece3f37d567b7bf5d5b62a4b8487c58f1442a90fdf SHA512 74d4a98590b6862a2f15fffdf3bc58e3226a94c7aebbe60135695397b20e6cb71fe8c2af75b8525724f2f9ce6530d1f8eecd3193bc50f31d254bbb9903615019 diff --git a/net-analyzer/httping/files/httping-2.9-c99.patch b/net-analyzer/httping/files/httping-2.9-c99.patch new file mode 100644 index 000000000000..48e07219d4e8 --- /dev/null +++ b/net-analyzer/httping/files/httping-2.9-c99.patch @@ -0,0 +1,35 @@ +https://github.com/folkertvanheusden/HTTPing/pull/12 + +From 684a6e255ea2f5b11a0548e5d99c2678be7563d9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 16 Dec 2023 10:48:17 +0000 +Subject: [PATCH] http.c: add <stdlib.h> for malloc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +GCC 14 makes implicit function declarations an error by default: +``` +http.c: In function ‘get_HTTP_headers’: +http.c:21:32: error: implicit declaration of function ‘malloc’ [-Wimplicit-function-declaration] + 21 | char *buffer = (char *)malloc(len + 1); + | ^~~~~~ +http.c:16:1: note: include ‘<stdlib.h>’ or provide a declaration of ‘malloc’ + 15 | #include "utils.h" + +++ |+#include <stdlib.h> + 16 | +[...] +``` + +Bug: https://bugs.gentoo.org/920107 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/http.c ++++ b/http.c +@@ -2,6 +2,7 @@ + + #include <assert.h> + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #ifndef NO_SSL diff --git a/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild index 27dc3f021f52..13b748882e33 100644 --- a/net-analyzer/httping/httping-2.5.ebuild +++ b/net-analyzer/httping/httping-2.5.ebuild @@ -1,30 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs flag-o-matic DESCRIPTION="http protocol ping-like program" -HOMEPAGE="http://www.vanheusden.com/httping/" -SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz" +HOMEPAGE="https://www.vanheusden.com/httping/" +SRC_URI="https://www.vanheusden.com/${PN}/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 hppa ~mips ~ppc ppc64 ~sparc x86" -IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo" +KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" +IUSE="debug fftw l10n_nl ncurses ssl +tfo" RDEPEND=" fftw? ( sci-libs/fftw:3.0 ) ncurses? ( sys-libs/ncurses:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND=" - ${RDEPEND} - ncurses? ( virtual/pkgconfig ) + ssl? ( dev-libs/openssl:0= ) " +DEPEND="${RDEPEND}" +BDEPEND="ncurses? ( virtual/pkgconfig )" # This would bring in test? ( dev-util/cppcheck ) but unlike # upstream we should only care about compile/run time testing @@ -43,13 +39,21 @@ src_prepare() { mkdir nl || die mv httping-nl.1 nl/httping.1 || die fi + } src_configure() { # not an autotools script echo > makefile.inc || die - use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )" + if use ncurses ; then + local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # Don't require ncurses with unicode support + # bug #731950 + sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die + append-ldflags "${ncurses_flags}" + fi } src_compile() { diff --git a/net-analyzer/httping/httping-9999999.ebuild b/net-analyzer/httping/httping-2.9-r1.ebuild index 32a92c0aead0..a9db3b0d13f7 100644 --- a/net-analyzer/httping/httping-9999999.ebuild +++ b/net-analyzer/httping/httping-2.9-r1.ebuild @@ -1,30 +1,27 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit git-r3 toolchain-funcs +EAPI=8 -DESCRIPTION="like ping but for HTTP requests" +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="http protocol ping-like program" HOMEPAGE="https://www.vanheusden.com/httping/" -EGIT_REPO_URI="https://github.com/flok99/httping" +SRC_URI="https://github.com/folkertvanheusden/HTTPing/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/HTTPing-${PV} -LICENSE="GPL-2" +LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="debug fftw libressl l10n_nl ncurses ssl +tfo" +KEYWORDS="amd64 ~arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~sparc x86" +IUSE="debug fftw l10n_nl ncurses ssl +tfo" RDEPEND=" fftw? ( sci-libs/fftw:3.0 ) - ncurses? ( sys-libs/ncurses:0= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) -" -DEPEND=" - ${RDEPEND} - ncurses? ( virtual/pkgconfig ) + ncurses? ( sys-libs/ncurses:= ) + ssl? ( dev-libs/openssl:= ) " +DEPEND="${RDEPEND}" +BDEPEND="ncurses? ( virtual/pkgconfig )" # This would bring in test? ( dev-util/cppcheck ) but unlike # upstream we should only care about compile/run time testing @@ -32,24 +29,36 @@ RESTRICT="test" PATCHES=( "${FILESDIR}"/${PN}-2.2.1-flags.patch + "${FILESDIR}"/${PN}-2.9-c99.patch ) src_prepare() { default + # Don't clobber toolchain defaults + sed -i -e 's:-D_FORTIFY_SOURCE=2::' Makefile || die + # doman does not get PN-LANG.CAT so we move things around and then point at # it later if use l10n_nl; then mkdir nl || die mv httping-nl.1 nl/httping.1 || die fi + } src_configure() { # not an autotools script echo > makefile.inc || die - use ncurses && LDFLAGS+=" $( $( tc-getPKG_CONFIG ) --libs ncurses )" + if use ncurses ; then + local ncurses_flags="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # Don't require ncurses with unicode support + # bug #731950 + sed -i -e "s/-lncursesw/${ncurses_flags}/" Makefile || die + append-libs "${ncurses_flags}" + fi } src_compile() { diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml index b3a969016433..73888334196d 100644 --- a/net-analyzer/httping/metadata.xml +++ b/net-analyzer/httping/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="tfo">Enable support for TCP Fast Open</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="tfo">Enable support for TCP Fast Open</flag> + </use> + <upstream> + <remote-id type="github">folkertvanheusden/HTTPing</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest index 9d632564e419..d2eafa941c98 100644 --- a/net-analyzer/hunt/Manifest +++ b/net-analyzer/hunt/Manifest @@ -1,3 +1,2 @@ -DIST hunt-1.5.tgz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61 DIST hunt_1.5-6.1.diff.gz 4556 BLAKE2B 74c27722ae61494ca922b013cc691c0e835d7cdcc01399aaf7fe9bc7da4532954c4da2023fc92e3a4f664bb2b5ab8ef22ff1c04694dc1ab7c205125ccea1ff84 SHA512 45ff3f977a32202d8ab9b7daa76a0ebb507d0b73d635c0f3649cf3b2bcb9fdc3094c9631d696dfaf27371bc5fb5eb62dbdc258795979755c7713a45357938a05 DIST hunt_1.5.orig.tar.gz 99241 BLAKE2B df9092cdf6de0016ae5fe8d360a712eccd3c0f71bead3c93142ba2c3c421031cb5e6ff8c3b4782856286fd41a61e40a6453b48f240365ba88f6805bb3bbdd909 SHA512 b016f7ae0ac7568b4a5006b7c5e6f3e80df71a67d94a1e62afc46fb0f10cb661df7e3bff1f0229836a2247ef368dc2681ad955821e97cb6a91fcfe489b871a61 diff --git a/net-analyzer/hunt/files/hunt-1.5-flags.patch b/net-analyzer/hunt/files/hunt-1.5-flags.patch deleted file mode 100644 index 2ffcd823847e..000000000000 --- a/net-analyzer/hunt/files/hunt-1.5-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,7 @@ --CFLAGS=-Wall -O2 -g -D_REENTRANT -+CFLAGS += -I. -Wall -D_REENTRANT - #CFLAGS+=-DSYNC_FAST - #CFLAGS+=-D_WITH_LINUX_KERNEL_HDR - --LDFLAGS= - #LDFLAGS=-static - - OBJ=hunt.o main.o c/list.o c/hash.o c/array.o util.o net.o \ -@@ -11,7 +10,7 @@ - addpolicy.o options.o resolv.o timer.o pktrelay.o - - hunt: $(OBJ) -- $(CC) ${LDFLAGS} -o $@ $^ -lpthread -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread - - hunt_static: $(OBJ) - $(CC) ${LDFLAGS} -static -o $@ $^ -lpthread diff --git a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch index e0bcccae0aae..b5b49944f016 100644 --- a/net-analyzer/hunt/files/hunt-1.5-gentoo.patch +++ b/net-analyzer/hunt/files/hunt-1.5-gentoo.patch @@ -8,7 +8,10 @@ --- a/tpserv/Makefile +++ b/tpserv/Makefile -@@ -3,7 +3,7 @@ +@@ -1,9 +1,8 @@ +-CFLAGS=-Wall -O2 -g +- ++CFLAGS += -Wall all: tpserv tpserv: tpserv.o diff --git a/net-analyzer/hunt/hunt-1.5-r1.ebuild b/net-analyzer/hunt/hunt-1.5-r1.ebuild deleted file mode 100644 index 299342dba80e..000000000000 --- a/net-analyzer/hunt/hunt-1.5-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs - -DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol" -HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html" -SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -src_prepare() { - sed -i Makefile \ - -e 's:^CFLAGS=:CFLAGS += -I. :g' \ - -e '/^LDFLAGS=/d' \ - -e 's:${LDFLAGS}:$(LDFLAGS):g' \ - -e 's:-O2 -g::' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - dobin hunt - doman man/hunt.1 - dodoc CHANGES README* TODO tpsetup/transproxy -} diff --git a/net-analyzer/hunt/hunt-1.5-r3.ebuild b/net-analyzer/hunt/hunt-1.5-r3.ebuild deleted file mode 100644 index 7e824be3caa3..000000000000 --- a/net-analyzer/hunt/hunt-1.5-r3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs - -DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol" -HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html" -SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-exit.patch \ - "${FILESDIR}"/${P}-flags.patch \ - "${FILESDIR}"/${P}-log2.patch -} - -src_compile() { - append-cflags -std=gnu89 - emake CC=$(tc-getCC) -} - -src_install() { - dobin hunt - doman man/hunt.1 - dodoc CHANGES README* TODO tpsetup/transproxy -} diff --git a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild index bdcca2f3eaf8..b31b315b3758 100644 --- a/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild +++ b/net-analyzer/hunt/hunt-1.5_p6_p1.ebuild @@ -1,31 +1,28 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit flag-o-matic toolchain-funcs -DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol" +DESCRIPTION="Tool for checking well known weaknesses in the TCP/IP protocol" HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html" SRC_URI=" mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz -" + mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff.gz" +S="${WORKDIR}/${P/_p*}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" + PATCHES=( + "${WORKDIR}"/${PN}_1.5-6.1.diff "${FILESDIR}"/${P/_p*}-exit.patch "${FILESDIR}"/${P/_p*}-gentoo.patch "${FILESDIR}"/${P/_p*}-log2.patch "${FILESDIR}"/${P/_p*}-tpserv-log.patch ) -S=${WORKDIR}/${P/_p*} - -src_prepare() { - eapply "${WORKDIR}"/${PN}_${PV/_p*}-$(ver_cut 4).$(ver_cut 6).diff - default -} src_configure() { append-cppflags -DSYNC_FAST @@ -34,7 +31,7 @@ src_configure() { src_compile() { local target for target in . tpserv; do - emake CC=$(tc-getCC) LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}" + emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -C "${target}" done } diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/hunt/metadata.xml +++ b/net-analyzer/hunt/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest index a516b15bd1e6..b72f822f43c3 100644 --- a/net-analyzer/hydra/Manifest +++ b/net-analyzer/hydra/Manifest @@ -1,3 +1 @@ -DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f6210dd6128d3ab48ad16ca3a8fad49709163830049ed8b9bb6891861f9c3f5fd5a6179b0a87a072877e829af SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959 -DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72 -DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338 +DIST hydra-9.5.tar.gz 833798 BLAKE2B 848c5b34719c2db98b3a3bee1c47e0b2ebeea668f5c387f015c7079f800cf0607a8cb5accba25ef2e253deb44422d51cf6e012c313496942a47468e0503000e8 SHA512 a8fe42d175d184cdb82072f3a963b956d767fa908aaf1cbbc0746b6a67cfd37f8b5e3ecf9be82085a7f6c1ef57e91a8bf05bfeb41e96708899b6c8d7f05eee06 diff --git a/net-analyzer/hydra/files/hydra-8.0-configure.patch b/net-analyzer/hydra/files/hydra-8.0-configure.patch deleted file mode 100644 index 3ab9989b6384..000000000000 --- a/net-analyzer/hydra/files/hydra-8.0-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/configure -+++ b/configure -@@ -66,8 +66,6 @@ - MYSQL_IPATH="" - AFP_PATH="" - AFP_IPATH="" --NCP_PATH="" --NCP_IPATH="" - SVN_PATH="" - SVN_IPATH="" - APR_IPATH="" -@@ -508,32 +506,6 @@ - fi - - echo "Checking for NCP (libncp.so / nwcalls.h) ..." --for i in $LIBDIRS ; do -- if [ "X" = "X$NCP_PATH" ]; then -- if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; then -- NCP_PATH="$i" -- fi -- fi -- if [ "X" = "X$NCP_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.` -- if [ -n "$TMP_LIB" ]; then -- NCP_PATH="$i" -- fi -- fi -- if [ "X" = "X$NCP_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.` -- if [ -n "$TMP_LIB" ]; then -- NCP_PATH="$i" -- fi -- fi --done --for i in $INCDIRS ; do -- if [ "X" != "X$NCP_PATH" ]; then -- if [ -f "$i/ncp/nwcalls.h" ]; then -- NCP_IPATH="$i" -- fi -- fi --done - if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then - echo " ... found" - fi diff --git a/net-analyzer/hydra/files/hydra-8.4-configure.patch b/net-analyzer/hydra/files/hydra-8.4-configure.patch deleted file mode 100644 index ba99ff2acda4..000000000000 --- a/net-analyzer/hydra/files/hydra-8.4-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure -+++ b/configure -@@ -46,8 +46,6 @@ - MYSQL_IPATH="" - AFP_PATH="" - AFP_IPATH="" --NCP_PATH="" --NCP_IPATH="" - SVN_PATH="" - SVN_IPATH="" - APR_IPATH="" -@@ -679,36 +677,6 @@ - fi - - echo "Checking for NCP (libncp.so / nwcalls.h) ..." --for i in $LIBDIRS ; do -- if [ "X" = "X$NCP_PATH" ]; then -- if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; then -- NCP_PATH="$i" -- fi -- fi -- if [ "X" = "X$NCP_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.` -- if [ -n "$TMP_LIB" ]; then -- NCP_PATH="$i" -- fi -- fi -- if [ "X" = "X$NCP_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.` -- if [ -n "$TMP_LIB" ]; then -- NCP_PATH="$i" -- fi -- fi --done --for i in $INCDIRS ; do -- if [ "X" != "X$NCP_PATH" ]; then -- if [ -f "$i/ncp/nwcalls.h" ]; then -- NCP_IPATH="$i" -- fi -- fi --done --if [ "X" != "X$DEBUG" ]; then -- echo DEBUG: NCP_PATH=$NCP_PATH/libncp -- echo DEBUG: NCP_IPATH=$NCP_IPATH/ncp/nwcalls.h --fi - if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then - echo " ... found" - fi diff --git a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch deleted file mode 100644 index 0055257b04a0..000000000000 --- a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/hydra-irc.c -+++ b/hydra-irc.c -@@ -7,7 +7,6 @@ RFC 1459: Internet Relay Chat Protocol - */ - - extern char *HYDRA_EXIT; --char *buf; - char buffer[300] = ""; - int32_t myport = PORT_IRC, mysslport = PORT_IRC_SSL; - ---- a/hydra-rexec.c -+++ b/hydra-rexec.c -@@ -5,7 +5,6 @@ - #define COMMAND "/bin/ls /" - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rexec(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rlogin.c -+++ b/hydra-rlogin.c -@@ -12,7 +12,6 @@ no memleaks found on 110425 - #define TERM "vt100/9600" - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rlogin(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rsh.c -+++ b/hydra-rsh.c -@@ -11,7 +11,6 @@ no memleaks found on 110425 - */ - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_rsh(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; ---- a/hydra-rtsp.c -+++ b/hydra-rtsp.c -@@ -12,7 +12,6 @@ - #include "sasl.h" - - extern char *HYDRA_EXIT; --char *buf; - char packet[500]; - char packet2[500]; - ---- a/hydra-teamspeak.c -+++ b/hydra-teamspeak.c -@@ -36,7 +36,6 @@ struct team_speak { - extern int32_t hydra_data_ready_timed(int32_t socket, long sec, long usec); - - extern char *HYDRA_EXIT; --char *buf; - - int32_t start_teamspeak(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) { - char *empty = ""; diff --git a/net-analyzer/hydra/files/hydra-9.0-vnc.patch b/net-analyzer/hydra/files/hydra-9.0-vnc.patch deleted file mode 100644 index 69c933ee8386..000000000000 --- a/net-analyzer/hydra/files/hydra-9.0-vnc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hydra-vnc.c -+++ b/hydra-vnc.c -@@ -75,7 +75,7 @@ int32_t start_vnc(int32_t s, char *ip, int32_t port, unsigned char options, char - //supported security type - switch (buf2[3]) { - case 0x0: -- hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf[3]); -+ hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf2[3]); - hydra_child_exit(0); - break; - case 0x1: diff --git a/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch b/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch new file mode 100644 index 000000000000..281e5b63c9ff --- /dev/null +++ b/net-analyzer/hydra/files/hydra-9.5-no-clobber-fortify-source.patch @@ -0,0 +1,14 @@ +Don't clobber toolchain defaults. + +https://bugs.gentoo.org/895530 +--- a/configure ++++ b/configure +@@ -1381,7 +1381,7 @@ fi + echo "Checking for secure compile option support in $CC ..." + GCCSEC="no" + LDSEC="no" +-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" ++GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4" + echo '#include <stdio.h>' > $TMPC.c + echo 'int main() { printf(""); return 0; }' >> $TMPC.c + $CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild deleted file mode 100644 index b1b7d80ab55a..000000000000 --- a/net-analyzer/hydra/hydra-8.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="http://www.thc.org/thc-hydra/" -SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion" - -RDEPEND=" - dev-libs/openssl - sys-libs/ncurses - firebird? ( dev-db/firebird ) - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - idn? ( net-dns/libidn ) - mysql? ( virtual/mysql ) - ncp? ( net-fs/ncpfs ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql ) - ssl? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - sed -i \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/^OPTS/{s|=|+=|;s| -O3||}' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die - - epatch "${FILESDIR}"/${PN}-8.0-configure.patch -} - -src_configure() { - export OPTS="${CFLAGS}" - - if ! use subversion; then - sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die - fi - - if ! use mysql; then - sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die - fi - - # Linking against libtinfo might be enough here but pkg-config --libs tinfo - # would require a USE=tinfo flag and recent linkers should drop libcurses - # as needed - sed -i \ - -e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \ - configure || die - - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - export NCP_PATH=$(usex ncp /usr/$(get_libdir) '') - export NCP_IPATH=$(usex ncp /usr/include '') - sh configure \ - --prefix=/usr \ - --nostrip \ - $(use gtk && echo --disable-xhydra) \ - || die - - if use gtk ; then - cd hydra-gtk && \ - econf - fi -} - -src_compile() { - tc-export CC - 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-8.9.1.ebuild b/net-analyzer/hydra/hydra-8.9.1.ebuild deleted file mode 100644 index 9ee22e48e676..000000000000 --- a/net-analyzer/hydra/hydra-8.9.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit 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="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-libs/ncurses:= - firebird? ( dev-db/firebird ) - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - idn? ( net-dns/libidn:0= ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - ssl? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-8.4-configure.patch -) -S=${WORKDIR}/thc-${P} - -src_prepare() { - default - - # None of the settings in Makefile.unix are useful to us - : > Makefile.unix - - 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() { - export OPTS="${CFLAGS}" - - if ! use subversion; then - sed -i 's/-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1//;s/-DLIBSVN//' configure || die - fi - - if ! use mysql; then - sed -i 's/-lmysqlclient//;s/-DLIBMYSQLCLIENT//' configure || die - fi - - # Linking against libtinfo might be enough here but pkg-config --libs tinfo - # would require a USE=tinfo flag and recent linkers should drop libcurses - # as needed - sed -i \ - -e 's|-lcurses|'"$( $(tc-getPKG_CONFIG) --libs ncurses)"'|g' \ - configure || die - - # Note: despite the naming convention, the top level script is not an - # autoconf-based script. - export NCP_PATH=$(usex ncp /usr/$(get_libdir) '') - export NCP_IPATH=$(usex ncp /usr/include '') - sh configure \ - --prefix=/usr \ - --nostrip \ - $(use gtk && echo --disable-xhydra) \ - || die - - if use gtk ; then - cd hydra-gtk && \ - econf - fi -} - -src_compile() { - tc-export CC - emake XLIBPATHS='' - use gtk && emake -C hydra-gtk -} - -src_install() { - dobin hydra pw-inspector - use gtk && dobin hydra-gtk/src/xhydra - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild deleted file mode 100644 index 3a35af9c7dba..000000000000 --- a/net-analyzer/hydra/hydra-9.0.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Parallelized network login hacker" -HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" - -RDEPEND=" - gtk? ( - dev-libs/atk - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - ) - firebird? ( dev-db/firebird ) - gcrypt? ( dev-libs/libgcrypt ) - idn? ( net-dns/libidn:0= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - memcached? ( dev-libs/libmemcached[sasl] ) - mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) - ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) - libssh? ( >=net-libs/libssh-0.4.0 ) - subversion? ( dev-vcs/subversion ) - zlib? ( sys-libs/zlib ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S=${WORKDIR}/thc-${P} - -src_prepare() { - default - - # None of the settings in Makefile.unix are useful to us - mv Makefile.unix{,.gentoo_unused} || die - touch Makefile.unix || die - - sed -i \ - -e 's:|| echo.*$::' \ - -e '/\t-$(CC)/s:-::' \ - -e '/^OPTS/{s|=|+=|;s| -O3||}' \ - -e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \ - Makefile.am || die -} - -src_configure() { - # Note: the top level configure script is not autoconf-based - tc-export CC PKG_CONFIG - - export OPTS="${CFLAGS}" - - hydra_sed() { - if use ${1}; then - einfo "Enabling ${1}" - if [[ -n "${3}" ]]; then - sed -i 's#'"${2}"'#'"${3}"'#' configure || die - fi - else - einfo "Disabling ${1}" - sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die - fi - } - - hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD' - hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT' - hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H' - hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH' - hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' - hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' - hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' - hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' - hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES' - hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE' - hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2' - # TODO: https://bugs.gentoo.org/686148 - #hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN' - hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN' - hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB' - - sh configure \ - $(use gtk || echo --disable-xhydra) \ - $(usex debug '--debug' '') \ - --nostrip \ - --prefix=/usr \ - || die - - if use gtk ; then - pushd hydra-gtk || die - econf - fi -} - -src_compile() { - emake XLIBPATHS='' - use gtk && emake -C hydra-gtk -} - -src_install() { - dobin hydra pw-inspector - use gtk && dobin hydra-gtk/src/xhydra - dodoc CHANGES README -} diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9.5-r1.ebuild index 3ff5496cc9b3..daca94b7c580 100644 --- a/net-analyzer/hydra/hydra-9999999.ebuild +++ b/net-analyzer/hydra/hydra-9.5-r1.ebuild @@ -1,50 +1,50 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic git-r3 toolchain-funcs +EAPI=8 + +inherit edo toolchain-funcs DESCRIPTION="Parallelized network login hacker" HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra" +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="" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" +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 + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) - idn? ( net-dns/libidn:0= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + idn? ( net-dns/libidn:= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) + mysql? ( dev-db/mysql-connector-c:= ) ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + pcre? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) + rdp? ( <net-misc/freerdp-3:0= ) libssh? ( >=net-libs/libssh-0.4.0 ) + samba? ( net-fs/samba ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-9.5-no-clobber-fortify-source.patch +) src_prepare() { default @@ -59,12 +59,17 @@ src_prepare() { -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 - append-cflags -fcommon export OPTS="${CFLAGS}" @@ -87,20 +92,20 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' + hydra_sed 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 )' '-DLIBFREERDP2' + 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' '') \ + edo ./configure \ + $(usev !gtk '--disable-xhydra') \ + $(usev debug '--debug') \ --nostrip \ --prefix=/usr \ || die @@ -119,5 +124,5 @@ src_compile() { src_install() { dobin hydra pw-inspector use gtk && dobin hydra-gtk/src/xhydra - dodoc CHANGES README.md + dodoc CHANGES README } diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.5-r10.ebuild index 402929ea2301..0960ae6bf060 100644 --- a/net-analyzer/hydra/hydra-9.0-r1.ebuild +++ b/net-analyzer/hydra/hydra-9.5-r10.ebuild @@ -1,55 +1,50 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic toolchain-funcs +EAPI=8 + +inherit edo toolchain-funcs DESCRIPTION="Parallelized network login hacker" HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra" SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/thc-${P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE=" - debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncp ncurses - oracle pcre postgres rdp libssh subversion zlib -" +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 + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) - idn? ( net-dns/libidn:0= ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + idn? ( net-dns/libidn:= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) - mysql? ( dev-db/mysql-connector-c:0= ) - ncp? ( net-fs/ncpfs ) + mysql? ( dev-db/mysql-connector-c:= ) ncurses? ( sys-libs/ncurses:= ) - oracle? ( dev-db/oracle-instantclient-basic ) - pcre? ( dev-libs/libpcre ) + oracle? ( dev-db/oracle-instantclient[sdk] ) + pcre? ( dev-libs/libpcre2 ) postgres? ( dev-db/postgresql:* ) - rdp? ( net-misc/freerdp ) + rdp? ( net-misc/freerdp:2= ) libssh? ( >=net-libs/libssh-0.4.0 ) + samba? ( net-fs/samba ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-9.0-unneeded-buf.patch - "${FILESDIR}"/${PN}-9.0-vnc.patch + "${FILESDIR}"/${PN}-9.5-no-clobber-fortify-source.patch ) -S=${WORKDIR}/thc-${P} src_prepare() { default @@ -64,14 +59,18 @@ src_prepare() { -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 - append-cflags -fcommon - export OPTS="${CFLAGS}" hydra_sed() { @@ -93,20 +92,20 @@ src_configure() { hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED' hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON' hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT' - hydra_sed ncp '-lncp' '' '-DLIBNCP' hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES' - hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE' + hydra_sed 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 )' '-DLIBFREERDP2' + 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' '') \ + edo ./configure \ + $(usev !gtk '--disable-xhydra') \ + $(usev debug '--debug') \ --nostrip \ --prefix=/usr \ || die diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml index 27f48a7d774b..2fea84bbc667 100644 --- a/net-analyzer/hydra/metadata.xml +++ b/net-analyzer/hydra/metadata.xml @@ -1,13 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<use> -<flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag> -<flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag> -<flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag> -<flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <use> + <flag name="gcrypt">Enable radmin2 support through <pkg>dev-libs/libgcrypt</pkg></flag> + <flag name="libssh">Enable SSH support through <pkg>net-libs/libssh</pkg></flag> + <flag name="mongodb">MongoDB support through <pkg>dev-libs/mongo-c-driver</pkg></flag> + </use> + <upstream> + <remote-id type="github">vanhauser-thc/thc-hydra</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild index d40390197c37..8c4bdc7bbd79 100644 --- a/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild +++ b/net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Interactive bandwidth monitor" -HOMEPAGE="http://ibmonitor.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://ibmonitor.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" +S="${WORKDIR}/${PN}" -KEYWORDS="~amd64 ~hppa ~ppc ~x86" -LICENSE="GPL-2" +KEYWORDS="~amd64 ~hppa ~ppc ~riscv x86" +LICENSE="GPL-2+" SLOT="0" RDEPEND="dev-perl/TermReadKey" -S=${WORKDIR}/${PN} src_install() { dobin ibmonitor diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild deleted file mode 100644 index 6e388ee87fa9..000000000000 --- a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Interactive bandwidth monitor" -HOMEPAGE="http://ibmonitor.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -KEYWORDS="~amd64 ~hppa ~ppc x86" -LICENSE="GPL-2" -SLOT="0" - -S="${WORKDIR}/${PN}" - -RDEPEND="dev-perl/TermReadKey" - -src_install() { - dobin ibmonitor - dodoc AUTHORS ChangeLog README TODO -} diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml index 2488b71436bd..d136821db8c5 100644 --- a/net-analyzer/ibmonitor/metadata.xml +++ b/net-analyzer/ibmonitor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest deleted file mode 100644 index 243329639dce..000000000000 --- a/net-analyzer/icinga-web/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8 SHA512 1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild deleted file mode 100644 index 39f00e240223..000000000000 --- a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit depend.apache eutils user multilib - -DESCRIPTION="Icinga Web - new Web Interface" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apache2 mysql pnp postgres" -DEPEND="dev-php/phing - dev-db/libdbi-drivers[mysql?,postgres?] - || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 ) - dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml] - pnp? ( net-analyzer/pnp4nagios )" -RDEPEND="${DEPEND}" - -want_apache2 - -pkg_setup() { - if use apache2 ; then - depend.apache_pkg_setup - fi - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_prepare() { - #removed checks for some php stuff since we have these things called use flags - sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac - sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in - autoreconf -} - -src_configure() { - local myconf - - myconf="--prefix=/usr/share/icinga/icinga-web - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --libexecdir=/usr/$(get_libdir)/icinga/plugins - --with-bin-user=icinga - --with-bin-group=nagios - --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd - --with-conf-dir=/etc/icinga-web - --with-log-dir=/var/log/icinga-web - --with-icinga-objects-dir=/etc/icinga/objects - --with-icinga-bin=/usr/sbin/icinga - --with-icinga-cfg=/etc/icinga/icinga.cfg" - - if use apache2 ; then - myconf+=" --with-web-user=apache - --with-web-group=apache - --with-web-apache-path=${APACHE_MODULES_CONFDIR}" - else - myconf+=" --with-web-user=root - --with-web-group=root" - fi - - if use postgres ; then - myconf+=" --with-db-type=pgsql - --with-db-port=5432 - --with-api-subtype=pgsql - --with-api-port=5432" - fi - - econf ${myconf} -} - -src_install() { - dodoc README - rm -f README - - emake -j1 DESTDIR="${D}" install - - emake DESTDIR="${D}" install-javascript - - if use apache2 ; then - dodir ${APACHE_MODULES_CONFDIR} - emake DESTDIR="${D}" install-apache-config - echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed" - echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf" - fi - - insinto /usr/share/icinga/icinga-web/contrib - doins -r etc/schema/* - - if use apache2 ; then - sed -i 's/%%USER%%/apache/g' etc/scheduler/icingaCron - else - sed -i 's/%%USER%%/root/g' etc/scheduler/icingaCron - fi - sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron - - dodir /usr/share/icinga/icinga-web/cron/ - cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF -# Force the shell to bash -SHELL=/bin/bash -#mail to root -MAILTO=root - -#runs every minute -* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log -EOF - - cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF -# Mail reports to root -!mailto(root) - -#runs every minute -@ 1 /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log -EOF - - if use apache2 ; then - diropts -o apache -g apache - else - diropts -o root -g root - fi - dodir /var/log/icinga-web - - if use apache2 ; then - fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat - else - fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat - fi - - if use pnp ; then - insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/ - doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml - doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml - fi -} - -pkg_config() { - einfo "press enter to install the icinga-web crontab" - einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron" - einfo - read - - if has_version sys-process/fcron; then - fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab - else - crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab - fi -} - -pkg_postinst() { - einfo - einfo "If this is a new install, you must create a new database for it, e.g. icinga_web." - einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/." - einfo - einfo "Additionally, you need to setup a database user." - einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE." - einfo - einfo "Example for a MySQL database:" - einfo " echo \"CREATE DATABASE icinga_web;\" | mysql" - einfo " echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql" - einfo " echo \"FLUSH PRIVILEGES;\" | mysql" - einfo - einfo " cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web" - einfo - - ewarn - ewarn "If you're upgrading from a previous release, you must upgrade your database schema." - ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/." - ewarn - ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between," - ewarn " be advised that you need to apply those upgrade files with incremental steps!" - ewarn - ewarn "Example to upgrade a MySQL database:" - ewarn " cat /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web" - ewarn - ewarn "Don't forget to clear the config cache." - ewarn " /usr/share/icinga/icinga-web/bin/clearcache.sh" - ewarn - - einfo - einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)." - einfo - - if use apache2 ; then - einfo - einfo "apache config was installed into" - einfo "/etc/apache2/modules.d/99_icinga-web.conf" - einfo - einfo "The apache config value for \'ServerTokens\' must be set to at" - einfo "least \'Min\'." - einfo - else - einfo - einfo "If you are not using apache you may need to change some" - einfo "permissions, so that your web server can access files and logs" - einfo - fi -} diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml deleted file mode 100644 index 224b578f16c1..000000000000 --- a/net-analyzer/icinga-web/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - <name>Matthew Thode</name> - </maintainer> - <longdescription lang="en"> - Icinga-web is a database backed web frontend to icinga. - </longdescription> - <use> - <flag name="pnp">Enables pnp4nagios integration</flag> - </use> - <upstream> - <remote-id type="sourceforge">icinga</remote-id> - <remote-id type="github">icinga/icinga-web</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest deleted file mode 100644 index ed876974bb6a..000000000000 --- a/net-analyzer/icinga/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST icinga-1.14.2.tar.gz 20779284 BLAKE2B ffc5ab7195faa64b01ae2f37385590405a5525b5ba0cb357bbdc24eb61c1590d25f299d706debb1af1026215dd3800c5133a5fe81cbce8708e0f7ee761a584e2 SHA512 9e993d9653497a5942ad6c3d1ef50b5da4153ba2c7a747aa094c2628f36b687033588b629ca21f8955c84fc6a15f7a7d8169f8b8677f36939bab76cc5e398e41 diff --git a/net-analyzer/icinga/files/icinga-apache.conf b/net-analyzer/icinga/files/icinga-apache.conf deleted file mode 100644 index 7c768b4eb317..000000000000 --- a/net-analyzer/icinga/files/icinga-apache.conf +++ /dev/null @@ -1,17 +0,0 @@ -<IfDefine ICINGA> - ScriptAlias /icinga/cgi-bin/ /usr/lib/icinga/cgi-bin/ - <Directory "/usr/lib/icinga/cgi-bin/"> - Options ExecCGI - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> - Alias /icinga /usr/share/icinga/htdocs - <Directory "/usr/share/icinga/htdocs"> - AuthName "Icinga Access" - AuthType Basic - AuthUserFile /etc/icinga/htpasswd.users - Require valid-user - </Directory> -</IfDefine> diff --git a/net-analyzer/icinga/files/icinga-conf.d b/net-analyzer/icinga/files/icinga-conf.d deleted file mode 100644 index da5b324b31b7..000000000000 --- a/net-analyzer/icinga/files/icinga-conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Distributed monitoring users will want to configure here the ip/hostname of the central server. -# It will be used by submit_check_result_via_nsca. -NAGIOS_NSCA_HOST="localhost" diff --git a/net-analyzer/icinga/files/icinga-init.d b/net-analyzer/icinga/files/icinga-init.d deleted file mode 100644 index 3a20f31c1940..000000000000 --- a/net-analyzer/icinga/files/icinga-init.d +++ /dev/null @@ -1,64 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${ICINGACFG:=/etc/icinga/icinga.cfg} - -extra_commands="checkconfig" -extra_started_commands="reload" - -command=/usr/sbin/icinga -command_args="-d ${ICINGACFG}" - -get_config() { - if [ -e "${ICINGACFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${ICINGACFG}" - fi -} - -pidfile=$(get_config lock_file) -start_stop_daemon_args="-e HOME=/var/lib/icinga" - -depend() { - need net - use dns logger firewall mysql postgresql -} - -checkconfig() { - # Silent Check - ${command} -v ${ICINGACFG} &>/dev/null && return 0 - # Now we know there's problem - run again and display errors - ${command} -v ${ICINGACFG} - eend $? "Configuration Error. Please fix your configfile" -} - -reload() -{ - checkconfig || return 1 - ebegin "Reloading configuration" - kill -HUP $(cat ${pidfile}) &>/dev/null - eend $? -} - -start_pre() { - checkpath -d -o icinga:icinga $(dirname $(get_config lock_file)) $(dirname $(get_config log_file)) $(dirname $(get_config status_file)) - checkpath -f -o icinga:icinga $(get_config log_file) - rm -f $(get_config command_file) - # Temp dir must NOT be group-writable - # grsec: denied untrusted exec (due to file in group-writable directory) - checkpath -d -o icinga:icinga -m 0750 $(get_config temp_path) -} - -stop_post() { - rm -f $(get_config command_file) - rm -r /tmp/icinga -} - -svc_restart() { - checkconfig || return 1 - ebegin "Restarting icinga" - svc_stop - svc_start - eend $? -} - diff --git a/net-analyzer/icinga/files/icinga-lighty.conf b/net-analyzer/icinga/files/icinga-lighty.conf deleted file mode 100644 index 678f2331e4ed..000000000000 --- a/net-analyzer/icinga/files/icinga-lighty.conf +++ /dev/null @@ -1,24 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_auth") -server.modules += ("mod_alias") - -auth.require += ( "/icinga" => - ( - "method" => "digest", - "realm" => "icinga", - "require" => "valid-user" - ) -) - -$HTTP["url"] =~ "^/icinga/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/icinga/cgi-bin" => "/usr/lib/icinga/cgi-bin", - "/icinga" => "/usr/share/icinga/htdocs" -) diff --git a/net-analyzer/icinga/files/ido2db-conf.d b/net-analyzer/icinga/files/ido2db-conf.d deleted file mode 100644 index 5429fa9a5268..000000000000 --- a/net-analyzer/icinga/files/ido2db-conf.d +++ /dev/null @@ -1 +0,0 @@ -IDO2DBCFG="/etc/icinga/ido2db.cfg" diff --git a/net-analyzer/icinga/files/ido2db-init.d b/net-analyzer/icinga/files/ido2db-init.d deleted file mode 100644 index 2b827fa87535..000000000000 --- a/net-analyzer/icinga/files/ido2db-init.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -get_config() { - if [ -e "${IDO2DBCFG}" ]; then - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' "${IDO2DBCFG}" - fi -} - -command=/usr/sbin/ido2db -command_args="-c ${IDO2DBCFG}" -pidfile="$(get_config lock_file)" - -depend() { - config "${IDO2DBCFG}" - - need net icinga - use dns logger firewall - - case $(get_config db_servertype) in - mysql) - use mysql ;; - pgsql) - use postgresql ;; - esac -} - -IDO2DBSOCKET="$(get_config socket_name)" - - -start_pre() { - if [ -S "${IDO2DBSOCKET}" ] ; then - ewarn "Strange, the socket file already exist in \"${IDO2DBSOCKET}\"" - ewarn "it will be removed now and re-created by ido2db" - ewarn "BUT please make your checks." - rm -f "${IDO2DBSOCKET}" - fi -} diff --git a/net-analyzer/icinga/icinga-1.14.2.ebuild b/net-analyzer/icinga/icinga-1.14.2.ebuild deleted file mode 100644 index 3bc81cee760c..000000000000 --- a/net-analyzer/icinga/icinga-1.14.2.ebuild +++ /dev/null @@ -1,265 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit depend.apache eutils multilib pax-utils toolchain-funcs user versionator - -DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils" -HOMEPAGE="http://www.icinga.org/" -SRC_URI="https://github.com/${PN}/${PN}-core/archive/v${PV}/${P}.tar.gz" -S="${WORKDIR}/${PN}-core-${PV}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="+apache2 contrib eventhandler +idoutils lighttpd +mysql perl +plugins postgres ssl +vim-syntax +web" -DEPEND="idoutils? ( dev-db/libdbi-drivers[mysql?,postgres?] ) - perl? ( dev-lang/perl:= ) - virtual/mailx - web? ( - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd ) - ) - !net-analyzer/nagios-core" -RDEPEND="${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) )" -RESTRICT="test" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" -} - -src_configure() { - local myconf - - myconf="$(use_enable perl embedded-perl) - $(use_with perl perlcache) - $(use_enable idoutils) - $(use_enable ssl) - --with-cgiurl=/icinga/cgi-bin - --with-log-dir=/var/log/icinga - --libdir=/usr/$(get_libdir) - --bindir=/usr/sbin - --sbindir=/usr/$(get_libdir)/icinga/cgi-bin - --datarootdir=/usr/share/icinga/htdocs - --localstatedir=/var/lib/icinga - --sysconfdir=/etc/icinga - --with-lockfile=/var/run/icinga/icinga.lock - --with-temp-dir=/tmp/icinga - --with-temp-file=/tmp/icinga/icinga.tmp" - - if use idoutils ; then - myconf+=" --with-ido2db-lockfile=/var/run/icinga/ido2db.lock - --with-icinga-chkfile=/var/lib/icinga/icinga.chk - --with-ido-sockfile=/var/lib/icinga/ido.sock - --with-idomod-tmpfile=/tmp/icinga/idomod.tmp" - fi - - if use eventhandler ; then - myconfig+=" --with-eventhandler-dir=/etc/icinga/eventhandlers" - fi - - if use plugins ; then - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - else - myconf+=" --with-plugin-dir=/usr/$(get_libdir)/nagios/plugins" - fi - - if use !apache2 && use !lighttpd ; then - myconf+=" --with-command-group=icinga" - else - if use apache2 ; then - myconf+=" --with-httpd-conf=/etc/apache2/conf.d" - myconf+=" --with-command-group=apache" - elif use lighttpd ; then - myconf+=" --with-command-group=lighttpd" - fi - fi - - econf ${myconf} -} - -src_compile() { - tc-export CC - - emake icinga - - if use web ; then - emake DESTDIR="${D}" cgis - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib - fi - - if use idoutils ; then - emake DESTDIR="${D}" idoutils - fi -} - -src_install() { - dodoc Changelog README UPGRADING - - if ! use web ; then - sed -i -e '/cd $(SRC_\(CGI\|HTM\))/d' Makefile - fi - - emake DESTDIR="${D}" install{,-config,-commandmode} - - if use idoutils ; then - emake DESTDIR="${D}" install-idoutils - fi - - if use contrib ; then - emake DESTDIR="${D}" -C contrib install - fi - - if use eventhandler ; then - emake DESTDIR="${D}" install-eventhandlers - fi - - newinitd "${FILESDIR}"/icinga-init.d icinga - newconfd "${FILESDIR}"/icinga-conf.d icinga - if use idoutils ; then - newinitd "${FILESDIR}"/ido2db-init.d ido2db - newconfd "${FILESDIR}"/ido2db-conf.d ido2db - insinto /usr/share/icinga/contrib/db - doins -r module/idoutils/db/* - fi - # Apache Module - if use web ; then - if use apache2 ; then - insinto "${APACHE_MODULES_CONFDIR}" - newins "${FILESDIR}"/icinga-apache.conf 99_icinga.conf - elif use lighttpd ; then - insinto /etc/lighttpd - newins "${FILESDIR}"/icinga-lighty.conf lighttpd_icinga.conf - else - ewarn "${CATEGORY}/${PF} only supports Apache-2.x or Lighttpd webserver" - ewarn "out-of-the-box. Since you are not using one of them, you" - ewarn "have to configure your webserver accordingly yourself." - fi - fowners -R root:root /usr/$(get_libdir)/icinga - cd "${D}" - find usr/$(get_libdir)/icinga -type d -exec fperms 755 {} + - find usr/$(get_libdir)/icinga/cgi-bin -type f -exec fperms 755 {} + - fi - - if use eventhandler ; then - dodir /etc/icinga/eventhandlers -# fowners icinga:icinga /etc/icinga/eventhandlers - fi - - keepdir /etc/icinga - keepdir /var/lib/icinga - keepdir /var/lib/icinga/archives - keepdir /var/lib/icinga/rw - keepdir /var/lib/icinga/spool/checkresults - - if use apache2 ; then - webserver=apache - elif use lighttpd ; then - webserver=lighttpd - else - webserver=icinga - fi - - fowners icinga:icinga /var/lib/icinga - fowners -R icinga:${webserver} /var/lib/icinga/rw - - fperms 6755 /var/lib/icinga/rw - - # ensure ownership - fowners -R root:root /etc/icinga - fperms 0750 /etc/icinga - fowners -R root:root /usr/sbin - fowners -R root:root /usr/$(get_libdir) - fowners -R root:root /usr/share/icinga/htdocs - - # paxmarks - if use idoutils ; then - pax-mark m usr/sbin/ido2db - fi -} - -pkg_postinst() { - if use web ; then - elog "This does not include cgis that are perl-dependent" - elog "Currently traceroute.cgi is perl-dependent" - elog "Note that the user your webserver is running as needs" - elog "read-access to /etc/icinga." - elog - if use apache2 || use lighttpd ; then - elog "There are several possible solutions to accomplish this," - elog "choose the one you are most comfortable with:" - elog - if use apache2 ; then - elog " usermod -G icinga apache" - elog "or" - elog " chown icinga:apache /etc/icinga" - elog - elog "Also edit /etc/conf.d/apache2 and add a line like" - elog "APACHE2_OPTS=\"\$APACHE2_OPTS -D ICINGA\"" - elog - elog "Icinga web service needs user authentication. If you" - elog "use the base configuration, you need a password file" - elog "with a password for user \"icingaadmin\"" - elog "You can create this file by executing:" - elog "htpasswd -c /etc/icinga/htpasswd.users icingaadmin" - elog - elog "you may want to also add apache to the icinga group" - elog "to allow it access to the AuthUserFile" - elog - elif use lighttpd ; then - elog " usermod -G icinga lighttpd " - elog "or" - elog " chown icinga:lighttpd /etc/icinga" - elog "Also edit /etc/lighttpd/lighttpd.conf and add 'include \"lighttpd_icinga.conf\"'" - fi - elog - elog "That will make icinga's web front end visable via" - elog "http://localhost/icinga/" - elog - else - elog "IMPORTANT: Do not forget to add the user your webserver" - elog "is running as to the icinga group!" - fi - else - ewarn "Please note that you have installed Icinga without web interface." - ewarn "Please don't file any bugs about having no web interface when you do this." - ewarn "Thank you!" - fi - elog - elog "If you want icinga to start at boot time" - elog "remember to execute:" - elog " rc-update add icinga default" - elog - elog "If your kernel has /proc protection, icinga" - elog "will not be happy as it relies on accessing the proc" - elog "filesystem. You can fix this by adding icinga into" - elog "the group wheel, but this is not recomended." - elog - if [ -d "${ROOT}"/var/icinga ] ; then - ewarn - ewarn "/var/icinga was moved to /var/lib/icinga" - ewarn "please move the files if this was an upgrade" - if use idoutils ; then - ewarn "and edit /etc/ido2db.cfg to change the location of the files" - ewarn "it accesses" - ewarn "update your db with the scripts under the directory" - ewarn "/usr/share/icinga/contrib/db/" - fi - ewarn - ewarn "The \"mv /var/icinga /var/lib/\" command works well to move the files" - ewarn "remove /var/icinga afterwards to make this warning disappear" - fi -} diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml deleted file mode 100644 index 958f95e0f18f..000000000000 --- a/net-analyzer/icinga/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription lang="en">A rebuild of nagios from the ground up</longdescription> - <use> - <flag name="contrib">additional scripts</flag> - <flag name="idoutils">Adds DB support</flag> - <flag name="lighttpd">Adds Lighttpd support</flag> - <flag name="plugins">Adds support for nagios plugins</flag> - <flag name="web">Adds generic web interface support</flag> - <flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag> - </use> - <maintainer type="person"> - <email>prometheanfire@gentoo.org</email> - </maintainer> - <upstream> - <remote-id type="github">icinga/icinga-core</remote-id> - <remote-id type="sourceforge">icinga</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 7b7205bdb686..5e6efce507f8 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,3 +1 @@ -DIST icinga2-2.10.5.tar.gz 5141193 BLAKE2B 7262e9f0ccb2180faba51b2e04b58964fe6c72782ab61488925c0f6528a80fc1f58afab5f3858f6f696fdca7c8d5546beb8fd374f7f72e452ffd7cd1f1e3ff4a SHA512 c43443d0bbb4ec997d3c5405ef3019ae3b09131bcce2e9d7c7b0e187768335a2f1347fdd382655f12a28b3a29ec8bf644c1b610ea5157f3ee40ae5e0e9253d38 -DIST icinga2-2.10.6.tar.gz 5148999 BLAKE2B a155ccb381947854dfd9115575680b7101dc8d01708c76c719d4e6306c5acdf0bf3394128a8937f7d8e03d97c18442ee1b576af28f98fb11e42055b8b4498cce SHA512 ab1440fdbb36217c5e50d8a254d0f1294e412325038fcc02496c606558ab33f4fafda93b1f439ab6e51e956aff6daddee005282b6d529c7e9d9d781af120834d -DIST icinga2-2.11.2.tar.gz 7476465 BLAKE2B b3c1ebd220dc21feffa998311d743b004c83e897fee758b1398897b5ec5772b7e27840ebe925cbfff89df333c25b366ca15c16fcedddb596fdd1e1236540fa16 SHA512 88bed284aae0196b964a9998c638066f54788474f91d9e21b0f262bf889b17d46ab0c143f9dc4bb976bfcc5785a1f0521c0bf16fa7e54a7af22fd1baae1a231d +DIST icinga2-2.14.2.tar.gz 9397382 BLAKE2B f533db06e693f9c9f0627c50615ded591696879b22fe9cb7bab115607d7f25ef3f30732de1e34f7adee594385c21ab2f22fdc925f4be18e8423fa69e94d3e1b9 SHA512 a7574254eed715c32317feaac57d5444a9d2bcccbfe06adbcee4d7d3c2928ecb1f381a5321c219406816bb39120eb9e95ca073399844cbafde274d289f619f57 diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd deleted file mode 100644 index 7faff11137d4..000000000000 --- a/net-analyzer/icinga2/files/icinga2.initd +++ /dev/null @@ -1,81 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -DAEMON="/usr/sbin/icinga2" -ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf" -ICINGA2_RUN_DIR="/run/icinga2" -ICINGA2_STATE_DIR="/var/cache/icinga2" -ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd" -ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid" -ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d" - -depend() { - need net -} - -checkconfig() { - if [ ! -e "$ICINGA2_CONFIG_FILE" ]; then - ewarn "Config file '$ICINGA2_CONFIG_FILE' does not exist." - eend 1 - fi - - ICINGA2_USER=$($DAEMON variable get --current RunAsUser) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsUser variable: '$ICINGA2_USER'." - return 1 - fi - ICINGA2_GROUP=$($DAEMON variable get --current RunAsGroup) - if [ $? != 0 ]; then - eerror "Could not fetch RunAsGroup variable: '$ICINGA2_GROUP'." - return 1 - fi - - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_RUN_DIR - checkpath -d -m 0750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_STATE_DIR - checkpath -d -m 2750 -o $ICINGA2_USER:$ICINGA2_GROUP $ICINGA2_CMD_DIR - - if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -C > $ICINGA2_STARTUP_LOG 2>&1; then - eerror "Icinga2 detected configuration errors. Check '$ICINGA2_STARTUP_LOG' for details." - return 1 - fi -} - -start() { - checkconfig || return 1 - - ebegin "Starting icinga2" - start-stop-daemon --start --exec "${DAEMON}" \ - --pidfile "${ICINGA2_PID_FILE}" \ - -- $ICINGA2_DAEMON_ARGS > $ICINGA2_STARTUP_LOG 2>&1 - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error starting icinga2. '$ICINGA2_STARTUP_LOG' for details." - fi - eend $retval -} - -stop() { - ebegin "Stopping icinga2" - start-stop-daemon \ - --stop \ - --pidfile $ICINGA2_PID_FILE \ - --retry "SIGTERM/15 SIGKILL/30" \ - --progress - eend $? -} - -reload() { - checkconfig || return 1 - - ebegin "Reloading icinga2" - start-stop-daemon --signal HUP --pidfile "$ICINGA2_PID_FILE" - - local retval=$? - if [ $retval -ne 0 ]; then - ewarn "Error reloading icinga2." - fi - eend $retval -} diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild deleted file mode 100644 index 5ca081b66606..000000000000 --- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" - KEYWORDS="" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.58-r1:= - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx )" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -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 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) - -DLOGROTATE_HAS_SU=ON - ) - # 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 ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql ; 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 mariadb ; then # same as mysql - 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}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild deleted file mode 100644 index 6c9a7ab3cdf3..000000000000 --- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.58-r1:= - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx )" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None - -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 - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) - -DLOGROTATE_HAS_SU=ON - ) - # 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 ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql ; 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 mariadb ; then # same as mysql - 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}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /var/log/icinga2 - - fperms ug+rwX,o-rwx /etc/icinga2 - fperms ug+rwX,o-rwx /var/lib/icinga2 - fperms ug+rwX,o-rwx /var/spool/icinga2 - fperms ug+rwX,o-rwx /var/log/icinga2 - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.14.2.ebuild index ec0fd092da51..1ce211b79dc7 100644 --- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild +++ b/net-analyzer/icinga2/icinga2-2.14.2.ebuild @@ -1,66 +1,54 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit cmake systemd + if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm64 x86" else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets + inherit git-r3 EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" fi DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" +HOMEPAGE="https://icinga.com/" LICENSE="GPL-2" SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" +IUSE="console jumbo-build mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66.0:=[context] +# 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" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - + dev-libs/yajl:= + acct-user/icinga + acct-group/icinga + acct-group/icingacmd" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex" RDEPEND=" - ${CDEPEND} + ${DEPEND} plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx )" + mail? ( virtual/mailx ) + acct-group/nagios" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None + -DICINGA2_UNITY_BUILD=$(usex jumbo-build) -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 @@ -68,9 +56,12 @@ src_configure() { -DICINGA2_USER=icinga -DICINGA2_GROUP=icingacmd -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) + -DICINGA2_RUNDIR=/run + -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON + -DUSE_SYSTEMD=$(usex systemd) -DLOGROTATE_HAS_SU=ON + # only appends -flto + -DICINGA2_LTO_BUILD=OFF ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then @@ -80,47 +71,26 @@ src_configure() { ) else mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF + -DICINGA2_WITH_PGSQL=$(usex postgres) + -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs + cmake_src_install newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - if use mysql ; 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 mariadb ; then # same as mysql + 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 + if use postgres; then docinto schema newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql docinto schema/upgrade @@ -133,14 +103,16 @@ src_install() { keepdir /var/lib/icinga2/api/log keepdir /var/spool/icinga2/perfdata - rm -r "${D}/var/run" || die "failed to remove /var/run" + rm -r "${D}/run" || die "failed to remove /run" rm -r "${D}/var/cache" || die "failed to remove /var/cache" - fowners root:icinga /etc/icinga2 + fowners -R icinga:icinga /etc/icinga2 fperms 0750 /etc/icinga2 fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 fowners -R icinga:icingacmd /var/lib/icinga2/api + fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests + fowners -R icinga:icingacmd /var/lib/icinga2/certs + fowners icinga:icinga /var/spool/icinga2 fowners icinga:icinga /var/spool/icinga2/perfdata fowners icinga:icingacmd /var/log/icinga2 @@ -162,8 +134,13 @@ src_install() { } pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" + if [[ "${PV}" != 9999 ]]; then + local v + for v in ${REPLACING_VERSIONS}; do + if ver_test "${PV}" -gt "${v}"; then + elog "DB IDO schema upgrade may be required." + elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" + fi + done fi } diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 92b7c65b3f1b..f2525a95a10b 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -1,66 +1,54 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit cmake + if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets + inherit git-r3 EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" fi DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" +HOMEPAGE="https://icinga.com/" LICENSE="GPL-2" SLOT="0" -IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" -WX_GTK_VER="3.0" +IUSE="console jumbo-build mail mariadb minimal +mysql +plugins postgres systemd" -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.66:=[context] +# 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" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - + dev-libs/yajl:= + acct-user/icinga + acct-group/icinga + acct-group/icingacmd" +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex" RDEPEND=" - ${CDEPEND} + ${DEPEND} plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) - mail? ( virtual/mailx )" + mail? ( virtual/mailx ) + acct-group/nagios" REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -DCMAKE_VERBOSE_MAKEFILE=ON - -DCMAKE_BUILD_TYPE=None + -DICINGA2_UNITY_BUILD=$(usex jumbo-build) -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 @@ -69,9 +57,11 @@ src_configure() { -DICINGA2_GROUP=icingacmd -DICINGA2_COMMAND_GROUP=icingacmd -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DUSE_SYSTEMD=$(usex systemd ON OFF) + -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON + -DUSE_SYSTEMD=$(usex systemd) -DLOGROTATE_HAS_SU=ON + # only appends -flto + -DICINGA2_LTO_BUILD=OFF ) # default to off if minimal, allow the flags to be set otherwise if use minimal; then @@ -81,47 +71,26 @@ src_configure() { ) else mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF + -DICINGA2_WITH_PGSQL=$(usex postgres) + -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs + cmake_src_install newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - if use mysql ; then + 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 mariadb ; then # same as mysql - 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 + if use postgres; then docinto schema newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql docinto schema/upgrade @@ -137,11 +106,13 @@ src_install() { rm -r "${D}/run" || die "failed to remove /run" rm -r "${D}/var/cache" || die "failed to remove /var/cache" - fowners root:icinga /etc/icinga2 + fowners -R icinga:icinga /etc/icinga2 fperms 0750 /etc/icinga2 fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 fowners -R icinga:icingacmd /var/lib/icinga2/api + fowners -R icinga:icingacmd /var/lib/icinga2/certificate-requests + fowners -R icinga:icingacmd /var/lib/icinga2/certs + fowners icinga:icinga /var/spool/icinga2 fowners icinga:icinga /var/spool/icinga2/perfdata fowners icinga:icingacmd /var/log/icinga2 @@ -150,21 +121,22 @@ src_install() { fperms ug+rwX,o-rwx /var/spool/icinga2 fperms ug+rwX,o-rwx /var/log/icinga2 - if use vim-syntax; then - insinto /usr/share/vim/vimfiles - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi + insinto /usr/share/vim/vimfiles + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect + doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi + insinto /usr/share/nano + doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc } pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" + 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/metadata.xml b/net-analyzer/icinga2/metadata.xml index 2916a6886755..7a4547f2335d 100644 --- a/net-analyzer/icinga2/metadata.xml +++ b/net-analyzer/icinga2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>prometheanfire@gentoo.org</email> @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="console">Adds support for line-editing in the console</flag> - <flag name="lto">Adds support for link time optimization</flag> + <flag name="jumbo-build">Combine source files to speed up build process, requires more memory</flag> <flag name="mail">Allows for mailing of alerts</flag> <flag name="mariadb">Enable support for the mariadb database backend</flag> <flag name="nano-syntax">Adds support for syntax used in the nano editor</flag> diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r3.ebuild index f5e962992ffb..df13f75e5942 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/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/ifmetric/metadata.xml +++ b/net-analyzer/ifmetric/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild index 42600860feb7..5682724e0c88 100644 --- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild +++ b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://gael.roualland.free.fr/ifstat/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 ~riscv sparc x86" IUSE="snmp" DEPEND="snmp? ( >=net-analyzer/net-snmp-5.0 )" diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml index eb3a67f58626..d5af4bcfaf13 100644 --- a/net-analyzer/ifstat/metadata.xml +++ b/net-analyzer/ifstat/metadata.xml @@ -1,15 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription> - ifstat is a utility to monitor network interface bandwidth usage, with - vmstat look and feel. - </longdescription> </pkgmetadata> diff --git a/net-analyzer/ifstatus/Manifest b/net-analyzer/ifstatus/Manifest index 699157aedea9..3d533a2aa938 100644 --- a/net-analyzer/ifstatus/Manifest +++ b/net-analyzer/ifstatus/Manifest @@ -1,2 +1 @@ -DIST ifstatus-v1.1.0.tar.gz 25233 BLAKE2B de9d088bf7001799c3a54775c0c63d5dcf4f1f3f4998ce02b82a11bea7a6dabb1263829ff42ba1cd05ebd6b202827196757727c24db022ffa7d06ece38db6616 SHA512 2660310be7186067315414218e3d3d269499e391c7ffa12022ac53a0456ddbe0f7d5562b788fe6b2569b7d0eba7acf5699e0386769a91606a3e14b51239a2766 DIST ifstatus-v2.0.0.tar.gz 24058 BLAKE2B 09a2b0af26cb05dfc24eefdbb6ac52b0ac289a687301f5fa67f0fcaf2622da96e149af3f7c08257e0ef8418f4f08b5ca1b77af71ba7c00dabddcb87cc95ddce7 SHA512 e1720f5dcc26788149cc72ccb72b85fffc72b367f2268e1e4f06a8fe4d80685146d310746c0b1a913e24995f6e93011d7d75ea5b4f9ca479af2d79264b89e27d diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch deleted file mode 100644 index 27111d7576f4..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc43.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Main.h -+++ b/Main.h -@@ -38,6 +38,7 @@ - #include <unistd.h> - #include <string.h> - #include <curses.h> -+#include <stdlib.h> - - #include <sys/time.h> - #include <sys/types.h> diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch deleted file mode 100644 index 760a09fbf2c6..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-gcc6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Interface.h -+++ b/Interface.h -@@ -57,7 +57,11 @@ - - InterfaceData & operator=(InterfaceData & rInterfaceData); - InterfaceData operator-(InterfaceData & rInterfaceData); - -+#if __cplusplus >= 201103L -+ InterfaceData & operator=(InterfaceData && rInterfaceData) = default; -+ InterfaceData(const InterfaceData&) = default; -+#endif - private: - - unsigned long long m_ullReceived[eTotalTypes]; diff --git a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch b/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch deleted file mode 100644 index e2c14e6add71..000000000000 --- a/net-analyzer/ifstatus/files/ifstatus-1.1.0-tinfo.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,7 @@ - # Makefile for IFStatus - # Gabriel Montenegro - --GCC = g++ --LDFLAGS = -lncurses --CFLAGS = -O2 -Wall -+LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses) - - BIN = ifstatus - OBJ = BorderDecorator.o\ -@@ -30,7 +28,7 @@ - all : ifstatus printdone - - ifstatus : $(OBJ) -- $(GCC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(LINK.cc) $^ $(LDLIBS) -o $@ - - printdone: - @if [ -e "./${BIN}" ]; then echo "Compiled.."; else echo "Error compiling!"; fi diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild deleted file mode 100644 index 10f512067d0b..000000000000 --- a/net-analyzer/ifstatus/ifstatus-1.1.0-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -KEYWORDS="amd64 arm ~ppc x86" - -DESCRIPTION="A simple CLI program for displaying network statistics in real time" -HOMEPAGE="http://ifstatus.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" - -RDEPEND=">=sys-libs/ncurses-4.2:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-gcc43.patch" - "${FILESDIR}/${P}-tinfo.patch" - "${FILESDIR}/${P}-gcc6.patch" -) - -src_prepare() { - default - tc-export CXX PKG_CONFIG -} - -src_install() { - dobin ifstatus - dodoc AUTHORS README -} - -pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." -} diff --git a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild index 7b2612d29fee..ff7c23bd9489 100644 --- a/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild +++ b/net-analyzer/ifstatus/ifstatus-2.0.0.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs -KEYWORDS="~amd64 ~arm ~ppc ~x86" +DESCRIPTION="Simple CLI program for displaying network statistics in real time" +HOMEPAGE="https://ifstatus.sourceforge.io/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-v${PV}.tar.gz" +S="${WORKDIR}/${PN}-v${PV}" -DESCRIPTION="A simple CLI program for displaying network statistics in real time" -HOMEPAGE="http://ifstatus.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" +KEYWORDS="amd64 arm ~ppc ~riscv x86" + +RDEPEND=">=sys-libs/ncurses-4.2:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -RDEPEND=" - >=sys-libs/ncurses-4.2:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" PATCHES=( "${FILESDIR}"/${PN}-2.0.0-tinfo.patch ) -S="${WORKDIR}/${PN}-v${PV}" src_compile() { tc-export CXX PKG_CONFIG - emake GCC=$(tc-getCXX) ${PN} + emake GCC="$(tc-getCXX)" ${PN} } src_install() { @@ -35,8 +33,8 @@ src_install() { } pkg_postinst() { - elog "You may want to configure ~/.ifstatus/ifstatus.cfg" - elog "before running ifstatus. For example, you may add" - elog "Interfaces = eth0 there. Read the README file for" - elog "more information." + elog "You may want to configure ~/.ifstatus/ifstatus.cfg" + elog "before running ifstatus. For example, you may add" + elog "Interfaces = eth0 there. Read the README file for" + elog "more information." } diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml index 2a57e972be89..c62cb0e806f6 100644 --- a/net-analyzer/ifstatus/metadata.xml +++ b/net-analyzer/ifstatus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/iftop/files/ax_pthread.m4 b/net-analyzer/iftop/files/ax_pthread.m4 deleted file mode 100644 index 6d400ed4e8e2..000000000000 --- a/net-analyzer/iftop/files/ax_pthread.m4 +++ /dev/null @@ -1,317 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> -# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG> -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 20 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) - AC_MSG_RESULT($ax_pthread_ok) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($ax_pthread_ok) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT($attr_name) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - ax_cv_PTHREAD_PRIO_INHERIT, [ - AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch new file mode 100644 index 000000000000..9c9892147df5 --- /dev/null +++ b/net-analyzer/iftop/files/iftop-1.0_pre4-allow-scales-beyond-1gbps.patch @@ -0,0 +1,43 @@ +https://code.blinkace.com/pdw/iftop/-/commit/77901c8c53e01359d83b8090aacfe62214658183 +https://bugs.gentoo.org/857837 + +From: Paul Warren <pdw@ex-parrot.com> +Date: Wed, 3 Oct 2018 18:02:36 +0100 +Subject: [PATCH] Support scales beyond 1Gbps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guido Jäkel <Guido.Jaekel@GMX.DE> +--- a/ui.c ++++ b/ui.c +@@ -71,7 +71,7 @@ int dontshowdisplay = 0; + + /* Barchart scales. */ + static struct { +- int max, interval; ++ long max; int interval; + } scale[] = { + { 64000, 10 }, /* 64 kbit/s */ + { 128000, 10 }, +@@ -79,7 +79,9 @@ static struct { + { 1000000, 10 }, /* 1 Mbit/s */ + { 10000000, 10 }, + { 100000000, 100 }, +- { 1000000000, 100 } /* 1 Gbit/s */ ++ { 1000000000, 100 }, /* 1 Gbit/s */ ++ {10000000000, 100 }, ++ {100000000000, 100 } + }; + static int rateidx = 0, wantbiggerrate; + +@@ -105,7 +107,7 @@ static float get_max_bandwidth() { + } + + /* rate in bits */ +-static int get_bar_length(const int rate) { ++static int get_bar_length(const long rate) { + float l; + if (rate <= 0) + return 0; +GitLab diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild deleted file mode 100644 index aeb8c0813eb7..000000000000 --- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="display bandwidth usage on an interface" -SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -S="${WORKDIR}"/${P/_/} - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-configure.ac.patch \ - "${FILESDIR}"/${P}-Makefile.am.patch \ - "${FILESDIR}"/${P}-tsent-set-but-not-used.patch - - # 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-r3.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild deleted file mode 100644 index aede14d946f8..000000000000 --- a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -DESCRIPTION="display bandwidth usage on an interface" -SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S="${WORKDIR}"/${P/_/} -PATCHES=( - "${FILESDIR}"/${P}-configure.ac.patch - "${FILESDIR}"/${P}-Makefile.am.patch - "${FILESDIR}"/${P}-tsent-set-but-not-used.patch - "${FILESDIR}"/${P}-ip6.arpa.patch -) - -src_prepare() { - default - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die - - eautoreconf -} - -src_install() { - dosbin iftop - doman iftop.8 - - dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc -} diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild index 3f9d11ed9b42..23bb00c63b89 100644 --- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild +++ b/net-analyzer/iftop/iftop-1.0_pre4-r5.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools -DESCRIPTION="display bandwidth usage on an interface" +DESCRIPTION="Display bandwidth usage on an interface" +HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/ https://code.blinkace.com/pdw/iftop" SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" +S="${WORKDIR}"/${P/_/} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" net-libs/libpcap - sys-libs/ncurses:0= + sys-libs/ncurses:= " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +# autoconf-archive for ax_pthread, bug #490168 +BDEPEND=" + dev-build/autoconf-archive virtual/pkgconfig " + PATCHES=( "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch @@ -27,13 +32,11 @@ PATCHES=( "${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch + "${FILESDIR}"/${PN}-1.0_pre4-allow-scales-beyond-1gbps.patch ) -S="${WORKDIR}"/${P/_/} src_prepare() { default - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die eautoreconf } diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild deleted file mode 100644 index f67befd3bc29..000000000000 --- a/net-analyzer/iftop/iftop-9999999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="display bandwidth usage on an interface" -HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/" -EGIT_REPO_URI="https://code.blinkace.com/pdw/iftop" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -S="${WORKDIR}"/${P/_/} -PATCHES=( - "${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch - "${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch - "${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch - "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch -) - -src_prepare() { - default - # bug 490168 - cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die - - eautoreconf -} - -src_install() { - dosbin iftop - doman iftop.8 - - dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc -} diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml index 789a44405524..211445353661 100644 --- a/net-analyzer/iftop/metadata.xml +++ b/net-analyzer/iftop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest index d046cffe8408..992eb7171b88 100644 --- a/net-analyzer/ike-scan/Manifest +++ b/net-analyzer/ike-scan/Manifest @@ -1 +1 @@ -DIST ike-scan-1.9.tar.gz 1412689 BLAKE2B 97a18ca35a80b66859e2ab99de916041eb9c9d869f96bbd799be88079b84022dcc2ecb5df2cecefff793192333da915957adc6b0c3d4bb376397941d4a731323 SHA512 c586ad4d485f04398c2800af5ced1392eee0f7f7d7d117602be45134a47442b38c4fa23fbbf137af5a37298b471a6bcdd6e94559dde695d06e96dd39f0681906 +DIST ike-scan-1.9.5.tar.gz 1542264 BLAKE2B 3095c2929c7f24da43852402a3e5cfe73dd65100773283ef08b791784be2e2f04bba24843469e407695a027e76e1e0aa18effabc210643414677a35df7f2614c SHA512 5eb98e41c639bc30996041f4e759a6ada7f4baa5b8102992ac2313ed8ff51032d877b116bc24972e0ecd652290849aa67a63523d92ee63af6577112350ee5590 diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch new file mode 100644 index 000000000000..c4aec2836ba0 --- /dev/null +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-clang-16.patch @@ -0,0 +1,92 @@ +https://github.com/royhills/ike-scan/pull/39 + +From 9949ce4bdf9f4bcb616b2a5d273708a7ea9ee93d Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 26 Sep 2022 05:22:18 +0100 +Subject: [PATCH 1/3] acinclude.m4: fix -Wimplicit-int errors (Clang 16+ + compat) + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -144,7 +144,7 @@ int does_int64_work() + return 0; + return 1; + } +-main() { ++int main() { + return ! does_int64_work(); + }], + [Ac_cachevar=yes], +@@ -200,7 +200,7 @@ int does_int64_snprintf_work() + return 0; /* either multiply or snprintf is busted */ + return 1; + } +-main() { ++int main() { + return ! does_int64_snprintf_work(); + }], + [pgac_cv_snprintf_long_long_int_format=$pgac_format; break], + +From 6a931ca559a937cb9f7917b9131ec1aca4919683 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Mon, 26 Sep 2022 05:23:06 +0100 +Subject: [PATCH 2/3] acinclude.m4: fix typo in 'x' if check + +Case doesn't matter but case does need to match on left & right +hand side, so just choose uppercase everywhere to match what +the rest of the file does. +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -278,7 +278,7 @@ dnl in <features.h>. We don't use __GNUC_PREREQ directly because <features.h> + dnl is not present on all the operating systems that we support, e.g. OpenBSD. + dnl + AC_DEFUN([GCC_FORTIFY_SOURCE],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -D_FORTIFY_SOURCE]) + AC_TRY_COMPILE(,[ + #define GNUC_PREREQ(maj, min) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +@@ -311,7 +311,7 @@ dnl If it is not supported, then the test program will compile without + dnl warnings. + dnl + AC_DEFUN([GCC_FORMAT_SECURITY],[ +- if test "x$CC" != "X"; then ++ if test "X$CC" != "X"; then + AC_MSG_CHECKING([whether ${CC} accepts -Wformat-security]) + wfs_old_cflags="$CFLAGS" + CFLAGS="$CFLAGS -Wall -Werror -Wformat -Wformat-security" + +From fbc40c7b117b523eceb9aa58d6086bde701f1299 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 1 Oct 2022 01:24:04 +0100 +Subject: [PATCH 3/3] configure.ac: Fix recognising -Wformat-security with + Clang + +Before: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +checking whether clang accepts -Wformat-security... no +``` + +After: +``` +checking whether clang accepts -fstack-protector... yes +checking whether clang accepts -Wformat-security... yes +checking whether clang accepts -D_FORTIFY_SOURCE... yes +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -34,8 +34,8 @@ if test -n "$GCC"; then + CFLAGS="$CFLAGS -Wall -Wshadow -Wwrite-strings" + GCC_WEXTRA + GCC_STACK_PROTECT_CC +- GCC_FORTIFY_SOURCE + GCC_FORMAT_SECURITY ++ GCC_FORTIFY_SOURCE + dnl Uncomment the lines below for testing with stricter warnings. + dnl CFLAGS="$CFLAGS -pedantic -Wpointer-arith -Wcast-qual -Wcast-align -Wconversion -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline " + dnl Uncomment the line below to check malloc/free with electric fence + diff --git a/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch new file mode 100644 index 000000000000..0ee12dc2f907 --- /dev/null +++ b/net-analyzer/ike-scan/files/ike-scan-1.9.5-openssl-libdir.patch @@ -0,0 +1,55 @@ +TODO: switch to pkgconfig +--- a/configure.ac ++++ b/configure.ac +@@ -187,49 +187,9 @@ AC_ARG_WITH(openssl, + [ + if test "x$withval" != "xno" ; then + AC_MSG_RESULT(yes) +- for ssldir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do +- if test -f "${ssldir}/include/openssl/ssl.h"; then +- found_openssl="yes" +- openssl_header_dir="${ssldir}/include" +- AC_MSG_NOTICE([Found ${ssldir}/include/openssl/ssl.h]) +- break +- fi +- if test -f "${ssldir}/openssl/ssl.h"; then +- found_openssl="yes" +- openssl_header_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/openssl/ssl.h]) +- break +- fi +- done +- if test x$found_openssl != xyes; then +- AC_MSG_ERROR([Cannot find OpenSSL header files]) +- else +- AC_MSG_NOTICE([OpenSSL header files found in $openssl_header_dir]) +- CPPFLAGS="-I${openssl_header_dir} ${CPPFLAGS}" +- fi +- if test -f "${ssldir}/lib/libcrypto.so"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.so]) +- elif test -f "${ssldir}/libcrypto.so"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.so]) +- elif test -f "${ssldir}/lib/libcrypto.dylib"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.dylib]) +- elif test -f "${ssldir}/libcrypto.dylib"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.dylib]) +- elif test -f "${ssldir}/lib/libcrypto.a"; then +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Found ${ssldir}/lib/libcrypto.a]) +- elif test -f "${ssldir}/libcrypto.a"; then +- openssl_lib_dir="${ssldir}" +- AC_MSG_NOTICE([Found ${ssldir}/libcrypto.a]) +- else +- openssl_lib_dir="${ssldir}/lib" +- AC_MSG_NOTICE([Cannot find libcrypto under $ssldir - assuming its in the standard search path]) +- fi + AC_MSG_NOTICE([OpenSSL libraries found in $openssl_lib_dir]) ++ openssl_header_dir="${withval}/include/openssl" ++ CPPFLAGS="${CPPFLAGS} -I${openssl_header_dir}" + LDFLAGS="-L${openssl_lib_dir} ${LDFLAGS}" + LIBS="-lcrypto ${LIBS}" + diff --git a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild index 8792715b52a2..da10ef3cd21b 100644 --- a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild +++ b/net-analyzer/ike-scan/ike-scan-1.9.5.ebuild @@ -1,34 +1,41 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + +inherit autotools DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers" -HOMEPAGE="http://www.nta-monitor.com/ike-scan/" -SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz" +HOMEPAGE="https://github.com/royhills/ike-scan" +SRC_URI="https://github.com/royhills/ike-scan/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -IUSE="libressl ssl" +IUSE="ssl" -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) -)" +DEPEND="ssl? ( dev-libs/openssl:= )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-1.9.5-clang-16.patch + "${FILESDIR}"/${PN}-1.9.5-openssl-libdir.patch +) + src_prepare() { + default + # Fix buffer overflow, bug #277556 sed \ -e "/MAXLINE/s:255:511:g" \ -i ike-scan.h || die + + eautoreconf } src_configure() { - # --disable-lookup prevents ike-scan from phoning home - # for more information, please see bug 157507 - econf $(use_with ssl openssl) --disable-lookup + 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 2c2a7923cfc8..7d61f5907a05 100644 --- a/net-analyzer/ike-scan/metadata.xml +++ b/net-analyzer/ike-scan/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <upstream> + <remote-id type="github">royhills/ike-scan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest index 1d5b03465bf8..403c37514f35 100644 --- a/net-analyzer/ipaudit/Manifest +++ b/net-analyzer/ipaudit/Manifest @@ -1 +1 @@ -DIST ipaudit-1.0BETA2.tar.gz 135680 BLAKE2B 2a8e7754251c743758d6e0d7008d904a3a237c26a660f5c07661c632dd75ecda6cf3b04253eb76f64c72ed278da00030cf64231bdc4760a6b04df1497f628ec2 SHA512 3a8890821c515aea95762eeb2cc7a649533ff739984c944bcb26acb72434e1f2b453a98365719fce9e062d6262b9d76ac389f149ad2a19361422783bc0b55e09 +DIST ipaudit-1.1.tar.gz 170253 BLAKE2B 6515cab817a35835d5c3eb33dc4d8c9f28a1ceb906854e55c3695fc6ee5d230ad2ae6a6fd59849623e161fe4deb5013f55bdf6effcaaf6ca4d064ded73c148f0 SHA512 5eb1971b454c8c96c02dc260e537a9a627554b7c9d1e269be9de2ffdb5cbfed00272b643de7b15865659cef0db482e4c460f96b1545bcd6c4f208c96d7401ef9 diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild deleted file mode 100644 index fba409faf3e3..000000000000 --- a/net-analyzer/ipaudit/ipaudit-1.0_beta2-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port" -HOMEPAGE="http://ipaudit.sourceforge.net/" -MY_P="${PN}-${PV/_beta/BETA}" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="mysql" -DEPEND="net-libs/libpcap - mysql? ( dev-db/mysql-connector-c:0= )" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_P}" - -DOCS=( AUTHORS README ) - -src_configure() { - econf $(use_with mysql) -} diff --git a/net-analyzer/ipaudit/ipaudit-1.1.ebuild b/net-analyzer/ipaudit/ipaudit-1.1.ebuild new file mode 100644 index 000000000000..89ed7c971926 --- /dev/null +++ b/net-analyzer/ipaudit/ipaudit-1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port" +HOMEPAGE="https://ipaudit.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="mysql" + +RDEPEND=" + net-libs/libpcap + sys-libs/zlib:= + mysql? ( dev-db/mysql-connector-c:= )" +DEPEND="${RDEPEND}" + +src_configure() { + econf $(use_with mysql) +} diff --git a/net-analyzer/ipaudit/metadata.xml b/net-analyzer/ipaudit/metadata.xml index 9b6b0277edf6..acfba63f9767 100644 --- a/net-analyzer/ipaudit/metadata.xml +++ b/net-analyzer/ipaudit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch new file mode 100644 index 000000000000..4a5fe78fcc49 --- /dev/null +++ b/net-analyzer/ipband/files/ipband-0.8.1-fno-common.patch @@ -0,0 +1,113 @@ +--- a/ipband.h ++++ b/ipband.h +@@ -174,40 +174,40 @@ + extern char pcap_version[]; + + /* Internal use */ +-int isig_m; /* Interupt flag for capture loop */ +-int preload_m; /* Subnets are preloaded flag */ +-char *pcapdev_m; /* Device to listen to */ +-pcap_t *pcapfile_m; /* Pcap input file descriptor */ +-int pcapoffset_m; /* IP header offset */ +-time_t started_m; /* Time when we started */ ++extern int isig_m; /* Interupt flag for capture loop */ ++extern int preload_m; /* Subnets are preloaded flag */ ++extern char *pcapdev_m; /* Device to listen to */ ++extern pcap_t *pcapfile_m; /* Pcap input file descriptor */ ++extern int pcapoffset_m; /* IP header offset */ ++extern time_t started_m; /* Time when we started */ + +-ll_srvc_t *ll_tcp_cache; /* Resolved tcp services cache */ +-ll_srvc_t *ll_udp_cache; /* Resolved udp services cache */ ++extern ll_srvc_t *ll_tcp_cache; /* Resolved tcp services cache */ ++extern ll_srvc_t *ll_udp_cache; /* Resolved udp services cache */ + + + /* Variables holding option values */ +-int debug_m; /* Debug option */ +-int do_html; /* Generate HTML output */ +-char *filtercmd_m; /* Pcap filter string */ +-char *repfname_m; /* Subnet report output file */ +-char *htmlfname_m; /* HTML report output file */ +-char *htmltitle_m; /* HTML Title */ +-int mask_m; /* Network aggregation mask bits */ +-int cycle_m; /* Number of sec to average data */ +-int rcycle_m; /* How long in sec bandwidth +- threshold may be exceeded */ +-float thresh_m; /* Bandwidth threshold in kBps */ +-int fork_m; /* Fork flag */ +-int top_m; /* No of top connections in report */ +-char *config_m; /* Config file name */ +-char *mailto_m; /* E-mail address for reporting */ +-char *mailfoot_m; /* Footer file for e-mail report */ +-char *mtastring_m; /* MTA command string */ +-int report_aggr_m; /* Flag to report aggr exceed time */ +-int promisc_m; /* Use promiscious mode? */ +-int *iplist_m; /* List of local networks */ +-int niplist_m; /* Number of local networks */ +-int lenadj_m; /* IP packet length adjustment in bytes */ ++extern int debug_m; /* Debug option */ ++extern int do_html; /* Generate HTML output */ ++extern char *filtercmd_m; /* Pcap filter string */ ++extern char *repfname_m; /* Subnet report output file */ ++extern char *htmlfname_m; /* HTML report output file */ ++extern char *htmltitle_m; /* HTML Title */ ++extern int mask_m; /* Network aggregation mask bits */ ++extern int cycle_m; /* Number of sec to average data */ ++extern int rcycle_m; /* How long in sec bandwidth ++ threshold may be exceeded */ ++extern float thresh_m; /* Bandwidth threshold in kBps */ ++extern int fork_m; /* Fork flag */ ++extern int top_m; /* No of top connections in report */ ++extern char *config_m; /* Config file name */ ++extern char *mailto_m; /* E-mail address for reporting */ ++extern char *mailfoot_m; /* Footer file for e-mail report */ ++extern char *mtastring_m; /* MTA command string */ ++extern int report_aggr_m; /* Flag to report aggr exceed time */ ++extern int promisc_m; /* Use promiscious mode? */ ++extern int *iplist_m; /* List of local networks */ ++extern int niplist_m; /* Number of local networks */ ++extern int lenadj_m; /* IP packet length adjustment in bytes */ + + + /* +--- a/main.c ++++ b/main.c +@@ -26,6 +26,37 @@ + + #include "ipband.h" + ++/* Internal use */ ++int isig_m; /* Interupt flag for capture loop */ ++int preload_m; /* Subnets are preloaded flag */ ++char *pcapdev_m; /* Device to listen to */ ++pcap_t *pcapfile_m; /* Pcap input file descriptor */ ++int pcapoffset_m; /* IP header offset */ ++time_t started_m; /* Time when we started */ ++ ++/* Variables holding option values */ ++int debug_m; /* Debug option */ ++int do_html; /* Generate HTML output */ ++char *filtercmd_m; /* Pcap filter string */ ++char *repfname_m; /* Subnet report output file */ ++char *htmlfname_m; /* HTML report output file */ ++char *htmltitle_m; /* HTML Title */ ++int mask_m; /* Network aggregation mask bits */ ++int cycle_m; /* Number of sec to average data */ ++int rcycle_m; /* How long in sec bandwidth ++ threshold may be exceeded */ ++float thresh_m; /* Bandwidth threshold in kBps */ ++int fork_m; /* Fork flag */ ++int top_m; /* No of top connections in report */ ++char *config_m; /* Config file name */ ++char *mailto_m; /* E-mail address for reporting */ ++char *mailfoot_m; /* Footer file for e-mail report */ ++char *mtastring_m; /* MTA command string */ ++int report_aggr_m; /* Flag to report aggr exceed time */ ++int promisc_m; /* Use promiscious mode? */ ++int *iplist_m; /* List of local networks */ ++int niplist_m; /* Number of local networks */ ++int lenadj_m; /* IP packet length adjustment in bytes */ + + /* Initialize here and not in set_defaults() in case the latter called + _after_ the structures are created */ diff --git a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild deleted file mode 100644 index 1e0feff597c1..000000000000 --- a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="A pcap based IP traffic and bandwidth monitor with configurable reporting and alarm abilities" -HOMEPAGE="http://ipband.sourceforge.net/" -SRC_URI="http://ipband.sourceforge.net/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" - -DEPEND=">=net-libs/libpcap-0.4" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-postfix.patch - - tc-export CC -} - -src_install() { - dobin ipband - doman ipband.8 - dodoc CHANGELOG README - - newinitd "${FILESDIR}"/ipband-init ipband - - insinto /etc/ - newins ipband.sample.conf ipband.conf -} diff --git a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild index 6d65e278291e..009254fd9076 100644 --- a/net-analyzer/ipband/ipband-0.8.1-r2.ebuild +++ b/net-analyzer/ipband/ipband-0.8.1-r2.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs -DESCRIPTION="A pcap based IP traffic and bandwidth monitor" -HOMEPAGE="http://ipband.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" +DESCRIPTION="Pcap based IP traffic and bandwidth monitor" +HOMEPAGE="https://ipband.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" DEPEND=" >=net-libs/libpcap-0.4 @@ -21,6 +22,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-postfix.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_configure() { diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml index 1a6bed5f2dea..849a3380246b 100644 --- a/net-analyzer/ipband/metadata.xml +++ b/net-analyzer/ipband/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild index e9723ab496af..9cc3e9072ec4 100644 --- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild +++ b/net-analyzer/ipcad/ipcad-3.7.3.ebuild @@ -1,12 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=8 + +inherit autotools DESCRIPTION="IP Cisco Accounting Daemon" HOMEPAGE="https://sourceforge.net/projects/ipcad/ http://lionet.info/ipcad/" -SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/ipcad/${P}.tar.gz" LICENSE="BSD-2 GPL-2" SLOT="0" @@ -18,11 +19,14 @@ RDEPEND=" " DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch + "${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch + "${FILESDIR}"/${P}-signal_h.patch +) + src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-3.7-linux-2.6.27.patch \ - "${FILESDIR}"/${PN}-3.7-linux-2.6.35.patch \ - "${FILESDIR}"/${P}-signal_h.patch + default sed -i \ -e "s|^chroot = /adm/tmp;|chroot = /var/ipcad;|" \ diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml index 007abc824220..6098397dd05a 100644 --- a/net-analyzer/ipcad/metadata.xml +++ b/net-analyzer/ipcad/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>IP Cisco Accounting Daemon</longdescription> <upstream> <remote-id type="sourceforge">ipcad</remote-id> </upstream> diff --git a/net-analyzer/ipgen/ipgen-9999.ebuild b/net-analyzer/ipgen/ipgen-9999.ebuild index 9b3058c197fa..da5631d5332b 100644 --- a/net-analyzer/ipgen/ipgen-9999.ebuild +++ b/net-analyzer/ipgen/ipgen-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit autotools git-r3 DESCRIPTION="Generate list of IP addresses from a network specification" -HOMEPAGE="http://www.nta-monitor.com/tools-resources/security-tools/ipgen https://github.com/royhills/ipgen" +HOMEPAGE="https://github.com/royhills/ipgen" EGIT_REPO_URI="https://github.com/royhills/ipgen" LICENSE="GPL-3" @@ -13,5 +13,6 @@ SLOT="0" KEYWORDS="" src_prepare() { + default eautoreconf } diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml index 2f99ecc465ec..3e3ad912eda9 100644 --- a/net-analyzer/ipgen/metadata.xml +++ b/net-analyzer/ipgen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild index 73efd0b68720..0b9d630790e5 100644 --- a/net-analyzer/ipguard/ipguard-1.04-r1.ebuild +++ b/net-analyzer/ipguard/ipguard-1.04-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Tool designed to protect LAN IP adress space by ARP spoofing" @@ -16,9 +17,9 @@ DEPEND=" net-libs/libnet:1.1 net-libs/libpcap " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-gentoo.patch "${FILESDIR}"/${P}-init.d.patch @@ -28,16 +29,16 @@ PATCHES=( src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \ - PREFIX=\"${EPREFIX:-/usr}\" + PREFIX=\""${EPREFIX:-/usr}"\" } src_install() { emake \ DESTDIR="${D}" \ LIBNET_CONFIG="$(tc-getPKG_CONFIG) libnet" \ - PREFIX=\"${EPREFIX:-/usr}\" \ + PREFIX=\""${EPREFIX:-/usr}"\" \ install newinitd doc/${PN}.gentoo ${PN} diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ipguard/metadata.xml +++ b/net-analyzer/ipguard/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild deleted file mode 100644 index a21f01029226..000000000000 --- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="iplog is a TCP/IP traffic logger" -HOMEPAGE="http://ojnk.sourceforge.net/" -SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz" - -LICENSE="|| ( GPL-2 FDL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~mips ppc sparc x86" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch -} - -src_compile() { - emake CFLAGS="${CFLAGS} -D_REENTRANT" all -} - -src_install() { - emake \ - prefix="${D}"/usr \ - mandir="${D}"/usr/share/man \ - install - - dodoc AUTHORS NEWS README TODO example-iplog.conf - - newinitd "${FILESDIR}"/iplog.rc6 iplog -} diff --git a/net-analyzer/iplog/iplog-2.2.3-r3.ebuild b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild new file mode 100644 index 000000000000..9e30fda919b0 --- /dev/null +++ b/net-analyzer/iplog/iplog-2.2.3-r3.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="TCP/IP traffic logger" +HOMEPAGE="https://ojnk.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/ojnk/${P}.tar.gz" + +LICENSE="|| ( GPL-2 FDL-1.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc sparc x86" + +DEPEND="net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${PV}-DLT_LINUX_SSL.patch ) + +DOCS=( AUTHORS NEWS README TODO example-iplog.conf ) + +src_compile() { + append-cppflags -D_REENTRANT + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" all +} + +src_install() { + default + newinitd "${FILESDIR}"/iplog.rc6 iplog +} diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml index 8d4f6dcb5209..a99d7f577e44 100644 --- a/net-analyzer/iplog/metadata.xml +++ b/net-analyzer/iplog/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>iplog is a TCP/IP traffic logger</longdescription> <upstream> <remote-id type="sourceforge">ojnk</remote-id> </upstream> diff --git a/net-analyzer/ippl/ippl-1.4.14-r6.ebuild b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild index 1cddf3d999fa..a764e3b53a63 100644 --- a/net-analyzer/ippl/ippl-1.4.14-r6.ebuild +++ b/net-analyzer/ippl/ippl-1.4.14-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,8 +14,8 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" BDEPEND=" - virtual/yacc - sys-devel/flex" + app-alternatives/yacc + app-alternatives/lex" RDEPEND="acct-user/ippl" PATCHES=( diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ippl/metadata.xml +++ b/net-analyzer/ippl/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipsumdump/Manifest b/net-analyzer/ipsumdump/Manifest index 5b57fb55a84e..902e8a47818b 100644 --- a/net-analyzer/ipsumdump/Manifest +++ b/net-analyzer/ipsumdump/Manifest @@ -1,2 +1 @@ -DIST ipsumdump-1.85.tar.gz 919540 BLAKE2B 870e003f4d9149904e6a411ae89b6df3e6f90e378b300dea823701e5f168d7f7b2c788702c3ca9c5840dbbe4372e30435e6fab79fd975328ddc474bc3e797559 SHA512 b42844cf028b9c1ea9da90306be8d731bffcec1a8f5c9eeb8029f563ddd5781651c583913a2105d8ad99cabac4b003345e1e8fdfb83367cabf806de1bca31596 DIST ipsumdump-1.86.tar.gz 895567 BLAKE2B 5d33e2c6a5df836592028fb1026749561188b3e0cc15fe691404ad17bc1dd724f4fd9e1be46bbe76b200288575251178f874df4f8697b0e943de4185b71f9e69 SHA512 38bf55589ab81eb7601283410a9f962508e419c1a0ef24f088a2d1328b29e360a9788a20689ea45724fbc56194ecb5ede1f3b792e5bc7e97a500a7b2e434fe65 diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild deleted file mode 100644 index 371b03c67b61..000000000000 --- a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" - -LICENSE="the-Click-license" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ipv6 +nanotimestamp" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND} - dev-lang/perl - dev-libs/expat - sys-apps/texinfo" - -src_configure() { - econf $(use_enable ipv6 ip6) \ - $(use_enable nanotimestamp) -} diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild index 8b367ee4b4b7..6db10e8c8170 100644 --- a/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild +++ b/net-analyzer/ipsumdump/ipsumdump-1.86-r1.ebuild @@ -1,37 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" +HOMEPAGE="https://read.seas.harvard.edu/~kohler/ipsumdump/" +SRC_URI="https://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" LICENSE="the-Click-license" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="+ipv6 +nanotimestamp" +BDEPEND=" + dev-lang/perl + sys-apps/texinfo +" RDEPEND=" net-libs/libpcap " DEPEND=" ${RDEPEND} - dev-lang/perl dev-libs/expat - sys-apps/texinfo virtual/os-headers " -DOCS=( - NEWS.md - README.md -) + +DOCS=( NEWS.md README.md ) + PATCHES=( "${FILESDIR}"/${PN}-1.86-SIOCGSTAMP.patch ) src_configure() { econf \ + --cache-file="${S}"/config.cache \ $(use_enable ipv6 ip6) \ $(use_enable nanotimestamp) } diff --git a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild deleted file mode 100644 index 51f75d48e429..000000000000 --- a/net-analyzer/ipsumdump/ipsumdump-1.86.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Simple TCP/IP Dump summarizer/analyzer" -HOMEPAGE="http://read.seas.harvard.edu/~kohler/ipsumdump/" -SRC_URI="http://read.seas.harvard.edu/~kohler/ipsumdump/${P}.tar.gz" - -LICENSE="the-Click-license" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+ipv6 +nanotimestamp" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - dev-lang/perl - dev-libs/expat - sys-apps/texinfo - virtual/os-headers -" -DOCS=( - NEWS.md - README.md -) - -src_configure() { - econf \ - $(use_enable ipv6 ip6) \ - $(use_enable nanotimestamp) -} diff --git a/net-analyzer/ipsumdump/metadata.xml b/net-analyzer/ipsumdump/metadata.xml index 670b2921b9ff..89968ad31c0f 100644 --- a/net-analyzer/ipsumdump/metadata.xml +++ b/net-analyzer/ipsumdump/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> +<maintainer type="project"> <email>netmon@gentoo.org</email> </maintainer> <use> diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index 87ca62b426e7..148254cc234d 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -1,2 +1 @@ -DIST iptraf-ng-1.1.4-github.tar.gz 556843 BLAKE2B 6f4e2bd8c4cf271d90732810f0ba6ab146b3471b723e657c180cf95ce8e1361d18c6803d5da56e872b0e49234956304fe1ff5532fde1332bc30a51a77ef8bdc0 SHA512 675165e08f979daf70fdbd0bd7ae24803860a182f3f1f6e6905f79f65b283470eedcc7e2f8608006c92af258cfad49c0b571652d843107cc79ad8eda63d4e5cb -DIST iptraf-ng-1.1.4.tar.gz 583306 BLAKE2B c06fdc25838901fc5528057ade5ebe28b5679a6a545f461cef2a5f4d3cbc1346a7ab3e94f4fe317a1760067e480c3c622df1027591d978b0ac1236ba9203e9da SHA512 8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 +DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384 diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch deleted file mode 100644 index 6bad736e2e44..000000000000 --- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/ipfilter.c -+++ b/src/ipfilter.c -@@ -146,7 +146,7 @@ - snprintf(msgstr, 60, - "Invalid protocol input at or near token \"%s\"", - bptr); -- tui_error(ANYKEY_MSG, msgstr); -+ tui_error(ANYKEY_MSG, "%s", msgstr); - doagain = 1; - } else - doagain = 0; diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch deleted file mode 100644 index 96f252895cb2..000000000000 --- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/othptab.c -+++ b/src/othptab.c -@@ -410,7 +410,7 @@ - break; - } - -- sprintf(scratchpad, rarp_mac_addr); -+ sprintf(scratchpad, "%s", rarp_mac_addr); - strcat(msgstring, scratchpad); - wattrset(table->othpwin, ARPATTR); - break; -@@ -485,7 +485,7 @@ - wattrset(table->othpwin, UNKNIPATTR); - protptr = getprotobynumber(entry->protocol); - if (protptr != NULL) { -- sprintf(protname, protptr->p_aliases[0]); -+ sprintf(protname, "%s", protptr->p_aliases[0]); - } else { - sprintf(protname, "IP protocol"); - unknown = 1; diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch deleted file mode 100644 index 8e01989fe6fe..000000000000 --- a/net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/tcptable.c -+++ b/src/tcptable.c -@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf, - size_t bufsize) - { - time_t interval = time(NULL) - entry->conn_starttime; -+ if (interval < 1) -+ interval = 1; - - char rbuf[64]; - rate_print(entry->bcount / interval, rbuf, sizeof(rbuf)); diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild deleted file mode 100644 index a2c8b3a67b0f..000000000000 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="A console-based network monitoring utility" -HOMEPAGE="http://fedorahosted.org/iptraf-ng/" -SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2 doc? ( FDL-1.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="doc" - -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r7:0= -" -DEPEND=" - ${RDEPEND} - virtual/os-headers - !net-analyzer/iptraf -" - -src_prepare() { - sed -i \ - -e '/^CC =/d' \ - -e '/^CFLAGS/s:= -g -O2:+= :' \ - -e '/^LDFLAGS =/d' \ - -e 's|$(QUIET_[[:alpha:]]*)||g' \ - Makefile || die - sed -i \ - -e 's|IPTRAF|&-NG|g' \ - -e 's|IPTraf|&-NG|g' \ - -e 's|iptraf|&-ng|g' \ - -e 's|rvnamed|&-ng|g' \ - -e 's|RVNAMED|&-NG|g' \ - src/*.8 || die - - epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch -} - -# configure does not do very much we do not already control -src_configure() { :; } - -src_compile() { - tc-export CC - CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"' - default -} - -src_install() { - dosbin {iptraf,rvnamed}-ng - - doman src/*.8 - dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES - use doc && dohtml -a gif,html,png -r Documentation/* - - keepdir /var/{lib,log}/iptraf-ng #376157 -} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild deleted file mode 100644 index 1cb32750a719..000000000000 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="A console-based network monitoring utility" -HOMEPAGE="http://fedorahosted.org/iptraf-ng/" -SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2 doc? ( FDL-1.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="doc" - -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r7:0= -" -DEPEND=" - ${RDEPEND} - virtual/os-headers - !net-analyzer/iptraf -" - -src_prepare() { - sed -i \ - -e '/^CC =/d' \ - -e '/^CFLAGS/s:= -g -O2:+= :' \ - -e '/^LDFLAGS =/d' \ - -e 's|$(QUIET_[[:alpha:]]*)||g' \ - Makefile || die - sed -i \ - -e 's|IPTRAF|&-NG|g' \ - -e 's|IPTraf|&-NG|g' \ - -e 's|iptraf|&-ng|g' \ - -e 's|rvnamed|&-ng|g' \ - -e 's|RVNAMED|&-NG|g' \ - src/*.8 || die - - epatch "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch - epatch "${FILESDIR}"/${P}-printf-format.patch - epatch "${FILESDIR}"/${P}-sprintf-format.patch -} - -# configure does not do very much we do not already control -src_configure() { :; } - -src_compile() { - tc-export CC - CFLAGS+=' -DLOCKDIR=\"/run/lock/iptraf-ng\"' - default -} - -src_install() { - dosbin {iptraf,rvnamed}-ng - - doman src/*.8 - dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES - use doc && dohtml -a gif,html,png -r Documentation/* - - keepdir /var/{lib,log}/iptraf-ng #376157 -} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild index 12ba38d3c69a..bb3fab832e02 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="A console-based network monitoring utility" -HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng/" -SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}-github.tar.gz" +HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng" +SRC_URI="https://github.com/iptraf-ng/iptraf-ng/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="doc" RDEPEND=" @@ -21,11 +21,6 @@ DEPEND=" virtual/os-headers !net-analyzer/iptraf " -PATCHES=( - "${FILESDIR}"/${P}-printf-format.patch - "${FILESDIR}"/${P}-sprintf-format.patch - "${FILESDIR}"/${P}-tcplog_flowrate_msg.patch -) RESTRICT="test" src_prepare() { @@ -39,8 +34,6 @@ src_prepare() { -e 's|IPTRAF|&-NG|g' \ -e 's|IPTraf|&-NG|g' \ -e 's|iptraf|&-ng|g' \ - -e 's|rvnamed|&-ng|g' \ - -e 's|RVNAMED|&-NG|g' \ src/*.8 || die default @@ -53,10 +46,10 @@ src_configure() { } src_install() { - dosbin {iptraf,rvnamed}-ng + dosbin ${PN} doman src/*.8 - dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES + dodoc AUTHORS CHANGES* FAQ README* if use doc; then docinto html diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild index 4c2ce0db62b9..486e56efca50 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,6 +7,7 @@ inherit flag-o-matic git-r3 toolchain-funcs DESCRIPTION="A console-based network monitoring utility" HOMEPAGE="https://github.com/iptraf-ng/iptraf-ng" EGIT_REPO_URI="https://github.com/iptraf-ng/iptraf-ng" +EGIT_BRANCH="dev" LICENSE="GPL-2 doc? ( FDL-1.1 )" SLOT="0" @@ -34,8 +35,6 @@ src_prepare() { -e 's|IPTRAF|&-NG|g' \ -e 's|IPTraf|&-NG|g' \ -e 's|iptraf|&-ng|g' \ - -e 's|rvnamed|&-ng|g' \ - -e 's|RVNAMED|&-NG|g' \ src/*.8 || die default @@ -48,10 +47,10 @@ src_configure() { } src_install() { - dosbin {iptraf,rvnamed}-ng + dosbin ${PN} doman src/*.8 - dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES + dodoc AUTHORS CHANGES* FAQ README* if use doc; then docinto html diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml index 68c7fc650126..8137ba4f4c5d 100644 --- a/net-analyzer/iptraf-ng/metadata.xml +++ b/net-analyzer/iptraf-ng/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription> - Interactive Colorful IP LAN Monitor, an active fork of iptraf -</longdescription> +<upstream> + <remote-id type="github">iptraf-ng/iptraf-ng</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest index 459a928a8812..5414199ac370 100644 --- a/net-analyzer/iptstate/Manifest +++ b/net-analyzer/iptstate/Manifest @@ -1,2 +1 @@ -DIST iptstate-2.2.5.tar.bz2 28270 BLAKE2B dd9369462b689a2e4fe7059666d384c34a265f03c7f6133d1f27e61eea7f8db4d3e96633b1b273584b6097c452da502d88b417d4fe23f83f494c767e377799e4 SHA512 044bbcf96225cc52b82428792d685d19f964520f7f20a9d3fa7e53430c1f552c0f09338a5d347b08e2500206cd7634a6b4a3acffbfd9e59e4657afb6df461795 -DIST iptstate-2.2.6.tar.bz2 28700 BLAKE2B 66e18425a4fed423a5a03c8f9ecbc87f4553a64475ab77144f3f37969eb6a399d52d7166bb68d9c9e80753163b841c71b42bfc13796e4a9d2c23db084740f3f5 SHA512 411b357aced384c52caac17b23f3c6bd631ff34d41b6000b90ff6dfc3cf20e36e46416d3691ac699b06f16d6042a42681b42a5d3594ce287aa6cf3b3b637c999 +DIST iptstate-2.2.7.tar.bz2 29994 BLAKE2B 0be657d4452b40b1835279bfa141b94e3db7adeeba141dede8456c64e4847efbb23197afab7e2452c9ad84c1be5eaffa1d9f7da15a5aaeb0c6fb28c1d62d6733 SHA512 43e258639e0f728d4a393d2dd7a834a6df1131da5291559a504800a0918dad3e010baaeb1bca66cb9a62bad6955f678be3302aac916fc956a525cdd7e9d0690a diff --git a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch b/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch deleted file mode 100644 index fdaeeb7867b2..000000000000 --- a/net-analyzer/iptstate/files/iptstate-2.2.5-gentoo.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -17,12 +17,11 @@ - ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS - - CXX?= g++ --CXXFLAGS?= -g -Wall -O2 -+CXXFLAGS+= -Wall - CXXFILES?= iptstate.cc - - # THIS IS FOR NORMAL COMPILATION --LIBS?= -lncurses -lnetfilter_conntrack --CPPFLAGS= -+LIBS= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) - - ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS - -@@ -45,7 +44,7 @@ - echo "+------------------------------------------------------------+" ;\ - echo ""; - -- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS) -+ $(CXX) $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(CXXFILES) -o iptstate $(LIBS) - @touch iptstate - - @\ diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch new file mode 100644 index 000000000000..6b658eac80bb --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-CPPFLAGS.patch @@ -0,0 +1,18 @@ +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:19:45 +0000 +Subject: [PATCH 3/3] Makefile: don't override CPPFLAGS + +There's no need to explicitly blank this and it prevents overrides +from the environment. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -26,7 +26,6 @@ CXXFILES?= iptstate.cc + + # THIS IS FOR NORMAL COMPILATION + LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) +-CPPFLAGS= + + ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS + diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch new file mode 100644 index 000000000000..41c875453926 --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-respect-LDFLAGS.patch @@ -0,0 +1,18 @@ +https://github.com/jaymzh/iptstate/pull/21 + +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:10:49 +0000 +Subject: [PATCH 1/2] Makefile: respect LDFLAGS + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -49,7 +49,7 @@ iptstate: iptstate.cc Makefile + echo "+------------------------------------------------------------+" ;\ + echo ""; + +- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS) ++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(CXXFILES) -o iptstate $(LIBS) + @touch iptstate + + @\ diff --git a/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch new file mode 100644 index 000000000000..3896799f78ae --- /dev/null +++ b/net-analyzer/iptstate/files/iptstate-2.2.7-use-pkg-config.patch @@ -0,0 +1,21 @@ +https://github.com/jaymzh/iptstate/pull/21 + +From: Sam James <sam@gentoo.org> +Date: Fri, 10 Dec 2021 03:10:42 +0000 +Subject: [PATCH 2/2] Makefile: Use pkg-config + +Depending on platform, linking against ncurses may require -ltinfo as well, +and linking against netfilter_conntrack may require -lnetfilter too. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile ++++ b/Makefile +@@ -25,7 +25,7 @@ CXXFLAGS?= -g -Wall -O2 -Werror=format-security -Wformat-truncation=0 + CXXFILES?= iptstate.cc + + # THIS IS FOR NORMAL COMPILATION +-LIBS?= -lncurses -lnetfilter_conntrack ++LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack) + CPPFLAGS= + + ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild deleted file mode 100644 index 0731ad67040b..000000000000 --- a/net-analyzer/iptstate/iptstate-2.2.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format" -HOMEPAGE="https://www.phildev.net/iptstate/ https://github.com/jaymzh/iptstate" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r7:0= - >=net-libs/libnetfilter_conntrack-0.0.50 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - tc-export CXX PKG_CONFIG -} - -src_install() { - emake PREFIX="${D}"/usr install - dodoc BUGS Changelog CONTRIB README WISHLIST -} diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.7.ebuild index 7a073736f1e6..8ac212c6fb01 100644 --- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild +++ b/net-analyzer/iptstate/iptstate-2.2.7.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 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="IP Tables State displays states being kept by iptables in a top-like format" @@ -10,22 +11,20 @@ SRC_URI="https://github.com/jaymzh/${PN}/releases/download/v${PV}/${P}.tar.bz2" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~x86" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r7:0= - >=net-libs/libnetfilter_conntrack-0.0.50 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +KEYWORDS="amd64 ~hppa ~ppc x86" + +RDEPEND=">=sys-libs/ncurses-5.7-r7:= + >=net-libs/libnetfilter_conntrack-0.0.50" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-2.2.5-gentoo.patch + "${FILESDIR}"/${PN}-2.2.7-respect-LDFLAGS.patch + "${FILESDIR}"/${PN}-2.2.7-use-pkg-config.patch + "${FILESDIR}"/${PN}-2.2.7-respect-CPPFLAGS.patch ) -src_prepare() { - default +src_configure() { tc-export CXX PKG_CONFIG } diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml index bcd164dad76c..aff3c6f03b2d 100644 --- a/net-analyzer/iptstate/metadata.xml +++ b/net-analyzer/iptstate/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest index c09196eaf272..bb373ee0eff7 100644 --- a/net-analyzer/ipv6toolkit/Manifest +++ b/net-analyzer/ipv6toolkit/Manifest @@ -1,2 +1 @@ -DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 BLAKE2B 468375afbf385ac9b571708be1baff0b0c56a0895bb73f3711522120b0e5fdfded3d73fea2a7d48b38f1e6387e0d63674c08eb503281f6eb635ea131ae67ec47 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d -DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9 +DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch deleted file mode 100644 index 9d4a3dcffe9e..000000000000 --- a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- a/tools/flow6.c -+++ b/tools/flow6.c -@@ -85,8 +85,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/frag6.c -+++ b/tools/frag6.c -@@ -94,8 +94,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/icmp6.c -+++ b/tools/icmp6.c -@@ -114,8 +114,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/ipv6toolkit.h -+++ b/tools/ipv6toolkit.h -@@ -2,3 +2,10 @@ - #define MAX_CMDLINE_OPT_LEN 40 - #define DATE_STR_LEN 40 - -+#include <pcap.h> -+#include <setjmp.h> -+ -+extern char errbuf[PCAP_ERRBUF_SIZE]; -+extern struct bpf_program pcap_filter; -+extern sigjmp_buf env; -+extern unsigned int canjump; ---- a/tools/jumbo6.c -+++ b/tools/jumbo6.c -@@ -80,8 +80,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/na6.c -+++ b/tools/na6.c -@@ -61,8 +61,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - unsigned char buffer[65556]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/ni6.c -+++ b/tools/ni6.c -@@ -90,8 +90,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - char domain[MAX_DOMAIN_LEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/ns6.c -+++ b/tools/ns6.c -@@ -59,8 +59,7 @@ - const u_char *pktdata; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - - unsigned char buffer[65556]; - unsigned char *v6buffer, *ptr, *startofprefixes; ---- a/tools/path6.c -+++ b/tools/path6.c -@@ -88,8 +88,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/ra6.c -+++ b/tools/ra6.c -@@ -64,8 +64,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - - unsigned char buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD]; ---- a/tools/rd6.c -+++ b/tools/rd6.c -@@ -106,8 +106,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/rs6.c -+++ b/tools/rs6.c -@@ -60,8 +60,7 @@ - struct in6_addr *pkt_ipv6addr; - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - char all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR; - - unsigned char buffer[65556]; ---- a/tools/scan6.c -+++ b/tools/scan6.c -@@ -153,8 +153,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - char line[LINE_BUFFER_SIZE]; - unsigned char *v6buffer, *ptr, *startofprefixes; -@@ -269,10 +268,6 @@ - 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080}; - - --/* IPv6 Address Resolution */ --sigjmp_buf env; --unsigned int canjump; -- - int main(int argc, char **argv){ - extern char *optarg; - int r; ---- a/tools/tcp6.c -+++ b/tools/tcp6.c -@@ -116,8 +116,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; ---- a/tools/udp6.c -+++ b/tools/udp6.c -@@ -99,8 +99,7 @@ - - bpf_u_int32 my_netmask; - bpf_u_int32 my_ip; --struct bpf_program pcap_filter; --char dev[64], errbuf[PCAP_ERRBUF_SIZE]; -+char dev[64]; - unsigned char buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN]; - unsigned char *v6buffer, *ptr, *startofprefixes; - char *pref; diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild deleted file mode 100644 index e16edc154ccf..000000000000 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets" -HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/fgont/ipv6toolkit.git" - inherit git-r3 - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" - SNAPSHOT="d14d90969e88a455e4ca8ea0ea7d88c9b7fb5c9f" - SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}" -fi - -DEPEND="net-libs/libpcap[ipv6(+)]" -RDEPEND="${DEPEND} - sys-apps/hwids" - -HWIDS_OUI_PATH=/usr/share/misc/oui.txt - -src_prepare() { - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 -} -src_compile() { - emake CFLAGS="${CFLAGS}" PREFIX=/usr -} - -src_install() { - dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr - #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf - dodoc CHANGES.TXT README.TXT -} diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild index bff5e134fff8..afe8e856acea 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ inherit toolchain-funcs DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets" HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/" -SNAPSHOT="20de5f297f73b6a8115d1eac52adfe0b6df5b3ed" +SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf" SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}" @@ -19,30 +19,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-apps/hwids + sys-apps/hwdata " -PATCHES=( - "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch -) - -HWIDS_OUI_PATH=/usr/share/misc/oui.txt src_prepare() { default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 } + src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die } src_install() { dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die dodoc CHANGES.TXT README.TXT } diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild index 2248b0b2e758..78d911dcf494 100644 --- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild +++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,30 +17,22 @@ DEPEND=" " RDEPEND=" ${DEPEND} - sys-apps/hwids + sys-apps/hwdata " -PATCHES=( - "${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch -) - -HWIDS_OUI_PATH=/usr/share/misc/oui.txt src_prepare() { default - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - manuals/ipv6toolkit.conf.5 } + src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX="${EPREFIX}/usr" + sed -i -e "s:ipv6toolkit/oui.txt:hwdata/oui.txt:" data/ipv6toolkit.conf manuals/ipv6toolkit.conf.5 || die } src_install() { dodir /etc - emake install DESTDIR="${ED}" PREFIX=/usr + emake install DESTDIR="${D}" PREFIX="${EPREFIX}/usr" #remove the included oui file - rm -f "${D}"/usr/share/ipv6toolkit/oui.txt - #fix the conf file to use the one from sys-apps/hwids - sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \ - "${ED}"/etc/ipv6toolkit.conf + rm "${ED}"/usr/share/ipv6toolkit/oui.txt || die dodoc CHANGES.TXT README.TXT } diff --git a/net-analyzer/ipv6toolkit/metadata.xml b/net-analyzer/ipv6toolkit/metadata.xml index 65a725a606c7..21d69a1889aa 100644 --- a/net-analyzer/ipv6toolkit/metadata.xml +++ b/net-analyzer/ipv6toolkit/metadata.xml @@ -1,13 +1,10 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription> - The SI6 Networks' IPv6 toolkit is a set of IPv6 security/trouble-shooting tools, that can send arbitrary IPv6-based packets. - </longdescription> <upstream> <remote-id type="github">fgont/ipv6toolkit</remote-id> </upstream> diff --git a/net-analyzer/isic/isic-0.07-r1.ebuild b/net-analyzer/isic/isic-0.07-r2.ebuild index ac8c670339bd..451a7a75239a 100644 --- a/net-analyzer/isic/isic-0.07-r1.ebuild +++ b/net-analyzer/isic/isic-0.07-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit toolchain-funcs DESCRIPTION="IP Stack Integrity Checker" -HOMEPAGE="http://isic.sourceforge.net/" -SRC_URI="mirror://sourceforge/isic/${P}.tgz" +HOMEPAGE="https://isic.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/isic/${P}.tgz" LICENSE="BSD" SLOT="0" @@ -16,20 +16,18 @@ KEYWORDS="amd64 ppc x86" DEPEND="net-libs/libnet:1.1" RDEPEND="${DEPEND}" -DOCS=( ChangeLog README ) - src_prepare() { + default # Add two missing includes echo "#include <netinet/udp.h>" >> isic.h || die echo "#include <netinet/tcp.h>" >> isic.h || die # Install man pages in /usr/share/man sed -i -e 's|/man/man1|/share&|g' Makefile.in || die - - tc-export CC } src_configure() { + tc-export CC # Build system does not know about DESTDIR econf --prefix="${D}/usr" --exec_prefix="${D}/usr" } diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml index 27b1e5096bbf..2880856da202 100644 --- a/net-analyzer/isic/metadata.xml +++ b/net-analyzer/isic/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/jffnms/Manifest b/net-analyzer/jffnms/Manifest deleted file mode 100644 index e59234875498..000000000000 --- a/net-analyzer/jffnms/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jffnms-0.9.4.tgz 610758 BLAKE2B 2bbe122bae3d358e710895ebd1c38f28644260744d97f5ab88301dc5549c099c9af0931156d47ce0e616c0f6f84b04f2e7ae04f4d0efc8cc3ff72b01dc51e22c SHA512 4d0c4ed1fbf0107029d92b2ea8f0f02c46d532810dc58bf048c5ffaf79f7f24630101be8319876db1aee3356ced32e7cba2f2494bc8a92a635b0a4e6897c6fe7 diff --git a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild b/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild deleted file mode 100644 index ddbea9ec4ebb..000000000000 --- a/net-analyzer/jffnms/jffnms-0.9.4-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit user - -DESCRIPTION="Network Management and Monitoring System" -HOMEPAGE="http://www.jffnms.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql postgres snmp" - -RDEPEND=" - dev-lang/php[apache2,cli,gd,mysql?,postgres?,session,snmp,sockets,wddx] - dev-php/PEAR-PEAR - media-gfx/graphviz - media-libs/gd - net-analyzer/fping - net-analyzer/net-snmp - net-analyzer/nmap - net-analyzer/rrdtool[graph] - sys-apps/diffutils -" - -pkg_setup() { - enewgroup jffnms - enewuser jffnms -1 /bin/bash -1 jffnms,apache -} - -src_install(){ - local INSTALL_DIR="/opt/${PN}" - local IMAGE_DIR="${D}${INSTALL_DIR}" - - insinto "${INSTALL_DIR}" - doins -r * - - rm -f "${IMAGE_DIR}/LICENSE" - - # Clean up Windows related stuff - rm -f "${IMAGE_DIR}"/*.win32.txt - rm -rf "${IMAGE_DIR}"/docs/windows - rm -rf "${IMAGE_DIR}"/engine/windows - - fowners -R jffnms:apache "${INSTALL_DIR}" - fperms -R ug+rw "${INSTALL_DIR}" -} - -pkg_postinst() { - elog "${PN} has been partialy installed on your system. However you" - elog "still need proceed with final installation and configuration." - elog "You can visit https://wiki.gentoo.org/wiki/Jffnms in order" - elog "to get detailed information on how to get jffnms up and running." -} diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml deleted file mode 100644 index a7910963dea7..000000000000 --- a/net-analyzer/jffnms/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">jffnms</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/jmx2munin/Manifest b/net-analyzer/jmx2munin/Manifest deleted file mode 100644 index 4d69d490d879..000000000000 --- a/net-analyzer/jmx2munin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jmx2munin-gentoo-1.0_p20120811.tar.gz 6890 BLAKE2B f28622405cf76cfd6effd4a86a1994e921eb71afced8e0c9c167422fc20378b607b63d7b93add0b816b21a8dc3c9504a4c406ea17f3db159dfd9f4aea440ac32 SHA512 154817d63fb278970d04785821a29833007a553055efe28aa6a3654d01b7a4422a2a1c98cd1693ae52ea28a57505b6d7988f241f6d119425f5c3ae38471b72be diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild deleted file mode 100644 index ad8601a5fcc0..000000000000 --- a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -MY_P="${PN}-gentoo-${PV}" - -DESCRIPTION="JMX Monitoring plugin for Munin" -HOMEPAGE="https://github.com/tcurdt/jmx2munin" -SRC_URI="https://github.com/gentoo/jmx2munin/tarball/${MY_P} -> ${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -CDEPEND="dev-java/jcommander:0" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.6" - -RDEPEND="${CDEPEND} - net-analyzer/munin - >=virtual/jre-1.6" - -S="${WORKDIR}/${MY_P}" - -JAVA_SRC_DIR="src/main/java/org/vafer/jmx" -JAVA_GENTOO_CLASSPATH="jcommander" - -src_unpack() { - unpack ${A} - mv gentoo-${PN}-* ${MY_P} -} - -java_prepare() { - rm pom.xml || die -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dolauncher ${PN} --main org.vafer.jmx.munin.Munin - - exeinto /usr/libexec/munin/plugins - newexe contrib/${PN}.sh ${PN}_ - - dodoc README.md contrib/jmx2munin.cfg/cassandra/nodes_in_cluster - - keepdir /etc/munin/${PN} -} diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml deleted file mode 100644 index 737e4b4746ff..000000000000 --- a/net-analyzer/jmx2munin/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> - </maintainer> - <maintainer type="project"> - <email>sysadmin@gentoo.org</email> - <name>Gentoo Sysadmin Project</name> - </maintainer> - <upstream> - <remote-id type="github">gentoo/jmx2munin</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch b/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch new file mode 100644 index 000000000000..d8723b6a5b13 --- /dev/null +++ b/net-analyzer/jnettop/files/jnettop-0.13.0-clang16.patch @@ -0,0 +1,9 @@ +https://bugs.gentoo.org/870667 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -151,4 +151,5 @@ + AC_MSG_CHECKING([if "localhost" resolves]) + AC_TRY_RUN([ ++#include <stdlib.h> + #include <string.h> + #include <sys/types.h> diff --git a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild index e0c718000574..8b2365f79d7b 100644 --- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild +++ b/net-analyzer/jnettop/jnettop-0.13.0-r2.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=8 -DESCRIPTION="A top like console network traffic visualiser" -HOMEPAGE="http://jnettop.kubs.info/" +inherit autotools + +DESCRIPTION="Top like console network traffic visualiser" +HOMEPAGE="https://sourceforge.net/projects/jnettop" SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="berkdb ncurses syslog" RDEPEND=" @@ -20,16 +21,17 @@ RDEPEND=" ncurses? ( sys-libs/ncurses ) syslog? ( virtual/logger ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS ChangeLog NEWS README ) +PATCHES=( + "${FILESDIR}/${P}-asneeded.patch" + "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}/${P}-clang16.patch" +) src_prepare() { - epatch \ - "${FILESDIR}/${P}-asneeded.patch" \ - "${FILESDIR}/${P}-tinfo.patch" + default eautoreconf } diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml index 819c7823b02c..64065c6ebf3a 100644 --- a/net-analyzer/jnettop/metadata.xml +++ b/net-analyzer/jnettop/metadata.xml @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription>A top like console network traffic visualiser</longdescription> +<upstream> + <remote-id type="sourceforge">jnettop</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/kapacitor/Manifest b/net-analyzer/kapacitor/Manifest index 03dbf0800fc2..e84886f6f4f4 100644 --- a/net-analyzer/kapacitor/Manifest +++ b/net-analyzer/kapacitor/Manifest @@ -1,2 +1 @@ -DIST kapacitor-1.4.1.tar.gz 7543899 BLAKE2B 142ea7899be3728d2e857a83beebb8ff32dae6b7a71097de1474878a1728c6597937d03a828746af2464d6406ae80796b11579a10baacb66843bd535f971d940 SHA512 315e01e97f6a89afbbd0e36c17ee64d2744bc8ccce2e318f17ad5fba75599fdc55c303069c32aed07ba73c8ba9cdbacdb76c7ffe0c81681c1ef0be0ba405802e -DIST kapacitor-1.5.1.tar.gz 5668659 BLAKE2B 5caf7a51945d84010f25dcbe198d4a1b7fc21f2ef7036a0489d6274212068937942f0490637a11ab05399d3a95ec1d96f3d42f0a2b3e3b7b4ff1377ef1e220e6 SHA512 6e25f89d9b75c6c14350a189be7bcd4210a331025a4bd0a8fa363dee8abbe8c582013a9c3020e638e9490ded12d70212963dc01bd3570395412641e2911d93f5 +DIST kapacitor-1.5.5.tar.gz 5708426 BLAKE2B 432d24f3bbe0f42e36b881e0c709cebd96dd3674ddf752f6a25cfb333108c903073b887e12d630d6c9e33a77b1256ea090cfe216cd9eb30b9bee53c48b7ab154 SHA512 34a2577a9c6f069ab8f747b9bd2f80f941bbedcccd740c24ec9f308804ec259e78cf14c924fcee3315b6f9f7f59adb9c50aedf06587898b8a0fb54f721d79212 diff --git a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild deleted file mode 100644 index dd499480fbdd..000000000000 --- a/net-analyzer/kapacitor/kapacitor-1.5.1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGO_PN=github.com/influxdata/kapacitor - -inherit golang-build golang-vcs-snapshot systemd user - -DESCRIPTION="Monitoring, processing and alerting on time series data" -HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -pkg_setup() { - enewgroup kapacitor - enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor -} - -src_compile() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go build -v -work -x ./... - echo "$@" - "$@" || die "compile failed" - popd > /dev/null -} - -src_install() { - pushd "src/${EGO_PN}" > /dev/null || die - set -- env GOPATH="${S}" go install -v -work -x ./... - echo "$@" - "$@" || die - dobin "${S}"/bin/kapacitor{,d} - insinto /etc/kapacitor -doins etc/kapacitor/kapacitor.conf -keepdir /etc/kapacitor/load - insinto /etc/logrotate.d - doins etc/logrotate.d/kapacitor - systemd_dounit scripts/kapacitor.service - keepdir /var/log/kapacitor - fowners kapacitor:kapacitor /var/log/kapacitor - newconfd "${FILESDIR}"/kapacitor.confd kapacitor - newinitd "${FILESDIR}"/kapacitor.rc kapacitor - popd > /dev/null || die -} diff --git a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild b/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild index dd499480fbdd..b30d15009984 100644 --- a/net-analyzer/kapacitor/kapacitor-1.4.1-r1.ebuild +++ b/net-analyzer/kapacitor/kapacitor-1.5.5.ebuild @@ -1,24 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 +inherit golang-build golang-vcs-snapshot systemd EGO_PN=github.com/influxdata/kapacitor -inherit golang-build golang-vcs-snapshot systemd user - DESCRIPTION="Monitoring, processing and alerting on time series data" HOMEPAGE="https://www.influxdata.com" -SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/influxdata/kapacitor/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64" IUSE="" -pkg_setup() { - enewgroup kapacitor - enewuser kapacitor -1 -1 /var/lib/kapacitor kapacitor -} +COMMON_DEPEND="acct-group/kapacitor + acct-user/kapacitor" + DEPEND="${COMMON_DEPEND}" + RDEPEND="${COMMON_DEPEND}" src_compile() { pushd "src/${EGO_PN}" > /dev/null || die diff --git a/net-analyzer/kapacitor/metadata.xml b/net-analyzer/kapacitor/metadata.xml index ed7262b70f1e..db463f3eeb66 100644 --- a/net-analyzer/kapacitor/metadata.xml +++ b/net-analyzer/kapacitor/metadata.xml @@ -1,12 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - Open source framework for processing, monitoring and alerting on - time series data. - </longdescription> </pkgmetadata> diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest index 587431e73fe1..9290a58d8dc7 100644 --- a/net-analyzer/knocker/Manifest +++ b/net-analyzer/knocker/Manifest @@ -1 +1 @@ -DIST knocker-0.7.1.tar.gz 72132 BLAKE2B a6eb8e37354df630481f809c77e98f1c9dab3290b8a34e1a3c7bbfc5f3d0f41b9a1f97a8f5a8afef7e1ec0c5afa444e908b8d50eeaedf08a384e86cda1c7b182 SHA512 e65d615235328c027e1c6179a11bee186fa3d173205850e8b9fac591819e344de770d968c2667f1a18bef88cf90422c357bf76b9d05a8915629977cb8e334cc2 +DIST knocker-0.8.0.tar.gz 117380 BLAKE2B bb6b344efc0c7b22266b59430eff3b7982d328b54277085cef9709f9f41b7e6e40b1cc22944b36f927db00cd7f15afc1774be20df504e1f3f4eb2b2b1c293973 SHA512 127fde05f2f331e7a4489c4612852fe841f0981b737be1d871de33355a0b55f2ab50d2c083ef857420b4af81909d5cc8fbe6c89174e141f77e6bf25719b6bf47 diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch b/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch deleted file mode 100644 index 0b5247a653a4..000000000000 --- a/net-analyzer/knocker/files/knocker-0.7.1-fno-common.patch +++ /dev/null @@ -1,215 +0,0 @@ ---- a/src/knocker_args.c -+++ b/src/knocker_args.c -@@ -34,6 +34,7 @@ - - static int _have_last_host = 0; /* tells if we've got the host with the --last-host option */ - -+knocker_args_t knocker_args; /* command line arguments structure */ - - /* - ============================================================================ ---- a/src/knocker_args.h -+++ b/src/knocker_args.h -@@ -93,7 +93,7 @@ - } knocker_args_t; - - --knocker_args_t knocker_args; /* command line arguments structure */ -+extern knocker_args_t knocker_args; /* command line arguments structure */ - - /* - Initialize a knocker_args_t type of structure ---- a/src/knocker_conf.c -+++ b/src/knocker_conf.c -@@ -31,6 +31,11 @@ - #include "knocker_user.h" - #include "knocker_conf.h" - -+int KNOCKER_USER_COLOR; -+int KNOCKER_COLOR_1; -+int KNOCKER_COLOR_2; -+int KNOCKER_COLOR_1_ATTR; -+int KNOCKER_COLOR_2_ATTR; - - /* - ============================================================================ ---- a/src/knocker_conf.h -+++ b/src/knocker_conf.h -@@ -46,11 +46,11 @@ - /* The actual values variable */ - /* these values are read from the conf file */ - /* by the knocker_conf_parse function */ --int KNOCKER_USER_COLOR; --int KNOCKER_COLOR_1; --int KNOCKER_COLOR_2; --int KNOCKER_COLOR_1_ATTR; --int KNOCKER_COLOR_2_ATTR; -+extern int KNOCKER_USER_COLOR; -+extern int KNOCKER_COLOR_1; -+extern int KNOCKER_COLOR_2; -+extern int KNOCKER_COLOR_1_ATTR; -+extern int KNOCKER_COLOR_2_ATTR; - - void knocker_conf_configure ( void ); - int knocker_conf_parse ( void ); ---- a/src/knocker_core.c -+++ b/src/knocker_core.c -@@ -50,6 +50,9 @@ - static void knocker_core_free_host_ip_string (knocker_core_host_t * hinfo); - - -+char *knocker_core_last_hostip; /* string of the last resolved host ip address */ -+char *knocker_core_last_hostname; /* string of the last used host name */ -+char *knocker_core_last_service; /* string of the last service */ - - /* - ============================================================================ ---- a/src/knocker_core.h -+++ b/src/knocker_core.h -@@ -164,9 +164,9 @@ - static const char knocker_core_author_email[] = _KNOCKER_CORE_AUTHOR_EMAIL_; - - /* allocated and deallocated within knocker_core_init, knocker_core_quit */ --char *knocker_core_last_hostip; /* string of the last resolved host ip address */ --char *knocker_core_last_hostname; /* string of the last used host name */ --char *knocker_core_last_service; /* string of the last service */ -+extern char *knocker_core_last_hostip; /* string of the last resolved host ip address */ -+extern char *knocker_core_last_hostname; /* string of the last used host name */ -+extern char *knocker_core_last_service; /* string of the last service */ - - - int knocker_core_init ( void ); ---- a/src/knocker_led.c -+++ b/src/knocker_led.c -@@ -50,6 +50,9 @@ - #define LED_VALUE_SCR LED_SCR - - -+knocker_led_t knocker_led_status; -+int ledt; -+ - #ifndef NO_LED - static int initialized = 0; - #endif ---- a/src/knocker_led.h -+++ b/src/knocker_led.h -@@ -65,7 +65,7 @@ - int sequence; /* used in knocker_led_sequence() only */ - } knocker_led_t; - --knocker_led_t knocker_led_status; -+extern knocker_led_t knocker_led_status; - - void knocker_led_turn_on (int led); - void knocker_led_turn_off (int led); -@@ -75,7 +75,7 @@ - void knocker_led_reset ( void ); - - #define led_delay 1 --int ledt; -+extern int ledt; - - #endif /* _KNOCKER_LED_H_ */ - ---- a/src/knocker_log.c -+++ b/src/knocker_log.c -@@ -30,7 +30,7 @@ - const char knocker_log_header[] = - "+-----------------------------------------------------------------------------+\n|--=| k n o c k e r -- t h e -- n e t -- p o r t s c a n n e r |=-=[logfile]=-|\n+-----------------------------------------------------------------------------+\n"; - --char *knocker_time; -+FILE *knocker_log_fp; - - /* - ============================================================================ ---- a/src/knocker_log.h -+++ b/src/knocker_log.h -@@ -33,7 +33,7 @@ - #include <string.h> - - #define KNOCKER_LOG_FILE "knocker_scan.log" --FILE *knocker_log_fp; -+extern FILE *knocker_log_fp; - - int knocker_log_open (const char *filename); - void knocker_log_host_info (char *hostname_str, char *hostip_str); ---- a/src/knocker_output.c -+++ b/src/knocker_output.c -@@ -38,8 +38,6 @@ - }; - - --char *knocker_time; -- - /* - ============================================================================ - ============================================================================ ---- a/src/knocker_services.c -+++ b/src/knocker_services.c -@@ -28,6 +28,9 @@ - #include "knocker_services.h" - #include "knocker_core.h" - -+int knocker_core_services_db_init; -+char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; -+ - /* this following list of services has been automatically - generated from /etc/services */ - ---- a/src/knocker_services.h -+++ b/src/knocker_services.h -@@ -29,9 +29,9 @@ - - #define SERVICES_DB_TOTAL_SERVICES 30000 /* was erroneously 231 */ - --int knocker_core_services_db_init; -+extern int knocker_core_services_db_init; - --char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; -+extern char *knocker_core_services_db[SERVICES_DB_TOTAL_SERVICES]; - - int init_knocker_core_services_db ( void ); - void free_knocker_core_services_db ( void ); ---- a/src/knocker_time.c -+++ b/src/knocker_time.c -@@ -40,6 +40,7 @@ - static struct timeval timer_start; - #endif - -+char *knocker_time; - - void knocker_time_start_timer (void) - { ---- a/src/knocker_time.h -+++ b/src/knocker_time.h -@@ -30,6 +30,8 @@ - - #include <time.h> - -+extern char *knocker_time; -+ - void knocker_time_start_timer (void); - double knocker_time_get_ticks (void); - void knocker_time_delay (unsigned long ms); ---- a/src/knocker_user.c -+++ b/src/knocker_user.c -@@ -41,6 +41,8 @@ - #define KNOCKER_LASTSCAN_FILE "lastscan" - #define KNOCKER_TOKEN "|" - -+knocker_user_t knocker_user; -+ - static int _dir_exists (const char *path); - static int _dir_create (const char *path); - static int _file_exists (const char *path); ---- a/src/knocker_user.h -+++ b/src/knocker_user.h -@@ -30,7 +30,7 @@ - int super; /* user is root or not */ - } knocker_user_t; - --knocker_user_t knocker_user; -+extern knocker_user_t knocker_user; - - int knocker_user_is_root ( void ); - char *knocker_user_get_username ( void ); diff --git a/net-analyzer/knocker/files/knocker-0.7.1-free.patch b/net-analyzer/knocker/files/knocker-0.7.1-free.patch deleted file mode 100644 index 5381d2fd83e3..000000000000 --- a/net-analyzer/knocker/files/knocker-0.7.1-free.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/knocker_conf.c -+++ b/src/knocker_conf.c -@@ -223,6 +223,8 @@ - { - char *tmpp = malloc (strlen (line)); - char *p = malloc (strlen (line)); -+ char *tmpp_orig = tmpp; -+ char *p_orig = p; - - /* Check if the option is present in the line */ - tmpp = strstr (line, opt); -@@ -234,7 +236,7 @@ - - if (!_isblank (*tmpp) || *tmpp != KNOCKER_OPTION_TOKEN) - { -- free (tmpp); -+ free (tmpp_orig); - return 0; - } - -@@ -247,8 +249,7 @@ - - strcpy (value, p); - -- /* free(p); this cause knocker to segfault */ -- /* well I have to know why... */ -+ free(p_orig); - - return 1; - } diff --git a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch index 6051d87b2e68..a5ff93fb07bb 100644 --- a/net-analyzer/knocker/files/knocker-0.7.1-fency.patch +++ b/net-analyzer/knocker/files/knocker-0.8.0-fency.patch @@ -43,62 +43,6 @@ } else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i], NO_COLORS_LONG_OPT))) { ---- a/src/knocker_output.c -+++ b/src/knocker_output.c -@@ -48,7 +48,7 @@ - { - time_t timenow; - -- if (!knocker_args.fency) -+ if (!knocker_args.fancy) - return 0; - - -@@ -104,7 +104,7 @@ - */ - void knocker_output_host_info (const char *hostname_str, const char *hostip_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); -@@ -134,7 +134,7 @@ - */ - void knocker_output_resolve_error (char *hostname_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); -@@ -157,7 +157,7 @@ - */ - void knocker_output_ports_info (int sp, int ep) - { -- if (!knocker_args.fency) -+ if (!knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); - return; -@@ -183,7 +183,7 @@ - */ - void knocker_output_open_port (int port, char *service_str) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); - knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); -@@ -216,7 +216,7 @@ - */ - void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps, int open_ps, char *secs) - { -- if (knocker_args.fency) -+ if (knocker_args.fancy) - { - knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); - knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ", --- a/src/knocker_main.c +++ b/src/knocker_main.c @@ -75,7 +75,7 @@ @@ -134,8 +78,8 @@ int win32_frontend; } knocker_args_t; ---- a/docs/knocker.1 -+++ b/docs/knocker.1 +--- a/doc/knocker.1 ++++ b/dos/knocker.1 @@ -38,8 +38,8 @@ \fB\-lf\fr, \fB\-\-logfile <logfile>\fR log the results to a specified file. @@ -147,3 +91,61 @@ .TP \fB\-nc\fr, \fB\-\-no-colors\fR disable colored output +diff --git a/src/knocker_output.c b/src/knocker_output.c +index 4714c24..613b608 100755 +--- a/src/knocker_output.c ++++ b/src/knocker_output.c +@@ -46,7 +46,7 @@ int knocker_output_open (void) + time (&timenow); + knocker_time = ctime (&timenow); + +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + +@@ -98,7 +98,7 @@ int knocker_output_open (void) + + void knocker_output_host_info (const char *hostname_str, const char *hostip_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); +@@ -124,7 +124,7 @@ void knocker_output_host_info (const char *hostname_str, const char *hostip_str) + + void knocker_output_resolve_error (char *hostname_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); +@@ -144,7 +144,7 @@ void knocker_output_resolve_error (char *hostname_str) + + void knocker_output_ports_info (int sp, int ep) + { +- if (!knocker_args.fency) ++ if (!knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); + return; +@@ -166,7 +166,7 @@ void knocker_output_ports_info (int sp, int ep) + + void knocker_output_open_port (int port, char *service_str) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR); + knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); +@@ -192,7 +192,7 @@ void knocker_output_open_port (int port, char *service_str) + + void knocker_output_results (char *hostname_str, char *hostname_ip, int tot_ps, int open_ps, char *secs) + { +- if (knocker_args.fency) ++ if (knocker_args.fancy) + { + knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2, KNOCKER_COLOR_2_ATTR); + knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - - - - - - - - - - - - - - - - - - - ", diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.8.0.ebuild index 0e56cfddb098..069f7a174704 100644 --- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild +++ b/net-analyzer/knocker/knocker-0.8.0.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit toolchain-funcs DESCRIPTION="Knocker is an easy to use security port scanner written in C" -HOMEPAGE="http://knocker.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://knocker.sourceforge.net" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" PATCHES=( - "${FILESDIR}"/${P}-fency.patch - "${FILESDIR}"/${P}-free.patch - "${FILESDIR}"/${P}-knocker_user_is_root.patch - "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${PN}-0.8.0-fency.patch + "${FILESDIR}"/${PN}-0.7.1-knocker_user_is_root.patch ) + DOCS=( AUTHORS BUGS ChangeLog NEWS README TO-DO ) src_configure() { diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml index 490337f25c7d..5eac8d0cb4e2 100644 --- a/net-analyzer/knocker/metadata.xml +++ b/net-analyzer/knocker/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> <upstream> + <remote-id type="github">gabgio/knocker</remote-id> <remote-id type="sourceforge">knocker</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/labrea/files/labrea-2.5-libdir.patch b/net-analyzer/labrea/files/labrea-2.5-libdir.patch new file mode 100644 index 000000000000..039745205c3c --- /dev/null +++ b/net-analyzer/labrea/files/labrea-2.5-libdir.patch @@ -0,0 +1,26 @@ +--- a/configure.in ++++ b/configure.in +@@ -82,9 +82,9 @@ AC_ARG_WITH(libpcap, + if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval/include" + if test -f $withval/lib/libwpcap.a; then +- PCAPLIB="-L$withval/lib -lwpcap" ++ PCAPLIB="-L$withval/${libdir} -lwpcap" + else +- PCAPLIB="-L$withval/lib -lpcap" ++ PCAPLIB="-L$withval/${libdir} -lpcap" + fi + else + AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +@@ -94,9 +94,9 @@ AC_ARG_WITH(libpcap, + [ if test -f ${prefix}/include/pcap.h; then + PCAPINC="-I${prefix}/include" + if test -f ${prefix}/lib/libwpcap.a; then +- PCAPLIB="-L${prefix}/lib -lwpcap" ++ PCAPLIB="-L${libdir} -lwpcap" + else +- PCAPLIB="-L${prefix}/lib -lpcap" ++ PCAPLIB="-L${libdir} -lpcap" + fi + elif test -f /usr/include/pcap/pcap.h; then + PCAPINC="-I/usr/include/pcap" diff --git a/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch new file mode 100644 index 000000000000..15ed9ff0960c --- /dev/null +++ b/net-analyzer/labrea/files/labrea-2.5_p1-clang16.patch @@ -0,0 +1,7 @@ +https://bugs.gentoo.org/871513 +--- a/inc/utils.h ++++ b/inc/utils.h +@@ -52,2 +52,3 @@ + ++void util_alarm(void); + void util_init(void); diff --git a/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild deleted file mode 100644 index cdbff85668a0..000000000000 --- a/net-analyzer/labrea/labrea-2.5-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="'Sticky' Honeypot and IDS" -HOMEPAGE="http://labrea.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -DEPEND="net-libs/libpcap - >=dev-libs/libdnet-1.7" -RDEPEND="${DEPEND}" - -MY_P="${P}-stable-1" -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ChangeLog README TODO NEWS ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-stable-1-incdir.patch - eautoreconf -} - -src_install() { - default - newdoc INSTALL README.first -} - -pkg_postinst() { - ewarn "Before using this package READ the INSTALL and README" - ewarn "as the author states that it can cause serious problems on your network." - -} diff --git a/net-analyzer/labrea/labrea-2.5-r3.ebuild b/net-analyzer/labrea/labrea-2.5-r3.ebuild deleted file mode 100644 index 1d43736622c7..000000000000 --- a/net-analyzer/labrea/labrea-2.5-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="'Sticky' Honeypot and IDS" -HOMEPAGE="http://labrea.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}-stable-1.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -DEPEND=" - net-libs/libpcap - >=dev-libs/libdnet-1.7 -" -RDEPEND=" - ${DEPEND} -" - -MY_P="${P}-stable-1" -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ChangeLog README TODO NEWS ) -PATCHES=( - "${FILESDIR}"/${P}-stable-1-incdir.patch - "${FILESDIR}"/${P}-pcap_open.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - newdoc INSTALL README.first -} - -pkg_postinst() { - ewarn "Before using this package READ the INSTALL and README" - ewarn "as the author states that it can cause serious problems on your network" -} diff --git a/net-analyzer/labrea/labrea-2.5_p1.ebuild b/net-analyzer/labrea/labrea-2.5_p1.ebuild new file mode 100644 index 000000000000..a2ba90710ea0 --- /dev/null +++ b/net-analyzer/labrea/labrea-2.5_p1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="'Sticky' Honeypot and IDS" +HOMEPAGE="https://labrea.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_p*}-stable-${PV/*_p}.tar.gz" +S="${WORKDIR}/${P/_p/-stable-}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" + +DEPEND=" + net-libs/libpcap + >=dev-libs/libdnet-1.7 +" +RDEPEND="${DEPEND}" + +DOCS=( AUTHORS ChangeLog README{,.first} TODO NEWS ) + +PATCHES=( + "${FILESDIR}"/${P/_p/-stable-}-incdir.patch + "${FILESDIR}"/${P/_p*}-pcap_open.patch + "${FILESDIR}"/${PN}-2.5-libdir.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + # autotools will overwrite this with the generic version + mv INSTALL README.first || die + + mv configure.{in,ac} || die + + eautoreconf +} + +pkg_postinst() { + ewarn "Before using this package please read the README.first and README as" + ewarn "the author states that it can cause serious problems on your network" +} diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml index 4b6eef6e2752..7b25ccf324cd 100644 --- a/net-analyzer/labrea/metadata.xml +++ b/net-analyzer/labrea/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>'Sticky' Honeypot and IDS</longdescription> <upstream> <remote-id type="sourceforge">labrea</remote-id> </upstream> diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest index d516f3fb1f98..9b6cb4681d0e 100644 --- a/net-analyzer/lft/Manifest +++ b/net-analyzer/lft/Manifest @@ -1,3 +1 @@ -DIST lft-3.77.tar.gz 376369 BLAKE2B be518167608896a43b7e2ef1ca478f3fa9a9ced58737e607af348bd8929a2890356dc6041ce3ea9fa3273a954d4df151a4c6ff5fc5a0e26e25b3849bf83aac5d SHA512 b06fa50cbccb40d275ac604b86c6aed4ee00700cde38fd579de06bb577280f154d0173c4788920410a5c2e0c8ed20d7adf07f15d0b98cf5ad4ea422651df60f1 -DIST lft-3.79.tar.gz 376655 BLAKE2B 4c3affe00a09befc00029029a1da5d530d08bce317e616e7d996a8e31d22632cf43adbe519f4789313b59dc01f4c36d19860effd561b4f691eadcac05c935d6e SHA512 83f35cb24966467a7da180ca8ac9d642e7ca6267a14e752a813f172956554c3d4b278a450d230535c15db1b14d415dca752ad05ed1cec8c1c7cf4953b90a646d -DIST lft-3.8.tar.gz 376731 BLAKE2B e78e6d32cdaff8864e13477522dac92953d7ba44cb7d64e327eeb126411d6f6c022fe1e2011377df28bc948ae75193d1de2801ee12edc42a5cf70e2b56f5e8e5 SHA512 13ea176362096cc8c20500d61969483642f5d003263b529ec8d601786f621341107859510f9cafa5d365417beafce897bcc9cd631171e291ca3dc07fec1bd483 +DIST lft-3.91.tar.gz 377135 BLAKE2B 6b67438738ebab46e5c6c79c17f074042535e9eecb80827562fb6ca6550118ecb3e70118379c4cd0b99611189554fe117ebb3d76580130627b2a21d72c9b5253 SHA512 1d030e2def14330426eef4c81245c4cce5f09c560b65b319199b20d82e967b77a5d4e323e2e64a8c1bcf80d1f87ae871e3f24a7d9cbc19cd7a5be2d3204845e7 diff --git a/net-analyzer/lft/files/lft-3.91-strip.patch b/net-analyzer/lft/files/lft-3.91-strip.patch new file mode 100644 index 000000000000..56657f114b60 --- /dev/null +++ b/net-analyzer/lft/files/lft-3.91-strip.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -51,8 +51,6 @@ + + install: lft lft.8 whob whob.8 + @echo "LFT and WhoB" +- @echo " \_Stripping binaries" +- @$(STRIP) lft whob + @echo " \_Copying files to their intended destinations" + @test -d $(DESTDIR)$(bindir)/. || $(MKDIR) $(DESTDIR)$(bindir) + $(INSTALL) lft $(DESTDIR)$(bindir)/lft diff --git a/net-analyzer/lft/lft-3.79.ebuild b/net-analyzer/lft/lft-3.79.ebuild deleted file mode 100644 index 58a145bd7256..000000000000 --- a/net-analyzer/lft/lft-3.79.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.80.ebuild b/net-analyzer/lft/lft-3.80.ebuild deleted file mode 100644 index bc7acaa2b658..000000000000 --- a/net-analyzer/lft/lft-3.80.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" -HOMEPAGE="http://pwhois.org/lft/" -SRC_URI="http://pwhois.org/get/${P/0}.tar.gz" - -LICENSE="VOSTROM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -S=${WORKDIR}/${P/0} - -DOCS=( CHANGELOG README TODO ) - -src_prepare() { - default - sed -i Makefile.in -e 's:strip:true:g' || die -} diff --git a/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.91-r1.ebuild index b79c445424c0..3e57965afb2b 100644 --- a/net-analyzer/lft/lft-3.77.ebuild +++ b/net-analyzer/lft/lft-3.91-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Layer Four Traceroute (LFT) and WhoB" HOMEPAGE="http://pwhois.org/lft/" @@ -17,10 +17,14 @@ DEPEND=" RDEPEND=" ${DEPEND} " - DOCS=( CHANGELOG README TODO ) +PATCHES=( + "${FILESDIR}"/${PN}-3.91-strip.patch +) src_prepare() { + sed -i \ + -e 's|_BSD_SOURCE|_DEFAULT_SOURCE|g' \ + configure config/acconfig.h.in || die default - sed -i Makefile.in -e 's:strip:true:g' || die } diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml index 2fd58454386f..25ecd83c4cd4 100644 --- a/net-analyzer/lft/metadata.xml +++ b/net-analyzer/lft/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/lilac/Manifest b/net-analyzer/lilac/Manifest deleted file mode 100644 index fa04b8612898..000000000000 --- a/net-analyzer/lilac/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST lilac-1.0.3.tar.gz 1794493 BLAKE2B 99f89ee232f493afcac541fe22890ed9711e6310b0af959f5e381a0575bbefd9a4607cc651ad62e737f98251b3bc073c38a02d2499bd10e440d8696493c82364 SHA512 bee9ddb7f4adc2199ee804db2d5758bb172f7f18a868206774d54d2ad7b9741a16152dbdd8c8c7cd82e6375428c9d0466bd38e3affdab55bcb574914f0fb813c diff --git a/net-analyzer/lilac/lilac-1.0.3.ebuild b/net-analyzer/lilac/lilac-1.0.3.ebuild deleted file mode 100644 index cb574a7876cd..000000000000 --- a/net-analyzer/lilac/lilac-1.0.3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils webapp - -DESCRIPTION="Web-based configuration tool written to configure Nagios" -HOMEPAGE="http://www.lilacplatform.com" -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=dev-php/PEAR-PEAR-1.6.1 - >=net-analyzer/nagios-3.0 - >=virtual/mysql-5.0 - dev-lang/php[curl,json,mysql,pcntl,pdo,posix,simplexml] - virtual/httpd-php -" - -src_install() { - webapp_src_preinst - - dodoc INSTALL UPGRADING - rm -f INSTALL UPGRADING - - insinto "${MY_HTDOCSDIR}" - doins -r . - - webapp_configfile "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist - webapp_serverowned "${MY_HTDOCSDIR}"/includes/lilac-conf.php.dist - webapp_src_install -} diff --git a/net-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/lilac/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest index b02b528ba45e..bcbda24cc7ec 100644 --- a/net-analyzer/linkchecker/Manifest +++ b/net-analyzer/linkchecker/Manifest @@ -1 +1,2 @@ -DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba +DIST LinkChecker-10.2.1.tar.gz 545530 BLAKE2B ddbf22d9cdd04d89257b92d032cff24e4dde866b4be115f7b5b878bf2a42dd08159eef451b33ed621d747f06dffa445f4258975b932e5ae0eb8b79cfb8203549 SHA512 6410aff11e94cbf001979a85dd41e50daaa6a3577689d4256a0a5627a29253baef24ed7739dbafe91f58c0841923ac3094aa558e91f34629e3e6c008e461230a +DIST LinkChecker-10.3.0.tar.gz 542403 BLAKE2B 24420c7479909d3d19d8fce45cfb2f5712107705a409f7d407097002ce6c6bb534a62a388b3a8d01760db7ac4200adf1d7250868dbeb41ec8cf8489a1776266b SHA512 fbcc4d10418642d6f0c0146a50294fa3d872eb98b53c49081af5d5ac644f1280694ad1ef8f82f639526ba08f6f0ed754b316567dd12c4e5e98360ccee4634d16 diff --git a/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild b/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild new file mode 100644 index 000000000000..c378ed2caf78 --- /dev/null +++ b/net-analyzer/linkchecker/linkchecker-10.2.1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="sqlite?" +DISTUTILS_USE_PEP517=hatchling +DISTUTILS_SINGLE_IMPL=1 + +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature + +DESCRIPTION="Check websites for broken links" +HOMEPAGE="https://github.com/linkchecker/linkchecker" +SRC_URI="https://github.com/linkchecker/linkchecker/releases/download/v${PV}/LinkChecker-${PV}.tar.gz" +KEYWORDS="amd64 x86" + +LICENSE="GPL-2" +SLOT="0" +IUSE="sqlite" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + app-text/pdfminer[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pyftpdlib[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + sys-devel/gettext + ) +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-9.3-bash-completion.patch" ) + +DOCS=( + doc/changelog.txt + doc/upgrading.txt +) + +python_test() { + # Telnet test uses miniboa which is not available in Gentoo + rm -f tests/checker/test_telnet.py + # Multiple warnings about unclosed test sockets with epytest + pytest -vra -n "$(makeopts_jobs)"|| die +} + +python_install_all() { + distutils-r1_python_install_all + newbashcomp config/linkchecker-completion ${PN} +} + +pkg_postinst() { + optfeature "Virus scanning" app-antivirus/clamav + optfeature "Check links in PDF files" app-text/pdfminer + optfeature "bash-completion support" dev-python/argcomplete +} diff --git a/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild b/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild new file mode 100644 index 000000000000..93e2b021cf4e --- /dev/null +++ b/net-analyzer/linkchecker/linkchecker-10.3.0.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="sqlite?" +DISTUTILS_USE_PEP517=hatchling +DISTUTILS_SINGLE_IMPL=1 + +inherit bash-completion-r1 distutils-r1 multiprocessing optfeature + +MY_P=LinkChecker-${PV} +DESCRIPTION="Check websites for broken links" +HOMEPAGE="https://github.com/linkchecker/linkchecker" +SRC_URI="https://github.com/linkchecker/linkchecker/releases/download/v${PV}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="sqlite" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + app-text/pdfminer[${PYTHON_USEDEP}] + dev-python/parameterized[${PYTHON_USEDEP}] + dev-python/pyftpdlib[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + sys-devel/gettext + ) +" + +distutils_enable_tests pytest + +PATCHES=( "${FILESDIR}/${PN}-9.3-bash-completion.patch" ) + +DOCS=( + doc/changelog.txt + doc/upgrading.txt +) + +python_test() { + # Multiple warnings about unclosed test sockets with epytest + pytest -vra -n "$(makeopts_jobs)" || die +} + +python_install_all() { + distutils-r1_python_install_all + newbashcomp config/linkchecker-completion ${PN} +} + +pkg_postinst() { + optfeature "Virus scanning" app-antivirus/clamav + optfeature "Check links in PDF files" app-text/pdfminer + optfeature "bash-completion support" dev-python/argcomplete +} diff --git a/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild deleted file mode 100644 index a18fd0556c92..000000000000 --- a/net-analyzer/linkchecker/linkchecker-9.4.0-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite?" - -inherit bash-completion-r1 distutils-r1 eutils - -DESCRIPTION="Check websites for broken links" -HOMEPAGE="https://github.com/linkcheck/linkchecker" -SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris" -IUSE="sqlite" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - >=dev-python/requests-2.2[${PYTHON_USEDEP}] -" -DEPEND="" - -RESTRICT="test" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-9.3-bash-completion.patch" - ) - - distutils-r1_python_prepare_all -} - -python_install_all() { - delete_gui() { - rm -rf \ - "${ED}"/usr/bin/linkchecker-gui* \ - "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die - } - - DOCS=( - doc/changelog.txt - doc/development.mdwn - doc/python3.txt - doc/upgrading.txt - ) - distutils-r1_python_install_all - - python_foreach_impl delete_gui - rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die - - newbashcomp config/linkchecker-completion ${PN} -} - -pkg_postinst() { - optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}] - optfeature "Virus scanning" app-antivirus/clamav - optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}] -} diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild deleted file mode 100644 index 32272ea2e2c4..000000000000 --- a/net-analyzer/linkchecker/linkchecker-9999.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite?" - -EGIT_REPO_URI="https://github.com/linkcheck/linkchecker.git" -inherit bash-completion-r1 distutils-r1 eutils git-r3 - -DESCRIPTION="Check websites for broken links" -HOMEPAGE="https://github.com/linkcheck/linkchecker" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="sqlite" - -RDEPEND=" - dev-python/dnspython[${PYTHON_USEDEP}] - dev-python/pyxdg[${PYTHON_USEDEP}] - >=dev-python/requests-2.4[${PYTHON_USEDEP}] -" -DEPEND="" - -RESTRICT="test" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-9.3-bash-completion.patch" - ) - - distutils-r1_python_prepare_all -} - -python_install_all() { - DOCS=( - doc/changelog.txt - doc/development.mdwn - doc/python3.txt - doc/upgrading.txt - ) - distutils-r1_python_install_all - - rm "${ED}"/usr/share/applications/linkchecker.desktop || die - - newbashcomp config/linkchecker-completion ${PN} -} - -pkg_postinst() { - optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}] - optfeature "Virus scanning" app-antivirus/clamav - optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}] -} diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml index 02dc64200827..6904bacfa7cb 100644 --- a/net-analyzer/linkchecker/metadata.xml +++ b/net-analyzer/linkchecker/metadata.xml @@ -1,11 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>hydrapolic@gmail.com</email> + <name>Tomáš Mózes</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="sqlite">Mozilla Bookmark parsing</flag> </use> <upstream> - <remote-id type="pypi">LinkChecker</remote-id> + <remote-id type="github">linkchecker/linkchecker</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild deleted file mode 100644 index e854b260252b..000000000000 --- a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" -OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source -OUI_FILE="OUI.list-${OUI_DATE}" -HOMEPAGE="https://github.com/alobbs/macchanger" -SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" -SLOT="0" - -PATCHES=( "${FILESDIR}"/${P}-fix-caddr_t.patch ) - -src_configure() { - # Shared data is installed below /lib, see Bug #57046 - econf \ - --bindir="${EPREFIX}/sbin" \ - --datadir="${EPREFIX}/lib" -} - -src_install() { - default - - dodir /usr/bin - dosym /sbin/macchanger /usr/bin/macchanger - dosym /lib/macchanger /usr/share/macchanger -} diff --git a/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild deleted file mode 100644 index 009b018eb6e0..000000000000 --- a/net-analyzer/macchanger/macchanger-1.7.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" -OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source -OUI_FILE="OUI.list-${OUI_DATE}" -HOMEPAGE="https://github.com/alobbs/macchanger" -SRC_URI="https://github.com/alobbs/macchanger/releases/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -KEYWORDS="amd64 arm ppc sparc x86" -SLOT="0" - -src_configure() { - # Shared data is installed below /lib, see Bug #57046 - econf \ - --bindir=/sbin \ - --datadir=/lib -} - -src_install() { - default - - dodoc AUTHORS ChangeLog NEWS README - - dodir /usr/bin - dosym /sbin/macchanger /usr/bin/macchanger - dosym /lib/macchanger /usr/share/macchanger -} diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild new file mode 100644 index 000000000000..5ec79a35f5a7 --- /dev/null +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces" +OUI_DATE="20091029" # Generated with tools/IEEE_OUI.py in the source +OUI_FILE="OUI.list-${OUI_DATE}" +HOMEPAGE="https://github.com/alobbs/macchanger" +SRC_URI=" + https://github.com/alobbs/macchanger/releases/download/${PV/_p*}/${P/_p*}.tar.gz + mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz +" +LICENSE="GPL-2" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" +SLOT="0" +IUSE="split-usr" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-fix-caddr_t.patch + "${WORKDIR}"/debian/patches/02-fix_usage_message.patch + "${WORKDIR}"/debian/patches/06-update_OUI_list.patch + "${WORKDIR}"/debian/patches/08-fix_random_MAC_choice.patch + "${WORKDIR}"/debian/patches/check-random-device-read-errors.patch + "${WORKDIR}"/debian/patches/verify-changed-MAC.patch + +) +S=${WORKDIR}/${P/_p*} + +src_configure() { + # Shared data is installed below /lib, see Bug #57046 + econf \ + --bindir="${EPREFIX}/sbin" \ + --datadir="${EPREFIX}/lib" +} + +src_install() { + default + + newdoc "${WORKDIR}"/debian/changelog debian.changelog + + # Can cleanup a while after bug #889922 is fixed + if use split-usr ; then + dodir /usr/bin + dosym -r /sbin/macchanger /usr/bin/macchanger + fi + + dosym ../../lib/macchanger /usr/share/macchanger +} diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild index 1aa5414b43a6..bfb18bf3ace8 100644 --- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild +++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 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 @@ -12,7 +12,7 @@ SRC_URI=" mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz " LICENSE="GPL-2" -KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86" SLOT="0" PATCHES=( @@ -38,7 +38,5 @@ src_install() { newdoc "${WORKDIR}"/debian/changelog debian.changelog - dodir /usr/bin - dosym ../../sbin/macchanger /usr/bin/macchanger dosym ../../lib/macchanger /usr/share/macchanger } diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml index 27fa81884460..d7c1ebb0a46c 100644 --- a/net-analyzer/macchanger/metadata.xml +++ b/net-analyzer/macchanger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/masscan/Manifest b/net-analyzer/masscan/Manifest index a852695a753c..dc829a5d3237 100644 --- a/net-analyzer/masscan/Manifest +++ b/net-analyzer/masscan/Manifest @@ -1,2 +1 @@ -DIST masscan-1.0.4.tar.gz 343513 BLAKE2B e50789c8a2246c4109990e93c9c53cf68b2b555955f675e1a9acd4074c2b85773aba58f3644db1f98a88c4cff85cff5a9035f2fbc56978103458dc34e6dc353a SHA512 eb82d8ad4d6a5c77cf79197e18470a68f7c361f0785180d631e9625578e90af6ffdaa45b728349da5a1cb945a8f902541b8f708be8a4075737ccb06e948d6e2b -DIST masscan-1.0.5.tar.gz 353901 BLAKE2B 83145955b42f660788fdd7687b0a88ad84d6f31a4f99fc1fe4691f266f3c3492882334d9f0b4acf3c31d33950daedda56b6623cd3ba6ef9a27914613f09d485b SHA512 55d58234994ebea10bcb3f45a24cdb51b020350faa116aee3a48861a119f66c339d1f533c978f52e37ccf5266be6fd2802765f13461d94eb28ec8d18c68e2f88 +DIST masscan-1.3.2.tar.gz 463449 BLAKE2B 5509027c00871b2242e419ab7cf3f775d7ee46e1882a27c52447ca442432712d742c686acbf4daa7307b791da06effa23b8790fc0561a42a4e8ed4c2f0be7713 SHA512 b0709f6f937a0e86c6913407c3bc60187074395ffff7a7a2bb54b23824d72982510e44fb1b1e7dcba85c4ad25ab1a623597661db43d9046165ba865cd9bd5b27 diff --git a/net-analyzer/masscan/masscan-1.0.4.ebuild b/net-analyzer/masscan/masscan-1.0.4.ebuild deleted file mode 100644 index a24963afe763..000000000000 --- a/net-analyzer/masscan/masscan-1.0.4.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="Mass IP port scanner" -HOMEPAGE="https://github.com/robertdavidgraham/masscan" -SRC_URI="https://github.com/robertdavidgraham/masscan/archive/${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="AGPL-3" -KEYWORDS="~amd64 ~x86" - -RDEPEND="net-libs/libpcap" - -src_prepare(){ - default - - sed -i \ - -e '/$(CC)/s!$(CFLAGS)!$(LDFLAGS) $(CFLAGS)!g' \ - -e '/^GITVER :=/s!= .(.*!=!g' \ - -e '/^SYS/s|gcc|$(CC)|g' \ - -e '/^CFLAGS =/{s,=,+=,;s,-g -ggdb,,;s,-O3,,;}' \ - Makefile || die - - tc-export CC -} - -src_install() { - dobin bin/masscan - - insinto /etc/masscan - doins data/exclude.conf - doins "${FILESDIR}"/masscan.conf - - mv doc/bot.{hml,html} || die - dodoc doc/bot.html *.md - - doman doc/masscan.8 -} diff --git a/net-analyzer/masscan/masscan-1.0.5.ebuild b/net-analyzer/masscan/masscan-1.3.2.ebuild index fe850f770c51..6a290f96f458 100644 --- a/net-analyzer/masscan/masscan-1.0.5.ebuild +++ b/net-analyzer/masscan/masscan-1.3.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit toolchain-funcs DESCRIPTION="Mass IP port scanner" @@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~x86" RDEPEND="net-libs/libpcap" -src_prepare(){ +src_prepare() { default sed -i \ diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml index 0009b85ef1f3..f43206ae9b97 100644 --- a/net-analyzer/masscan/metadata.xml +++ b/net-analyzer/masscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild index ab930a39ba20..457087b6b4a1 100644 --- a/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild +++ b/net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools DESCRIPTION="MBrowse is a graphical MIB browser" HOMEPAGE="https://sourceforge.net/projects/mbrowse/" -SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" DEPEND=" dev-libs/glib @@ -21,6 +22,7 @@ DEPEND=" RDEPEND="${DEPEND}" DOCS=( AUTHORS README ChangeLog ) + PATCHES=( "${FILESDIR}"/${PN}-0.4.3-flags.patch "${FILESDIR}"/${PN}-0.4.3-fno-common.patch @@ -32,6 +34,5 @@ src_prepare() { } src_configure() { - econf \ - --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)" + econf --with-snmp-lib="${EPREFIX}/usr/$(get_libdir)" } diff --git a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild deleted file mode 100644 index fea497f3bb7a..000000000000 --- a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools - -DESCRIPTION="MBrowse is a graphical MIB browser" -HOMEPAGE="https://sourceforge.net/projects/mbrowse/" -SRC_URI="mirror://sourceforge/${PN}/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -DEPEND=" - dev-libs/glib - net-analyzer/net-snmp - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 -" -RDEPEND="${DEPEND}" - -DOCS=( AUTHORS README ChangeLog ) - -src_prepare() { - sed -i \ - -e '/LDFLAGS=/d' \ - acinclude.m4 || die - eautoreconf -} diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml index 600ef9a54661..89fe5c5b52d8 100644 --- a/net-analyzer/mbrowse/metadata.xml +++ b/net-analyzer/mbrowse/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild index 7bfcea86d3db..4f83216b0ca3 100644 --- a/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild +++ b/net-analyzer/mdns-scan/mdns-scan-0.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,10 +12,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="" -RDEPEND="${DEPEND}" -BDEPEND="" - src_prepare() { sed -i "s#-Wall -W -g -O0 -pipe#${CFLAGS} ${LDFLAGS}#" Makefile sed -i "s#-o #${CFLAGS} ${LDFLAGS} -o #" Makefile diff --git a/net-analyzer/mdns-scan/metadata.xml b/net-analyzer/mdns-scan/metadata.xml index f4c696b2c619..a0fddf470150 100644 --- a/net-analyzer/mdns-scan/metadata.xml +++ b/net-analyzer/mdns-scan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <name>Rick Farina</name> diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml index 58f5863c9fea..a1913be1786e 100644 --- a/net-analyzer/metadata.xml +++ b/net-analyzer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The net-analyzer category contains network analysis software. @@ -29,4 +29,3 @@ Kategoria net-analyzer zawiera programy do analizowania sieci. </longdescription> </catmetadata> - diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest deleted file mode 100644 index 09d5598966ee..000000000000 --- a/net-analyzer/metasploit/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST metasploit-4.17.21.tar.gz 28812125 BLAKE2B 15ff8ccac99d783b7b9cd20d6512df551b3143b4947d2f347b2558d1bafd2861d41fe6b051034c75cd25030ad85d26f261ffe9149dd27d551f92f17fcc0b4075 SHA512 00763f515bc6b556d4dbe15a7c58fac3c7febb64fb339fd5c05ad2b18b5b55bdf8815daca35f24bb22bea3d376db4f4610918730d813079e5ac3f8d5ad16d2d9 diff --git a/net-analyzer/metasploit/files/database.yml b/net-analyzer/metasploit/files/database.yml deleted file mode 100644 index 403191669cca..000000000000 --- a/net-analyzer/metasploit/files/database.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# The tests currently use the development user -# https://dev.metasploit.com/redmine/issues/8418 -# - -development: - adapter: "postgresql" - database: "msf_test_database" - username: "msf_test_user" - password: "secure" - port: 5432 - host: "localhost" - pool: 256 - timeout: 5 - -production: - adapter: "postgresql" - database: "msf_database" - username: "msf_user" - password: "secure" - port: 5432 - host: "localhost" - pool: 256 - timeout: 5 - -test: - adapter: "postgresql" - database: "msf_test_database" - username: "msf_test_user" - password: "secure" - port: 5432 - host: "localhost" - pool: 256 - timeout: 5 diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml deleted file mode 100644 index 1edaa58c665f..000000000000 --- a/net-analyzer/metasploit/metadata.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>zerochaos@gentoo.org</email> - <name>Rick Farina</name> - <description>Very delicate package, ask before you touch please</description> - </maintainer> - <use> - <flag name="development">Install dependencies needed for metasploit and exploit development</flag> - <flag name="nexpose">Enable the plugin to integrate with nexpose</flag> - <flag name="oracle">Enable restricted oracle modules which have additional deps</flag> - <flag name="pcap">Enable libpcap for packet sniffing</flag> - </use> - <upstream> - <remote-id type="github">rapid7/metasploit-framework</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild b/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild deleted file mode 100644 index f06d33d3ee27..000000000000 --- a/net-analyzer/metasploit/metasploit-4.17.21-r6.ebuild +++ /dev/null @@ -1,353 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -#never ever ever have more than one ruby in here -USE_RUBY="ruby24" -inherit eutils ruby-ng - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" - EGIT_BRANCH="4.x" - EGIT_CHECKOUT_DIR="${WORKDIR}"/all - inherit git-r3 - KEYWORDS="~arm" - SLOT="9999" -else - ##Tags https://github.com/rapid7/metasploit-framework/releases - MY_PV=${PV/_p/-} - SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~x86" - RUBY_S="${PN}-framework-${MY_PV}" - inherit eapi7-ver - SLOT="$(ver_cut 1).$(ver_cut 2)" -fi - -DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code" -HOMEPAGE="http://www.metasploit.org/" -LICENSE="BSD" -IUSE="development +java nexpose oracle +pcap test" - -#multiple known bugs with tests reported upstream and ignored -#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) -RESTRICT="strip test" - -#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort -RUBY_COMMON_DEPEND="virtual/ruby-ssl - >=dev-ruby/actionpack-4.2.6:4.2 - >=dev-ruby/activerecord-4.2.6:4.2 - >=dev-ruby/activesupport-4.2.6:4.2 - dev-ruby/backports - dev-ruby/bcrypt-ruby - dev-ruby/bcrypt_pbkdf - dev-ruby/bit-struct - dev-ruby/bundler - dev-ruby/dnsruby - dev-ruby/faker:0 - dev-ruby/faraday - dev-ruby/filesize:* - dev-ruby/jsobfu:* - dev-ruby/json:* - dev-ruby/metasm:* - dev-ruby/metasploit-concern - <dev-ruby/metasploit-credential-3.0.0 - <dev-ruby/metasploit_data_models-3.0.0 - dev-ruby/metasploit-model - dev-ruby/metasploit-payloads:1.3.53 - dev-ruby/metasploit_payloads-mettle:0.4.2 - dev-ruby/mqtt - dev-ruby/msgpack - dev-ruby/net-ssh:* - dev-ruby/ed25519 - dev-ruby/nokogiri - dev-ruby/octokit - dev-ruby/openssl-ccm:1.2.1 - dev-ruby/packetfu:1.1.13 - dev-ruby/patch_finder - dev-ruby/pdf-reader:* - ~dev-ruby/pg-0.21.0 - dev-ruby/railties:* - dev-ruby/rb-readline - dev-ruby/recog:* - dev-ruby/redcarpet - dev-ruby/rex-arch - dev-ruby/rex-bin_tools - dev-ruby/rex-core - dev-ruby/rex-encoder - dev-ruby/rex-exploitation - dev-ruby/rex-java - dev-ruby/rex-mime - dev-ruby/rex-nop - dev-ruby/rex-ole - <dev-ruby/rex-powershell-0.1.78 - dev-ruby/rex-random_identifier - dev-ruby/rex-registry - dev-ruby/rex-rop_builder - dev-ruby/rex-socket - dev-ruby/rex-sslscan - dev-ruby/rex-struct2 - dev-ruby/rex-text - dev-ruby/rex-zip - dev-ruby/ruby-macho - dev-ruby/rubyntlm - dev-ruby/ruby_smb:* - dev-ruby/rubyzip:* - dev-ruby/sqlite3 - dev-ruby/sshkey - dev-ruby/tzinfo:* - dev-ruby/windows_error - dev-ruby/xdr:2.0.0 - dev-ruby/xmlrpc - java? ( dev-ruby/rjb ) - nexpose? ( dev-ruby/nexpose ) - oracle? ( dev-ruby/ruby-oci8 ) - pcap? ( dev-ruby/pcaprub:* - dev-ruby/network_interface ) - development? ( dev-ruby/fivemat - dev-ruby/pry - dev-ruby/redcarpet - dev-ruby/yard - >=dev-ruby/rake-10.0.0 - >=dev-ruby/factory_girl-4.1.0 )" - #lorcon doesn't support ruby21 - #lorcon? ( net-wireless/lorcon[ruby] ) -ruby_add_bdepend "${RUBY_COMMON_DEPEND} - test? ( >=dev-ruby/factory_girl-4.1.0 - dev-ruby/fivemat - dev-ruby/database_cleaner - >=dev-ruby/rspec-2.12 - dev-ruby/shoulda-matchers - dev-ruby/timecop - >=dev-ruby/rake-10.0.0 )" -ruby_add_rdepend "${RUBY_COMMON_DEPEND}" - -COMMON_DEPEND="dev-db/postgresql[server] - || ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] ) - net-analyzer/nmap" -RDEPEND+=" ${COMMON_DEPEND} - >=app-eselect/eselect-metasploit-0.16" - -QA_PREBUILT=" - usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin - usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin - usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso - usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin - usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf - usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so - usr/lib*/${PN}${SLOT}/data/exploits/* - usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so - usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so - usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so - usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin - " - -pkg_setup() { - if use test; then - su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail - su postgres -c "createuser msf_test_user -d -S -R" - if [ $? -ne 0 ]; then - su postgres -c "dropuser msf_test_user" || die - su postgres -c "createuser msf_test_user -d -S -R" || die - fi - su postgres -c "createdb --owner=msf_test_user msf_test_database" || die - fi - ruby-ng_pkg_setup -} - -all_ruby_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - else - default_src_unpack -# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all -# rm -r msf3 - #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb) - #msf_version=${msf_version#*=} - fi -} - -all_ruby_prepare() { - # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs - #epatch "${FILESDIR}/agix_psexec_pull-2657.patch" - eapply_user - - #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run - rm -r data/cpuinfo - - #remove unneeded ruby bundler versioning files - #Gemfile.lock contains the versions tested by the msf team but not the hard requirements - #we regen this file in each_ruby_prepare - rm Gemfile.lock - - #The Gemfile contains real known deps - sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die - #use released packetfu - sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die - #use the stable pg - #https://github.com/rapid7/metasploit-framework/issues/10234 - sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die - #git gems are only for ruby24 support and we are not there yet - sed -i "/git:/d" Gemfile || die - - #now we edit the Gemfile based on use flags - if ! use pcap; then - sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die - fi - if ! use nexpose; then - sed -i -e "/nexpose/d" metasploit-framework.gemspec || die - fi - #no support for nessus right now - #if ! use nessus; then - sed -i -e "/nessus/d" metasploit-framework.gemspec || die - #fi - - #OpenVAS support dropped on net-analyzer/metasploit. Bug:692076 - #openvas-omp is deprecated and masked for removal. Bug:692076 - #Remove openvas-omp in gemspec. Bug:698762 - sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die - - #even if we pass --without=blah bundler still calculates the deps and messes us up - if ! use development; then - sed -i -e "/^group :development do/,/^end$/d" Gemfile || die - fi - if ! use test; then - sed -i -e "/^group :test/,/^end$/d" Gemfile || die - fi - if ! use test && ! use development; then - sed -i -e "/^group :development/,/^end$/d" Gemfile || die - fi - #We don't need simplecov - sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die - sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die - - #we need to edit the gemspec too, since it tries to call git instead of anything sane - #probably a better way to fix this... if I care at some point - sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die - - #https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo - sed -i '/tzinfo-data/d' metasploit-framework.gemspec - - #fails without faraday in Gemfile.lock - #despite activesupport(?) needing it, it doesn't end up there :-( - sed -i "/'activesupport'/a \ \ spec.add_runtime_dependency 'faraday'" metasploit-framework.gemspec - - #let's bogart msfupdate - rm msfupdate - echo "#!/bin/sh" > msfupdate - echo "echo \"[*]\"" >> msfupdate - echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate - echo "echo \"[*]\"" >> msfupdate - echo "echo \"\"" >> msfupdate - if [[ ${PV} == "9999" ]] ; then - echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate - echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate - echo "else" >> msfupdate - echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate - echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate - echo "fi" >> msfupdate - else - echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate - echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate - echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate - fi - #this is set executable in src_install - - #install our database.yml file before tests are run - cp "${FILESDIR}"/database.yml config/ - -} - -each_ruby_prepare() { - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die - - #force all metasploit executables to use desired ruby version - #https://dev.metasploit.com/redmine/issues/8357 - for file in $(ls -1 msf*) - do - #poorly adapted from python.eclass - sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed" - done -} - -each_ruby_test() { - #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox - - #we bogart msfupdate so no point in trying to test it - rm spec/msfupdate_spec.rb || die - #we don't really want to be uploading to virustotal during the tests - rm spec/tools/virustotal_spec.rb || die - - # https://dev.metasploit.com/redmine/issues/8425 - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die - - MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die - su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" -} - -each_ruby_install() { - #Tests have already been run, we don't need this stuff - rm -r spec || die - rm -r test || die - rm Gemfile.lock || die - - #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. - # should be as simple as copying everything into the target... - dodir /usr/lib/${PN}${SLOT} - cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" - rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib${PN}${SLOT}/README.md - fowners -R root:0 / - -} - -all_ruby_install() { - # do not remove LICENSE, bug #238137 - dodir /usr/share/doc/${PF} - cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" - - fperms +x /usr/lib/${PN}${SLOT}/msfupdate - - #tell revdep-rebuild to ignore binaries meant for the target - dodir /etc/revdep-rebuild - cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} - #These dirs contain prebuilt binaries for running on the TARGET not the HOST - SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" - SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" - EOF -} - -pkg_postinst() { - elog "Before use you should run 'env-update' and '. /etc/profile'" - elog "otherwise you may be missing important environmental variables." - - elog "You need to prepare the database by running:" - elog "emerge --config postgresql" - elog "/etc/init.d/postgresql-<version> start" - elog "emerge --config =metasploit-${PV}" - - "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT} - - einfo - elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary" -} - -pkg_config() { - einfo "If the following fails, it is likely because you forgot to start/config postgresql first" - su postgres -c "createuser msf_user -D -S -R" - su postgres -c "createdb --owner=msf_user msf_database" -} diff --git a/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild deleted file mode 100644 index 54db9b0d61c9..000000000000 --- a/net-analyzer/metasploit/metasploit-9999.ebuild +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -#never ever ever have more than one ruby in here -USE_RUBY="ruby24" -inherit eutils ruby-ng - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/rapid7/metasploit-framework.git" - EGIT_BRANCH="4.x" - EGIT_CHECKOUT_DIR="${WORKDIR}"/all - inherit git-r3 - KEYWORDS="" - SLOT="9999" -else - ##Tags https://github.com/rapid7/metasploit-framework/releases - MY_PV=${PV/_p/-} - SRC_URI="https://github.com/rapid7/metasploit-framework/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - RUBY_S="${PN}-framework-${MY_PV}" - inherit eapi7-ver - SLOT="$(ver_cut 1).$(ver_cut 2)" -fi - -DESCRIPTION="Advanced framework for developing, testing, and using vulnerability exploit code" -HOMEPAGE="http://www.metasploit.org/" -LICENSE="BSD" -IUSE="development +java nexpose oracle +pcap test" - -#multiple known bugs with tests reported upstream and ignored -#http://dev.metasploit.com/redmine/issues/8418 - worked around (fix user creation when possible) -RESTRICT="strip test" - -#grep spec.add_runtime_dependency metasploit-framework.gemspec | sort -RUBY_COMMON_DEPEND="virtual/ruby-ssl - >=dev-ruby/actionpack-4.2.6:4.2 - >=dev-ruby/activerecord-4.2.6:4.2 - >=dev-ruby/activesupport-4.2.6:4.2 - dev-ruby/backports - dev-ruby/bcrypt-ruby - dev-ruby/bcrypt_pbkdf - dev-ruby/bit-struct - dev-ruby/bundler - dev-ruby/dnsruby - dev-ruby/faker:0 - dev-ruby/filesize:* - dev-ruby/jsobfu:* - dev-ruby/json:* - dev-ruby/metasm:* - dev-ruby/metasploit-concern - <dev-ruby/metasploit-credential-3.0.0 - <dev-ruby/metasploit_data_models-3.0.0 - dev-ruby/metasploit-model - dev-ruby/metasploit-payloads:1.3.53 - dev-ruby/metasploit_payloads-mettle:0.4.2 - dev-ruby/mqtt - dev-ruby/msgpack - dev-ruby/net-ssh:* - dev-ruby/ed25519 - dev-ruby/nokogiri - dev-ruby/octokit - dev-ruby/openssl-ccm:1.2.1 - dev-ruby/packetfu:1.1.13 - dev-ruby/patch_finder - dev-ruby/pdf-reader:* - ~dev-ruby/pg-0.21.0 - dev-ruby/railties:* - dev-ruby/rb-readline - dev-ruby/recog:* - dev-ruby/redcarpet - dev-ruby/rex-arch - dev-ruby/rex-bin_tools - dev-ruby/rex-core - dev-ruby/rex-encoder - dev-ruby/rex-exploitation - dev-ruby/rex-java - dev-ruby/rex-mime - dev-ruby/rex-nop - dev-ruby/rex-ole - <dev-ruby/rex-powershell-0.1.78 - dev-ruby/rex-random_identifier - dev-ruby/rex-registry - dev-ruby/rex-rop_builder - dev-ruby/rex-socket - dev-ruby/rex-sslscan - dev-ruby/rex-struct2 - dev-ruby/rex-text - dev-ruby/rex-zip - dev-ruby/ruby-macho - dev-ruby/rubyntlm - dev-ruby/ruby_smb:* - dev-ruby/rubyzip:* - dev-ruby/sqlite3 - dev-ruby/sshkey - dev-ruby/tzinfo:* - dev-ruby/windows_error - dev-ruby/xdr:2.0.0 - dev-ruby/xmlrpc - java? ( dev-ruby/rjb ) - nexpose? ( dev-ruby/nexpose ) - oracle? ( dev-ruby/ruby-oci8 ) - pcap? ( dev-ruby/pcaprub:* - dev-ruby/network_interface ) - development? ( dev-ruby/fivemat - dev-ruby/pry - dev-ruby/redcarpet - dev-ruby/yard - >=dev-ruby/rake-10.0.0 - >=dev-ruby/factory_girl-4.1.0 )" - #lorcon doesn't support ruby21 - #lorcon? ( net-wireless/lorcon[ruby] ) -ruby_add_bdepend "${RUBY_COMMON_DEPEND} - test? ( >=dev-ruby/factory_girl-4.1.0 - dev-ruby/fivemat - dev-ruby/database_cleaner - >=dev-ruby/rspec-2.12 - dev-ruby/shoulda-matchers - dev-ruby/timecop - >=dev-ruby/rake-10.0.0 )" -ruby_add_rdepend "${RUBY_COMMON_DEPEND}" - -COMMON_DEPEND="dev-db/postgresql[server] - || ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] ) - net-analyzer/nmap" -RDEPEND+=" ${COMMON_DEPEND} - >=app-eselect/eselect-metasploit-0.16" - -QA_PREBUILT=" - usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x86_solaris.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x86_bsd.bin - usr/lib*/${PN}${SLOT}/data/templates/template_x64_bsd.bin - usr/lib*/${PN}${SLOT}/data/templates/template_mipsbe_linux.bin - usr/lib*/${PN}${SLOT}/data/templates/template_mipsle_linux.bin - usr/lib*/${PN}${SLOT}/data/meterpreter/msflinker_linux_x86.bin - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_sniffer.lso - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_networkpug.lso - usr/lib*/${PN}${SLOT}/data/meterpreter/ext_server_stdapi.lso - usr/lib*/${PN}${SLOT}/data/exploits/CVE-2013-2171.bin - usr/lib*/${PN}${SLOT}/data/exploits/CVE-2014-3153.elf - usr/lib*/${PN}${SLOT}/data/exploits/mysql/lib_mysqludf_sys_32.so - usr/lib*/${PN}${SLOT}/data/exploits/* - usr/lib*/${PN}${SLOT}/data/android/libs/x86/libndkstager.so - usr/lib*/${PN}${SLOT}/data/android/libs/mips/libndkstager.so - usr/lib*/${PN}${SLOT}/data/android/libs/armeabi/libndkstager.so - usr/lib*/${PN}${SLOT}/data/templates/template_x86_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_armle_linux_dll.bin - usr/lib*/${PN}${SLOT}/data/templates/template_aarch64_linux.bin - " - -pkg_setup() { - if use test; then - su postgres -c "dropdb msf_test_database" #this is intentionally allowed to fail - su postgres -c "createuser msf_test_user -d -S -R" - if [ $? -ne 0 ]; then - su postgres -c "dropuser msf_test_user" || die - su postgres -c "createuser msf_test_user -d -S -R" || die - fi - su postgres -c "createdb --owner=msf_test_user msf_test_database" || die - fi - ruby-ng_pkg_setup -} - -all_ruby_unpack() { - if [[ ${PV} == "9999" ]] ; then - git-r3_src_unpack - else - default_src_unpack -# mv "${WORKDIR}"/all/msf3/* "${WORKDIR}"/all -# rm -r msf3 - #msf_version=$(grep --color=never "CURRENT_VERSION =" ${S}/spec/lib/msf/core/framework_spec.rb) - #msf_version=${msf_version#*=} - fi -} - -all_ruby_prepare() { - # add psexec patch from pull request 2657 to allow custom exe templates from any files, bypassing most AVs - #epatch "${FILESDIR}/agix_psexec_pull-2657.patch" - eapply_user - - #remove random "cpuinfo" binaries which a only needed to detect which bundled john to run - rm -r data/cpuinfo - - #remove unneeded ruby bundler versioning files - #Gemfile.lock contains the versions tested by the msf team but not the hard requirements - #we regen this file in each_ruby_prepare - rm Gemfile.lock - - #The Gemfile contains real known deps - sed -i "/gem 'fivemat'/s/, '1.2.1'//" Gemfile || die - #use released packetfu - sed -i "s/1.1.13.pre/1.1.13/" metasploit-framework.gemspec || die - #use the stable pg - #https://github.com/rapid7/metasploit-framework/issues/10234 - sed -i "s/dependency 'pg', '0.20.0'/dependency 'pg', '0.21.0'/" metasploit-framework.gemspec || die - #git gems are only for ruby24 support and we are not there yet - sed -i "/git:/d" Gemfile || die - - #now we edit the Gemfile based on use flags - if ! use pcap; then - sed -i -e "/^group :pcap do/,/^end$/d" Gemfile || die - fi - if ! use nexpose; then - sed -i -e "/nexpose/d" metasploit-framework.gemspec || die - fi - #no support for nessus right now - #if ! use nessus; then - sed -i -e "/nessus/d" metasploit-framework.gemspec || die - #fi - - #OpenVAS support dropped on net-analyzer/metasploit. Bug:692076 - #openvas-omp is deprecated and masked for removal. Bug:692076 - #Remove openvas-omp in gemspec. Bug:698762 - sed -i -e "/openvas-omp/d" metasploit-framework.gemspec || die - - #even if we pass --without=blah bundler still calculates the deps and messes us up - if ! use development; then - sed -i -e "/^group :development do/,/^end$/d" Gemfile || die - fi - if ! use test; then - sed -i -e "/^group :test/,/^end$/d" Gemfile || die - fi - if ! use test && ! use development; then - sed -i -e "/^group :development/,/^end$/d" Gemfile || die - fi - #We don't need simplecov - sed -i -e "/^group :coverage/,/^end$/d" Gemfile || die - sed -i -e "s#require 'simplecov'##" spec/spec_helper.rb || die - - #we need to edit the gemspec too, since it tries to call git instead of anything sane - #probably a better way to fix this... if I care at some point - sed -i -e "/^ spec.files/,/^ }/d" metasploit-framework.gemspec || die - - #https://bugs.gentoo.org/show_bug.cgi?id=584522 no tzinfo-data by choice in gentoo - sed -i '/tzinfo-data/d' metasploit-framework.gemspec - - #let's bogart msfupdate - rm msfupdate - echo "#!/bin/sh" > msfupdate - echo "echo \"[*]\"" >> msfupdate - echo "echo \"[*] Attempting to update the Metasploit Framework...\"" >> msfupdate - echo "echo \"[*]\"" >> msfupdate - echo "echo \"\"" >> msfupdate - if [[ ${PV} == "9999" ]] ; then - echo "if [ -x /usr/bin/smart-live-rebuild ]; then" >> msfupdate - echo " smart-live-rebuild -f net-analyzer/metasploit" >> msfupdate - echo "else" >> msfupdate - echo " echo \"Please install app-portage/smart-live-rebuild for a better experience.\"" >> msfupdate - echo "emerge --oneshot \"=${CATEGORY}/${PF}\"" >> msfupdate - echo "fi" >> msfupdate - else - echo "echo \"Unable to update tagged version of metasploit.\"" >> msfupdate - echo "echo \"If you want the latest please install and eselect the live version (metasploit9999)\"" >> msfupdate - echo "echo \"emerge metasploit:9999 -vat && eselect metasploit set metasploit9999\"" >> msfupdate - fi - #this is set executable in src_install - - #install our database.yml file before tests are run - cp "${FILESDIR}"/database.yml config/ - -} - -each_ruby_prepare() { - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die - MSF_ROOT="." BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die - - #force all metasploit executables to use desired ruby version - #https://dev.metasploit.com/redmine/issues/8357 - for file in $(ls -1 msf*) - do - #poorly adapted from python.eclass - sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?ruby\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${RUBY}:" -i "${file}" || die "Conversion of shebang in '${file}' failed" - done -} - -each_ruby_test() { - #review dev-python/pymongo for ways to make the test compatible with FEATURES=network-sandbox - - #we bogart msfupdate so no point in trying to test it - rm spec/msfupdate_spec.rb || die - #we don't really want to be uploading to virustotal during the tests - rm spec/tools/virustotal_spec.rb || die - - # https://dev.metasploit.com/redmine/issues/8425 - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:create || die - BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake db:migrate || die - - MSF_DATABASE_CONFIG=config/database.yml BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle exec rake || die - su postgres -c "dropuser msf_test_user" || die "failed to cleanup msf_test-user" -} - -each_ruby_install() { - #Tests have already been run, we don't need this stuff - rm -r spec || die - rm -r test || die - rm Gemfile.lock || die - - #I'm 99% sure that this will only work for as long as we only support one ruby version. Creativity will be needed if we wish to support multiple. - # should be as simple as copying everything into the target... - dodir /usr/lib/${PN}${SLOT} - cp -R * "${ED}"/usr/lib/${PN}${SLOT} || die "Copy files failed" - rm -Rf "${ED}"/usr/lib/${PN}${SLOT}/documentation "${ED}"/usr/lib/${PN}${SLOT}/README.md - fowners -R root:0 / - -} - -all_ruby_install() { - # do not remove LICENSE, bug #238137 - dodir /usr/share/doc/${PF} - cp -R {documentation,README.md} "${ED}"/usr/share/doc/${PF} || die - ln -s "../../share/doc/${PF}/documentation" "${ED}/usr/lib/${PN}${SLOT}/documentation" - - fperms +x /usr/lib/${PN}${SLOT}/msfupdate - - #tell revdep-rebuild to ignore binaries meant for the target - dodir /etc/revdep-rebuild - cat <<-EOF > "${ED}"/etc/revdep-rebuild/99-metasploit${SLOT} - #These dirs contain prebuilt binaries for running on the TARGET not the HOST - SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/meterpreter" - SEARCH_DIRS_MASK="/usr/lib/${PN}${SLOT}/data/exploits" - EOF -} - -pkg_postinst() { - elog "Before use you should run 'env-update' and '. /etc/profile'" - elog "otherwise you may be missing important environmental variables." - - elog "You need to prepare the database by running:" - elog "emerge --config postgresql" - elog "/etc/init.d/postgresql-<version> start" - elog "emerge --config =metasploit-${PV}" - - "${EROOT}"/usr/bin/eselect metasploit set --use-old ${PN}${SLOT} - - einfo - elog "Adjust /usr/lib/${PN}${SLOT}/config/database.yml if necessary" -} - -pkg_config() { - einfo "If the following fails, it is likely because you forgot to start/config postgresql first" - su postgres -c "createuser msf_user -D -S -R" - su postgres -c "createdb --owner=msf_user msf_database" -} diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest deleted file mode 100644 index fef9de860f0a..000000000000 --- a/net-analyzer/mk-livestatus/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d -DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4 -DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6f213bd3b58a32c0bd377a3c0c0ead34c75394539eaec08d40ee9ea16ca2534158ee4c6823387f3fc3648a02a22d86e0395 SHA512 8afeb6e750d7eb310380153af91f9c6f889f6e350e26dc97f923a49b2e3cc6c0b866f893664ad5d9fd9c0e8671b0a69e1267e464e4de9faf75a2eb24536ae014 -DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6 diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch deleted file mode 100644 index 5b5009bfaa01..000000000000 --- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Wed, 21 Aug 2013 23:00:21 +0200 -Subject: [PATCH 1/2] MEDIUM: Drop default strip - -See: https://bugs.gentoo.org/show_bug.cgi?id=482026 - ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index deab289..126b503 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -55,7 +55,7 @@ livestatus_so_CFLAGS = -fPIC - - livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES) - -rm -f plugin.so -- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ -+ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++ - - all-local: livestatus.o - diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch deleted file mode 100644 index 264d9bb899b6..000000000000 --- a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin <bertrand@jacquin.bzh> -Date: Wed, 21 Aug 2013 23:00:21 +0200 -Subject: [PATCH 2/2] MINOR: test: Remove the usage of - Perl::Critic::Policy::Modules::ProhibitAutomaticExportation - -This does not exist since -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4 - -See: https://bugs.gentoo.org/show_bug.cgi?id=482026 ---- - api/perl/t/perlcriticrc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc -index f7e4721..f686dca 100644 ---- a/api/perl/t/perlcriticrc -+++ b/api/perl/t/perlcriticrc -@@ -133,8 +133,6 @@ severity = 3 - [Perl::Critic::Policy::Miscellanea::ProhibitTies] - severity = 4 - --[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords] -- - [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation] - severity = 4 - -@@ -283,4 +281,4 @@ severity = 5 - severity = 5 - - [Perl::Critic::Policy::Variables::RequireNegativeIndices] --severity = 4 -\ No newline at end of file -+severity = 4 diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch deleted file mode 100644 index e0dc8469c15a..000000000000 --- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/logger.h -+++ b/src/logger.h -@@ -27,6 +27,7 @@ - - #include "config.h" // IWYU pragma: keep - #include <syslog.h> -+#include <pthread.h> - - #ifdef CMC - #define LG_DEBUG LOG_INFO -@@ -49,6 +50,8 @@ - extern "C" { - #endif - -+extern pthread_t g_mainthread_id; -+ - void logger(int priority, const char *loginfo, ...) - __attribute__((format(printf, 2, 3))); - void open_logfile(); ---- a/src/module.c -+++ b/src/module.c -@@ -95,7 +95,6 @@ - char g_logfile_path[4096]; - int g_debug_level = 0; - int g_should_terminate = false; --pthread_t g_mainthread_id; - pthread_t *g_clientthread_id; - unsigned long g_max_cached_messages = 500000; - unsigned long g_max_lines_per_logfile = diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch deleted file mode 100644 index abdb2e01691b..000000000000 --- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -62,7 +62,6 @@ - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) -- rm -f $(DESTDIR)$(pkglibdir)/livestatus.so - - clean-local: - rm -f *~ diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch deleted file mode 100644 index 5c267ae2f4cd..000000000000 --- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.5.0_p22-rm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -201,7 +201,6 @@ - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(pkglibdir) - $(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir) -- rm -f $(DESTDIR)$(pkglibdir)/liblivestatus.a - - clean-local: - rm -rf *~ compile_commands.json cppcheck-result.xml html diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml deleted file mode 100644 index 4a90a3fdc4d8..000000000000 --- a/net-analyzer/mk-livestatus/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>bertrand@jacquin.bzh</email> - <name>Bertrand Jacquin</name> - </maintainer> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="nagios4">Generate a <pkg>net-analyzer/nagios</pkg>-4 compatible plugin</flag> - <flag name="boost">Use <pkg>dev-libs/boost</pkg> for ASIO support</flag> - <flag name="re2">Use <pkg>dev-libs/re2</pkg> for regex support</flag> - </use> -</pkgmetadata> diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild deleted file mode 100644 index b36094f1ee3e..000000000000 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) -inherit autotools perl-module python-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data" -HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html" -SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples nagios4 perl python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="!sys-apps/ucspi-unix:0 - perl? ( - dev-lang/perl:0 - virtual/perl-Digest-MD5:0 - virtual/perl-Scalar-List-Utils:0 - >=virtual/perl-Thread-Queue-2.11:0 - virtual/perl-Encode:0 - dev-perl/JSON-XS:0 - ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - perl? ( - dev-perl/Module-Install:0 - virtual/perl-ExtUtils-MakeMaker:0 - virtual/perl-File-Path:0 - virtual/perl-File-Spec:0 - virtual/perl-File-Temp:0 - test? ( - dev-perl/File-Copy-Recursive:0 - dev-perl/Test-Pod:0 - dev-perl/Test-Perl-Critic:0 - dev-perl/Test-Pod-Coverage:0 - dev-perl/Perl-Critic:0 - dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 - dev-perl/Perl-Critic-Deprecated:0 - dev-perl/Perl-Critic-Nits:0 - ) - )" - -# For perl test -SRC_TEST="parallel" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PV}-MEDIUM-Drop-default-strip.patch" - "${FILESDIR}/${PV}-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" -) - -src_prepare() { - default - - # Use system Module::Install instead, it will be copied to $S by - # Module::install itself. - rm -rf api/perl/inc || die - - if use perl; then - # Ensure patches are not applied twice - unset PATCHES - perl-module_src_prepare - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_with nagios4) - - if use perl; then - cd api/perl || die - perl-module_src_configure - fi -} - -src_compile() { - emake - - if use perl; then - cd api/perl || die - perl-module_src_compile - fi -} - -src_test() { - if use perl; then - cd api/perl || die - - export TEST_AUTHOR="Test Author" - perl-module_src_test - fi -} - -src_install() { - emake install DESTDIR="${ED}" - - if use perl; then - cd api/perl || die - perl-module_src_install - cd "${S}" - - if use examples; then - docinto / - newdoc api/perl/README README.perl - - docinto examples - dodoc api/perl/examples/dump.pl - fi - fi - - if use python; then - python_foreach_impl python_domodule api/python/livestatus.py - - if use examples; then - docinto / - newdoc api/python/README README.python - - docinto examples - dodoc api/python/{example,example_multisite,make_nagvis_map}.py - fi - fi -} diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild deleted file mode 100644 index f0e770a07ddb..000000000000 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) -inherit autotools perl-module python-single-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data" -HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html" -SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples nagios4 perl python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="!sys-apps/ucspi-unix:0 - perl? ( - dev-lang/perl:0 - virtual/perl-Digest-MD5:0 - virtual/perl-Scalar-List-Utils:0 - >=virtual/perl-Thread-Queue-2.11:0 - virtual/perl-Encode:0 - dev-perl/JSON-XS:0 - ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - perl? ( - dev-perl/Module-Install:0 - virtual/perl-ExtUtils-MakeMaker:0 - virtual/perl-File-Path:0 - virtual/perl-File-Spec:0 - virtual/perl-File-Temp:0 - test? ( - dev-perl/File-Copy-Recursive:0 - dev-perl/Test-Pod:0 - dev-perl/Test-Perl-Critic:0 - dev-perl/Test-Pod-Coverage:0 - dev-perl/Perl-Critic:0 - dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 - dev-perl/Perl-Critic-Deprecated:0 - dev-perl/Perl-Critic-Nits:0 - ) - )" - -# For perl test -SRC_TEST="parallel" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch" - "${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" -) - -src_prepare() { - default - - # Use system Module::Install instead, it will be copied to $S by - # Module::install itself. - rm -rf api/perl/inc || die - - if use perl; then - # Ensure patches are not applied twice - unset PATCHES - perl-module_src_prepare - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_with nagios4) - - if use perl; then - cd api/perl || die - perl-module_src_configure - fi -} - -src_compile() { - emake - - if use perl; then - cd api/perl || die - perl-module_src_compile - fi -} - -src_test() { - if use perl; then - cd api/perl || die - - export TEST_AUTHOR="Test Author" - perl-module_src_test - fi -} - -src_install() { - emake install DESTDIR="${ED}" - - # install a config file showing whats needed to enable livestatus for nagios - cat <<EOF >"${T}"/nagios.cfg -# Ensure all data is set to event brokers -event_broker_options=-1 -broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o -EOF - # same for icigna - cat <<EOF >"${T}"/icigna.cfg -define module{ - module_name mk-livestatus - module_type neb - path /usr/$(get_libdir)/mk-livestatus/livestatus.o - args /var/lib/icigna/rw/live - } -EOF - insinto /usr/share/mk-livestatus - doins "${T}"/{nagios,icigna}.cfg - - if use perl; then - cd api/perl || die - perl-module_src_install - cd "${S}" - - if use examples; then - docinto / - newdoc api/perl/README README.perl - - docinto examples - dodoc api/perl/examples/dump.pl - fi - fi - - if use python; then - python_foreach_impl python_domodule api/python/livestatus.py - - if use examples; then - docinto / - newdoc api/python/README README.python - - docinto examples - dodoc api/python/{example,example_multisite,make_nagvis_map}.py - fi - fi -} - -pkg_postinst() { - elog "Sample configurations for icigna and nagios are available in" - elog "/usr/share/${PN}" -} diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild deleted file mode 100644 index 071250a73b6b..000000000000 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) -inherit autotools perl-module python-single-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data" -HOMEPAGE="http://mathias-kettner.de/checkmk_livestatus.html" -SRC_URI="http://mathias-kettner.de/download/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="examples nagios4 perl python test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="!sys-apps/ucspi-unix:0 - perl? ( - dev-lang/perl:0 - virtual/perl-Digest-MD5:0 - virtual/perl-Scalar-List-Utils:0 - >=virtual/perl-Thread-Queue-2.11:0 - virtual/perl-Encode:0 - dev-perl/JSON-XS:0 - ) - python? ( ${PYTHON_DEPS} )" -DEPEND="${RDEPEND} - perl? ( - dev-perl/Module-Install:0 - virtual/perl-ExtUtils-MakeMaker:0 - virtual/perl-File-Path:0 - virtual/perl-File-Spec:0 - virtual/perl-File-Temp:0 - test? ( - dev-perl/File-Copy-Recursive:0 - dev-perl/Test-Pod:0 - dev-perl/Test-Perl-Critic:0 - dev-perl/Test-Pod-Coverage:0 - dev-perl/Perl-Critic:0 - dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 - dev-perl/Perl-Critic-Deprecated:0 - dev-perl/Perl-Critic-Nits:0 - ) - )" - -# For perl test -SRC_TEST="parallel" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch" - "${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch" - "${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch - "${FILESDIR}"/${PN}-1.2.8_p26-rm.patch -) - -src_prepare() { - default - - # Use system Module::Install instead, it will be copied to $S by - # Module::install itself. - rm -rf api/perl/inc || die - - if use perl; then - # Ensure patches are not applied twice - unset PATCHES - perl-module_src_prepare - fi - - eautoreconf -} - -src_configure() { - econf \ - $(use_with nagios4) - - if use perl; then - cd api/perl || die - perl-module_src_configure - fi -} - -src_compile() { - emake - - if use perl; then - cd api/perl || die - perl-module_src_compile - fi -} - -src_test() { - if use perl; then - cd api/perl || die - - export TEST_AUTHOR="Test Author" - perl-module_src_test - fi -} - -src_install() { - emake install DESTDIR="${ED}" - - # install a config file showing whats needed to enable livestatus for nagios - cat <<EOF >"${T}"/nagios.cfg -# Ensure all data is set to event brokers -event_broker_options=-1 -broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o -EOF - # same for icigna - cat <<EOF >"${T}"/icigna.cfg -define module{ - module_name ${PN} - module_type neb - path /usr/$(get_libdir)/${PN}/livestatus.o - args /var/lib/icigna/rw/live - } -EOF - insinto /usr/share/${PN} - doins "${T}"/{nagios,icigna}.cfg - - if use perl; then - cd api/perl || die - perl-module_src_install - cd "${S}" - - if use examples; then - docinto / - newdoc api/perl/README README.perl - - docinto examples - dodoc api/perl/examples/dump.pl - fi - fi - - if use python; then - python_domodule api/python/livestatus.py - - if use examples; then - docinto / - newdoc api/python/README README.python - - docinto examples - dodoc api/python/{example,example_multisite,make_nagvis_map}.py - fi - fi -} - -pkg_postinst() { - elog "Sample configurations for icigna and nagios are available in" - elog "/usr/share/${PN}" -} diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild deleted file mode 100644 index a0d42e5b3a7e..000000000000 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) -inherit autotools perl-module python-single-r1 toolchain-funcs - -DESCRIPTION="Nagios/Icinga event broker that allows quick/direct access to your status data" -HOMEPAGE="https://checkmk.com/" -SRC_URI="https://checkmk.com/support/${PV/_}/${P/_}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="boost examples nagios4 perl python re2 test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - !sys-apps/ucspi-unix:0 - net-analyzer/rrdtool:= - boost? ( dev-libs/boost ) - perl? ( - dev-lang/perl:0 - virtual/perl-Digest-MD5:0 - virtual/perl-Scalar-List-Utils:0 - >=virtual/perl-Thread-Queue-2.11:0 - virtual/perl-Encode:0 - dev-perl/JSON-XS:0 - ) - python? ( ${PYTHON_DEPS} ) - re2? ( dev-libs/re2:= ) -" -DEPEND=" - ${RDEPEND} - perl? ( - dev-perl/Module-Install:0 - virtual/perl-ExtUtils-MakeMaker:0 - virtual/perl-File-Path:0 - virtual/perl-File-Spec:0 - virtual/perl-File-Temp:0 - test? ( - dev-perl/File-Copy-Recursive:0 - dev-perl/Test-Pod:0 - dev-perl/Test-Perl-Critic:0 - dev-perl/Test-Pod-Coverage:0 - dev-perl/Perl-Critic:0 - dev-perl/Perl-Critic-Policy-Dynamic-NoIndirect:0 - dev-perl/Perl-Critic-Deprecated:0 - dev-perl/Perl-Critic-Nits:0 - ) - ) -" - -PATCHES=( - "${FILESDIR}"/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch - "${FILESDIR}"/${PN}-1.5.0_p22-rm.patch -) -S=${WORKDIR}/${P/_} - -src_prepare() { - default - - # Use system Module::Install instead, it will be copied to $S by - # Module::install itself. - rm -rf api/perl/inc || die - - # failing test - rm -rf api/perl/t/20-Monitoring-Livestatus-test_socket.t || die - - if use perl; then - # Ensure patches are not applied twice - unset PATCHES - perl-module_src_prepare - fi - - eautoreconf -} - -src_configure() { - tc-export CC CXX - - econf \ - $(use_with boost boost-asio) \ - $(use_with nagios4) \ - $(use_with re2) - - if use perl; then - cd api/perl || die - perl-module_src_configure - fi -} - -src_compile() { - default - - if use perl; then - cd api/perl || die - perl-module_src_compile - fi -} - -src_test() { - if use perl; then - cd api/perl || die - - SRC_TEST="parallel" - export TEST_AUTHOR="Test Author" - perl-module_src_test - fi -} - -src_install() { - default - - rm "${ED}"/usr/$(get_libdir)/${PN}/liblivestatus.a || die - - # install a config file showing whats needed to enable livestatus for nagios - cat <<EOF >"${T}"/nagios.cfg -# Ensure all data is set to event brokers -event_broker_options=-1 -broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o -EOF - # same for icinga - cat <<EOF >"${T}"/icinga.cfg -define module{ - module_name ${PN} - module_type neb - path /usr/$(get_libdir)/${PN}/livestatus.o - args /var/lib/icinga/rw/live - } -EOF - insinto /usr/share/${PN} - doins "${T}"/{nagios,icinga}.cfg - - if use perl; then - cd api/perl || die - perl-module_src_install - cd "${S}" - - if use examples; then - docinto / - newdoc api/perl/README README.perl - - docinto examples - dodoc api/perl/examples/dump.pl - fi - fi - - if use python; then - python_domodule api/python/livestatus.py - - if use examples; then - docinto / - newdoc api/python/README README.python - - docinto examples - dodoc api/python/{example,example_multisite,make_nagvis_map}.py - fi - fi -} - -pkg_postinst() { - elog "Sample configurations for icinga and nagios are available in" - elog "/usr/share/${PN}" -} diff --git a/net-analyzer/monitoring-plugins/Manifest b/net-analyzer/monitoring-plugins/Manifest index 8576df0da903..545a0d98a9f7 100644 --- a/net-analyzer/monitoring-plugins/Manifest +++ b/net-analyzer/monitoring-plugins/Manifest @@ -1 +1,2 @@ -DIST monitoring-plugins-2.2.tar.gz 2461548 BLAKE2B 0f68b492e089c6dfd09db6aab78ab4490f2e8983677c70dda4c3800a06380c066865587536a44f135d0e314006ed81a757cbfbd918f53e009f9d2c50b8e58db0 SHA512 5f8cfa132891d6d96e69bee3f2c26f7d4546f572be6a18f25ea5d9069f162cb2e424361289a5c26bec60d7b63d28a269437fd6f25645903a1c142fdcbbf77f27 +DIST monitoring-plugins-2.3.3.tar.gz 2620192 BLAKE2B 47bd7e71cf470781bb3bd8c8437ebfccdc977e48a3eba1d83ba85c2c1a8c154c7db832e3bb7189bf669083a10069c7fe09c7235a00b35fd9a6d80afcdbb44246 SHA512 502274b47da2ad04d0e2e4e29baa7e5ad8b9a9ece36794dcdf7dfcc087de30e514ff6937eaaa26b93daad329fcd11b72c3c87cad826e6bf6bafffa450077706f +DIST monitoring-plugins-2.3.5.tar.gz 2876130 BLAKE2B 7029f6485ef73d29329bcb36e16cbbaa99c57ae20505f554af154b45cc1af6f623dabb35ee5b7f777d728bcae8eafd795f12aabc199cf1f45c9f2335f74b6d41 SHA512 bb04d547584a4aed82bfd605d129b652b45c7356c0610fb1da53a57b2ab889b67afccdd53998e2612ec06571bdc5fc238ef0d378b96e29ec072f657e74eabd55 diff --git a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch deleted file mode 100644 index b7406bc9af80..000000000000 --- a/net-analyzer/monitoring-plugins/files/define-own-mysql-port-constant.patch +++ /dev/null @@ -1,102 +0,0 @@ -From d6bd787123aa9ccd96edec8286ec22dd0442c620 Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Fri, 27 Oct 2017 07:58:43 -0400 -Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL - port. - -The MYSQL_PORT constant used to be defined in mysql.h, and was used as -the default port in the two plugins check_mysql and check_mysql_query. -Now that mysql.h no longer defines that constant, our plugins fail to -build against newer versions of MySQL and MariaDB. - -Since MYSQL_PORT used the "default port" on the local system, it -actually was not the best choice as the default for the check plugins: -when monitoring remote MySQL servers, the usual default of 3306 is -more likely to be correct than whatever the local server happens to be -listening on. - -As a result, we fix the issue by defining our own constant, called -CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and -check_mysql_query.c. The existing uses of MYSQL_PORT have been changed -to use the new CHECK_PORT_DEFAULT. - -This change is backwards-incompatible: any users who compiled in a -MYSQL_PORT other than 3306 and who were running their checks on the -same server as the database will now need to specify that port -explicitly. - -Closes: https://github.com/monitoring-plugins/monitoring-plugins/issues/1508 ---- - plugins/check_mysql.c | 8 ++++++-- - plugins/check_mysql_query.c | 8 ++++++-- - 2 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c -index 5773afd9..c44919d0 100644 ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -36,6 +36,10 @@ const char *email = "devel@monitoring-plugins.org"; - - #define SLAVERESULTSIZE 70 - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -58,7 +62,7 @@ char *ciphers = NULL; - bool ssl = false; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - int check_slave = 0, warn_sec = 0, crit_sec = 0; - int ignore_auth = 0; - int verbose = 0; -@@ -505,7 +509,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - -diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c -index 49a14dd3..6f492442 100644 ---- a/plugins/check_mysql_query.c -+++ b/plugins/check_mysql_query.c -@@ -33,6 +33,10 @@ const char *progname = "check_mysql_query"; - const char *copyright = "1999-2007"; - const char *email = "devel@monitoring-plugins.org"; - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -48,7 +52,7 @@ char *db_pass = NULL; - char *db = NULL; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - - int process_arguments (int, char **); - int validate_arguments (void); -@@ -299,7 +303,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - --- -2.13.6 - diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch new file mode 100644 index 000000000000..34e539f51e2d --- /dev/null +++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-fix-check-http-segfault.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/893252 +https://github.com/monitoring-plugins/monitoring-plugins/issues/1836 +https://github.com/monitoring-plugins/monitoring-plugins/commit/6d3e44d2d8395076060e9c741e9b173dc5d57b76 + +diff --git a/plugins/check_http.c b/plugins/check_http.c +index 5fa310f5d..8dda046ff 100644 +--- a/plugins/check_http.c ++++ b/plugins/check_http.c +@@ -1462,7 +1462,13 @@ char *unchunk_content(const char *content) { + memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk); + } + +- result[overall_size] = '\0'; ++ if (overall_size == 0 && result == NULL) { ++ // We might just have received the end chunk without previous content, so result is never allocated ++ result = calloc(1, sizeof(char)); ++ // No error handling here, we can only return NULL anyway ++ } else { ++ result[overall_size] = '\0'; ++ } + return result; + } + diff --git a/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch new file mode 100644 index 000000000000..00415f0b7111 --- /dev/null +++ b/net-analyzer/monitoring-plugins/files/monitoring-plugins-gnutls.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/880211 +https://github.com/monitoring-plugins/monitoring-plugins/issues/1834 +https://github.com/monitoring-plugins/monitoring-plugins/commit/31bdbfce92de2dc7717fe13a8d1ca8e7dbf850d4 + +diff --git a/plugins/sslutils.c b/plugins/sslutils.c +index 286273f6..c26c4fb3 100644 +--- a/plugins/sslutils.c ++++ b/plugins/sslutils.c +@@ -134,7 +134,12 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int + return STATE_CRITICAL; + } + if (cert && privkey) { ++#ifdef USE_GNUTLS ++ SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM); ++#endif ++#ifdef USE_OPENSSL + SSL_CTX_use_certificate_chain_file(c, cert); ++#endif + SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM); + #ifdef USE_OPENSSL + if (!SSL_CTX_check_private_key(c)) { diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml index 654cb6c8c64d..37237fb7544c 100644 --- a/net-analyzer/monitoring-plugins/metadata.xml +++ b/net-analyzer/monitoring-plugins/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>hydrapolic@gmail.com</email> <name>Tomas Mozes</name> </maintainer> @@ -9,7 +9,7 @@ <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> @@ -36,4 +36,7 @@ values. Disabling the flag does not remove any plugins. </flag> </use> + <upstream> + <remote-id type="github">monitoring-plugins/monitoring-plugins</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild deleted file mode 100644 index ae1073c7cae9..000000000000 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r4.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic multilib user - -DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" -HOMEPAGE="https://www.monitoring-plugins.org/" -SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86" -IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - gnutls? ( net-libs/gnutls ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - dns? ( net-dns/bind-tools ) - game? ( games-util/qstat ) - fping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/nagios-plugins" - -# At least one test is interactive. -RESTRICT="test" - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_configure() { - append-flags -fno-strict-aliasing - - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with !gnutls openssl /usr) - $(use_with gnutls gnutls /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -4 -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping -6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ - NEWS README REQUIREMENTS SUPPORT THANKS ) - -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild index 2e62986bc445..e364f28aa4cc 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r2.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.3-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="8" -inherit eutils flag-o-matic multilib user +inherit flag-o-matic DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" HOMEPAGE="https://www.monitoring-plugins.org/" @@ -12,7 +12,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl" +IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will # get built if the binary it uses is installed. For example, check_snmp @@ -24,13 +24,16 @@ IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp # build. DEPEND contains those plus the automagic dependencies. # REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) + curl? ( + dev-libs/uriparser + net-misc/curl + ) + ldap? ( net-nds/openldap:= ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) @@ -41,18 +44,23 @@ DEPEND="${REAL_DEPEND} game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) + ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )" # Basically everything collides with nagios-plugins. RDEPEND="${DEPEND} + acct-group/nagios + acct-user/nagios !net-analyzer/nagios-plugins" # At least one test is interactive. RESTRICT="test" -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-gnutls.patch" #880211 + "${FILESDIR}/${PN}-fix-check-http-segfault.patch" #893252 +) src_configure() { append-flags -fno-strict-aliasing @@ -69,14 +77,17 @@ 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 #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/ping6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) fi econf \ + $(use_with curl libcurl) \ + $(use_with curl uriparser) \ $(use_with mysql) \ $(use_with ipv6) \ $(use_with ldap) \ @@ -90,15 +101,10 @@ src_configure() { DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ NEWS README REQUIREMENTS SUPPORT THANKS ) -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - pkg_postinst() { elog "This ebuild has a number of USE flags that determine what you" elog "are able to monitor. Depending on what you want to monitor, some" elog "or all of these USE flags need to be set." elog - elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins" + elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" } diff --git a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild index cf357d910b21..c09500eb8d38 100644 --- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2-r3.ebuild +++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.3.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit eutils flag-o-matic multilib user +inherit flag-o-matic DESCRIPTION="50+ standard plugins for Icinga, Naemon, Nagios, Shinken, Sensu" HOMEPAGE="https://www.monitoring-plugins.org/" @@ -12,7 +12,7 @@ SRC_URI="https://www.monitoring-plugins.org/download/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 sparc x86" -IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp ssh +ssl" +IUSE="curl gnutls ipv6 ldap mysql dns fping game postgres radius samba snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will # get built if the binary it uses is installed. For example, check_snmp @@ -24,13 +24,16 @@ IUSE="gnutls ipv6 ldap libressl mysql dns fping game postgres radius samba snmp # build. DEPEND contains those plus the automagic dependencies. # REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:= ) + curl? ( + dev-libs/uriparser + net-misc/curl + ) + ldap? ( net-nds/openldap:= ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c ) ) postgres? ( dev-db/postgresql:= ) ssl? ( !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls ) ) @@ -41,19 +44,19 @@ DEPEND="${REAL_DEPEND} game? ( games-util/qstat ) fping? ( net-analyzer/fping ) samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) + ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )" # Basically everything collides with nagios-plugins. RDEPEND="${DEPEND} + acct-group/nagios + acct-user/nagios !net-analyzer/nagios-plugins" # At least one test is interactive. RESTRICT="test" -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - src_configure() { append-flags -fno-strict-aliasing @@ -69,14 +72,17 @@ 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 #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/ping6 -n -U -w %d -c %d %s" ) + myconf+=( --with-ping6-command="$(command -v ping) -6 -n -U -w %d -c %d %s" ) fi econf \ + $(use_with curl libcurl) \ + $(use_with curl uriparser) \ $(use_with mysql) \ $(use_with ipv6) \ $(use_with ldap) \ @@ -90,15 +96,10 @@ src_configure() { DOCS=( ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ \ NEWS README REQUIREMENTS SUPPORT THANKS ) -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - pkg_postinst() { elog "This ebuild has a number of USE flags that determine what you" elog "are able to monitor. Depending on what you want to monitor, some" elog "or all of these USE flags need to be set." elog - elog "The plugins are installed in ${EROOT%/}/usr/$(get_libdir)/nagios/plugins" + elog "The plugins are installed in ${EROOT}/usr/$(get_libdir)/nagios/plugins" } diff --git a/net-analyzer/mping/metadata.xml b/net-analyzer/mping/metadata.xml index 583e01eed1e7..af8bcc27caa3 100644 --- a/net-analyzer/mping/metadata.xml +++ b/net-analyzer/mping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild index 3133eb907421..7a8b952a08c5 100644 --- a/net-analyzer/mping/mping-2.01.ebuild +++ b/net-analyzer/mping/mping-2.01.ebuild @@ -1,8 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="IPv4/6 round-robin multiping client" HOMEPAGE="http://mping.uninett.no" @@ -12,8 +11,6 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" -DOCS=( AUTHORS ChangeLog NEWS README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-RFC3542.patch -} +PATCHES=( + "${FILESDIR}"/${P}-RFC3542.patch +) diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/mrtg-ping-probe/metadata.xml +++ b/net-analyzer/mrtg-ping-probe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild index 9ccb0a69e267..12267a6386cc 100644 --- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild +++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0-r1.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Addon mrtg contrib for stats ping/loss packets" -SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz" HOMEPAGE="http://pwo.de/projects/mrtg/" +SRC_URI="ftp://ftp.pwo.de/pub/pwo/mrtg/${PN}/${P}.tar.gz" -KEYWORDS="~x86" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~x86" -DEPEND="dev-lang/perl" +BDEPEND="dev-lang/perl" RDEPEND=" - ${DEPEND} net-analyzer/mrtg " src_prepare() { + default sed -i check-ping-fmt \ -e 's:#!/usr/local/bin/perl -w:#!/usr/bin/perl -w:' \ || die @@ -26,7 +26,7 @@ src_prepare() { || die } -src_install () { +src_install() { dodoc ChangeLog NEWS README TODO mrtg.cfg-ping doman mrtg-ping-probe.1 dobin check-ping-fmt mrtg-ping-probe "${FILESDIR}"/mrtg-ping-cfg diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest index 5e45e92440e8..6a206f519059 100644 --- a/net-analyzer/mrtg/Manifest +++ b/net-analyzer/mrtg/Manifest @@ -1 +1 @@ -DIST mrtg-2.17.7.tar.gz 1098650 BLAKE2B f8191296fc163b950792b8ecee773cfe643a7390d49444ce8b5012b2dbd932093cb4f71745ba2c86bda579fbcd3c73a4f9cebc1fa4e7f791a7b4461ae92ac191 SHA512 b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 +DIST mrtg-2.17.10.tar.gz 1084792 BLAKE2B a2e69c651a1428514fbe1f4d04cbddde9c7ed3b865d57f204814ec797dabd414c16b03d34bd19a005257938dd9bd2de0e99f641222f240c907fa5f67429710f1 SHA512 b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080 diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml index 74c2baebb4ec..dfef87e6bc6a 100644 --- a/net-analyzer/mrtg/metadata.xml +++ b/net-analyzer/mrtg/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">oetiker/mrtg</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/mrtg/mrtg-2.17.7.ebuild b/net-analyzer/mrtg/mrtg-2.17.10.ebuild index d1c922a90e17..3884adeb3802 100644 --- a/net-analyzer/mrtg/mrtg-2.17.7.ebuild +++ b/net-analyzer/mrtg/mrtg-2.17.10.ebuild @@ -1,43 +1,39 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit multilib +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" +SRC_URI="https://oss.oetiker.ch/mrtg/pub/${P}.tar.gz https://github.com/oetiker/mrtg/releases/download/v${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86" IUSE="selinux" -DEPEND=" +DEPEND="dev-lang/perl >=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 ) -" + media-libs/gd[png]" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-mrtg )" + PATCHES=( "${FILESDIR}"/${PN}-2.17.4-socket6.patch ) src_prepare() { + default + rm ./lib/mrtg2/{SNMP_{Session,util},BER}.pm || die sed -i \ -e 's|main::SL}lib${main::SL|main::SL}'"$(get_libdir)"'${main::SL|g' \ $(find bin -type f) contrib/cfgmaker_dlci/cfgmaker_dlci || die - - default } -src_install () { +src_install() { keepdir /var/lib/mrtg default diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index bcb0bbbe01b6..056c1c39aa39 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -1,3 +1 @@ -DIST mtr-0.87.tar.gz 184645 BLAKE2B e96535b0bd46ee63c5e6110ee465195a9ead6ff7c7ea3629b2668631f25e9181cf4236ba0e2cfc0517e7c70683bbb6347d9c26a2b09701d89e225c27aa2faae4 SHA512 172ba2f78a6ee4deb427ac2fb00dff16843215dbd23663fbe41fcc957ffe278b408a73a0c7e1c05788b235e2d03fb53f9971b8b82d4de2f95edcaa9f2cff3cf9 -DIST mtr-0.92.tar.gz 296430 BLAKE2B 0f7dfcbd77d6f9cd0a9ba4c7e6829ce8f3fa0e1de4009632d10c3a1c2acc280db5830296695c27d89317d38d507af8f7e9bdd12b1c0e0d198872dc39f13032e7 SHA512 d362a418b6c17fd2d08da1ed9e033fa3330e4c0497e1bb0644f6193d23f4e20dd8ee181942c2a20ec0025a8b96c521394a21be5a1d9036f8a0a8c4cddfbe381f -DIST mtr-0.93.tar.gz 291015 BLAKE2B 6ac0e21f9e06fbfee9e9ada4cddb6cd9685ae669a05d1ed257a2c238ab78ac16e1a1e152ef1359ca530b0eced14c9333df2b691c27cbc29173c843ebc64eaaa9 SHA512 046e98a661bd6248ce819411ceb6e2b875b92877de38523594898df507836c113573cf40d7d4cc548370f515abe99e0aa4d8b3ba44ad54dd00f8e93c8a96c021 +DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690 diff --git a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch b/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch deleted file mode 100644 index 5b41a54c744b..000000000000 --- a/net-analyzer/mtr/files/mtr-0.80-impl-dec.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/gtk.c b/gtk.c -index e42f4f6..333d7c8 100644 ---- a/gtk.c -+++ b/gtk.c -@@ -24,6 +24,7 @@ - #include <unistd.h> - #include <sys/time.h> - #include <sys/types.h> -+#include <string.h> - - #ifndef NO_GTK - #include <stdio.h> diff --git a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch b/net-analyzer/mtr/files/mtr-0.87-ipv6.patch deleted file mode 100644 index 32a62853387c..000000000000 --- a/net-analyzer/mtr/files/mtr-0.87-ipv6.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/net.c -+++ b/net.c -@@ -320,9 +320,13 @@ - struct sockaddr_storage local; - struct sockaddr_storage remote; - struct sockaddr_in *local4 = (struct sockaddr_in *) &local; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local; -+#endif - struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; -+#endif - socklen_t len; - - ttl = index + 1; -@@ -437,9 +441,13 @@ - struct sockaddr_storage local; - struct sockaddr_storage remote; - struct sockaddr_in *local4 = (struct sockaddr_in *) &local; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 *local6 = (struct sockaddr_in6 *) &local; -+#endif - struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; -+#endif - socklen_t len; - - ttl = index + 1; -@@ -726,8 +734,12 @@ - - /* sendto() assumes packet length includes the IPv4 header but not the - IPv6 header. */ -+#ifdef ENABLE_IPV6 - spacketsize = abs(packetsize) - - ( ( af == AF_INET ) ? 0 : sizeof (struct ip6_hdr) ); -+#else -+ spacketsize = abs(packetsize); -+#endif - rv = sendto(sendsock, packet, spacketsize, 0, remotesockaddr, salen); - if (first && (rv < 0) && ((errno == EINVAL) || (errno == EMSGSIZE))) { - /* Try the first packet again using host byte order. */ -@@ -1535,11 +1547,15 @@ - struct sockaddr_in name_struct; - #endif - struct sockaddr_in * sa4; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 * sa6; -+#endif - struct sockaddr * name = (struct sockaddr *) &name_struct; - struct sockaddr_storage remote; - struct sockaddr_in *remote4 = (struct sockaddr_in *) &remote; -+#ifdef ENABLE_IPV6 - struct sockaddr_in6 *remote6 = (struct sockaddr_in6 *) &remote; -+#endif - socklen_t len; - int s; - diff --git a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch b/net-analyzer/mtr/files/mtr-0.87-tinfo.patch deleted file mode 100644 index 4dbdef1cc2fb..000000000000 --- a/net-analyzer/mtr/files/mtr-0.87-tinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,8 @@ - AC_DEFINE(NO_CURSES, 1, [Define if you don't have the curses libraries available.]) - CURSES_OBJ=) - -+AC_SEARCH_LIBS(raw, [ncurses curses cursesX tinfo]) -+ - AC_CHECK_LIB(ncurses, use_default_colors, - AC_DEFINE(HAVE_USE_DEFAULT_COLORS, 1, [Define this if your curses library has the use_default_colors() command.])) - diff --git a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch index c7252b74435e..fb50c7e9a0b3 100644 --- a/net-analyzer/mtr/files/mtr-0.88-tinfo.patch +++ b/net-analyzer/mtr/files/mtr-0.88-tinfo.patch @@ -1,3 +1,4 @@ +https://github.com/traviscross/mtr/pull/368 --- a/configure.ac +++ b/configure.ac @@ -101,7 +101,10 @@ diff --git a/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch new file mode 100644 index 000000000000..0c3d593915e4 --- /dev/null +++ b/net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/911389 +https://github.com/traviscross/mtr/pull/468 +https://github.com/traviscross/mtr/commit/a1548b40c0dcf6dd44c5e6906f829e249428436b + +From 5908af4c19188cb17b62f23368b6ef462831a0cb Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <meissner@suse.de> +Date: Tue, 11 Apr 2023 16:05:36 +0200 +Subject: [PATCH] fixed the sizes passed into snprintf + +--- a/ui/report.c ++++ b/ui/report.c +@@ -140,7 +140,7 @@ void report_close( + continue; + + snprintf(fmt, sizeof(fmt), "%%%ds", data_fields[j].length); +- snprintf(buf + len, sizeof(buf), fmt, data_fields[j].title); ++ snprintf(buf + len, sizeof(buf) - len, fmt, data_fields[j].title); + len += data_fields[j].length; + } + printf("%s\n", buf); +@@ -172,10 +172,10 @@ void report_close( + + /* 1000.0 is a temporary hack for stats usec to ms, impacted net_loss. */ + if (strchr(data_fields[j].format, 'f')) { +- snprintf(buf + len, sizeof(buf), data_fields[j].format, ++ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format, + data_fields[j].net_xxx(at) / 1000.0); + } else { +- snprintf(buf + len, sizeof(buf), data_fields[j].format, ++ snprintf(buf + len, sizeof(buf) - len, data_fields[j].format, + data_fields[j].net_xxx(at)); + } + len += data_fields[j].length; + diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml index 2c2a7923cfc8..8fd4b1f5e8e8 100644 --- a/net-analyzer/mtr/metadata.xml +++ b/net-analyzer/mtr/metadata.xml @@ -1,8 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <use> + <flag name="ipinfo">Disable support for IP address lookups</flag> + <flag name="jansson">Enable JSON output support through <pkg>dev-libs/jansson</pkg></flag> + </use> + <upstream> + <remote-id type="github">traviscross/mtr</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild deleted file mode 100644 index 68c3b68c2b24..000000000000 --- a/net-analyzer/mtr/mtr-0.87.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils fcaps flag-o-matic - -DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" -HOMEPAGE="https://www.bitwizard.nl/mtr/" -SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="gtk ipv6" - -RDEPEND=" - sys-libs/ncurses:0= - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) -" -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - virtual/pkgconfig -" - -DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO ) -FILECAPS=( cap_net_raw /usr/sbin/mtr ) -PATCHES=( - "${FILESDIR}"/${PN}-0.80-impl-dec.patch - "${FILESDIR}"/${PN}-0.87-ipv6.patch - "${FILESDIR}"/${PN}-0.87-tinfo.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is needed for 64bit macos still. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv - - econf \ - $(use_enable ipv6) \ - $(use_with gtk) \ - --disable-gtktest -} diff --git a/net-analyzer/mtr/mtr-0.92-r1.ebuild b/net-analyzer/mtr/mtr-0.92-r1.ebuild deleted file mode 100644 index f3684cc00ecd..000000000000 --- a/net-analyzer/mtr/mtr-0.92-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils fcaps flag-o-matic - -DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" -HOMEPAGE="https://www.bitwizard.nl/mtr/" -SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="gtk ipv6 ncurses" - -RDEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - virtual/pkgconfig -" - -DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO ) -FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) -PATCHES=( - "${FILESDIR}"/${PN}-0.88-tinfo.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is needed for 64bit macos still. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv - econf \ - $(use_enable ipv6) \ - $(use_with gtk) \ - $(use_with ncurses) -} - -src_test() { - [[ "$UID" = 0 ]] && default -} - -pkg_postinst() { - fcaps_pkg_postinst - - if use prefix && [[ ${CHOST} == *-darwin* ]] ; then - ewarn "mtr needs root privileges to run. To grant them:" - ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr" - ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr" - fi -} diff --git a/net-analyzer/mtr/mtr-0.93-r1.ebuild b/net-analyzer/mtr/mtr-0.93-r1.ebuild deleted file mode 100644 index d9d465764723..000000000000 --- a/net-analyzer/mtr/mtr-0.93-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils fcaps flag-o-matic - -DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" -HOMEPAGE="https://www.bitwizard.nl/mtr/" -SRC_URI="https://www.bitwizard.nl/mtr/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="gtk ipv6 ncurses" - -RDEPEND=" - gtk? ( - dev-libs/glib:2 - x11-libs/gtk+:2 - ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - virtual/pkgconfig -" - -DOCS=( AUTHORS NEWS SECURITY TODO ) -FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) -PATCHES=( - "${FILESDIR}"/${PN}-0.88-tinfo.patch -) - -src_prepare() { - default - - sed -i -e 's|m4_esyscmd(\[build-aux/git-version-gen .tarball-version\])|'"${PV}"'|g' configure.ac || die - - eautoreconf -} - -src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is needed for 64bit macos still. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv - econf \ - $(use_enable ipv6) \ - $(use_with gtk) \ - $(use_with ncurses) -} - -src_test() { - [[ "$UID" = 0 ]] && default -} - -pkg_postinst() { - fcaps_pkg_postinst - - if use prefix && [[ ${CHOST} == *-darwin* ]] ; then - ewarn "mtr needs root privileges to run. To grant them:" - ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr" - ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr" - fi -} diff --git a/net-analyzer/mtr/mtr-0.95-r1.ebuild b/net-analyzer/mtr/mtr-0.95-r1.ebuild new file mode 100644 index 000000000000..a2c2010db273 --- /dev/null +++ b/net-analyzer/mtr/mtr-0.95-r1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools bash-completion-r1 fcaps + +DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" +HOMEPAGE="https://www.bitwizard.nl/mtr/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/traviscross/mtr" + inherit git-r3 +else + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="gtk +ipinfo +ipv6 jansson ncurses" +# TODO: This is an inherited RESTRICT - figure out why! +RESTRICT="test" + +RDEPEND=" + gtk? ( + dev-libs/glib:2 + x11-libs/gtk+:3 + ) + jansson? ( dev-libs/jansson:= ) + ncurses? ( sys-libs/ncurses:= ) +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) +FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.88-tinfo.patch + "${FILESDIR}"/${P}-fortify-source-3.patch +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf \ + $(use_enable ipv6) \ + $(use_with gtk) \ + $(use_with ipinfo) \ + $(use_with jansson) \ + $(use_with ncurses) \ + --with-bashcompletiondir="$(get_bashcompdir)" +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use prefix && [[ ${CHOST} == *-darwin* ]] ; then + ewarn "mtr needs root privileges to run. To grant them:" + ewarn " % sudo chown root ${EPREFIX}/usr/sbin/mtr" + ewarn " % sudo chmod u+s ${EPREFIX}/usr/sbin/mtr" + fi +} diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild index 75a592ba00d8..af05bfe6419c 100644 --- a/net-analyzer/mtr/mtr-9999.ebuild +++ b/net-analyzer/mtr/mtr-9999.ebuild @@ -1,36 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools fcaps flag-o-matic git-r3 +EAPI=8 + +inherit autotools bash-completion-r1 fcaps DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool" HOMEPAGE="https://www.bitwizard.nl/mtr/" -EGIT_REPO_URI="https://github.com/traviscross/mtr" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/traviscross/mtr" + inherit git-r3 +else + SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="gtk ipv6 ncurses" +IUSE="gtk +ipinfo +ipv6 jansson ncurses" +# TODO: This is an inherited RESTRICT - figure out why! +RESTRICT="test" RDEPEND=" gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) - ncurses? ( sys-libs/ncurses:0= ) -" -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - virtual/pkgconfig + jansson? ( dev-libs/jansson:= ) + ncurses? ( sys-libs/ncurses:= ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + DOCS=( AUTHORS FORMATS NEWS README.md SECURITY TODO ) FILECAPS=( cap_net_raw usr/sbin/mtr-packet ) + PATCHES=( "${FILESDIR}"/${PN}-0.88-tinfo.patch ) -RESTRICT="test" src_prepare() { default @@ -39,13 +47,13 @@ src_prepare() { } src_configure() { - # In the source's configure script -lresolv is commented out. Apparently it - # is still needed for 64-bit MacOS. - [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv econf \ $(use_enable ipv6) \ $(use_with gtk) \ - $(use_with ncurses) + $(use_with ipinfo) \ + $(use_with jansson) \ + $(use_with ncurses) \ + --with-bashcompletiondir="$(get_bashcompdir)" } pkg_postinst() { diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest index 59bc5904a3ff..a52bf29cdaf9 100644 --- a/net-analyzer/multimon-ng/Manifest +++ b/net-analyzer/multimon-ng/Manifest @@ -1 +1 @@ -DIST multimon-ng-1.1.8.tar.gz 2430488 BLAKE2B 82bc0be58e2f7d596363fc916c11584cbd1335e7984194af22955587877ad1cba2a0cca819467061bb18b97ca70f5c2adfd73ccbf159fbc27348d59429959ada SHA512 9cf93362555e5dc465a9ec60dff27b9875879afd954e810069022b3c003eca4c3ab2a833f1c00fef877175bc72e2d378bbb53380ada54542ae29d257a7d2bd1b +DIST multimon-ng-1.3.0.tar.gz 2447632 BLAKE2B 6607c53677e746fc22baaca708cffab97bd1a411032e8bd6ec15410571a7c5dfaa92a2ab5d61199859acc8ffa63ee6ac97f54dde966daf4984d62ae1dfedc902 SHA512 1dad367d6de1c84c22523b7bdffff2835de496b2250a6642b6da950f1dc6d64b0c5e8e3ab7729032a8a386740d6c1c64afcd5514e131777df0123e4a29f33827 diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml index e2d083399d83..fef58098b169 100644 --- a/net-analyzer/multimon-ng/metadata.xml +++ b/net-analyzer/multimon-ng/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.3.0.ebuild index da7b10babdb7..64933423f307 100644 --- a/net-analyzer/multimon-ng/multimon-ng-1.1.8.ebuild +++ b/net-analyzer/multimon-ng/multimon-ng-1.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" HOMEPAGE="https://github.com/EliasOenal/multimon-ng" @@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" - KEYWORDS="" else SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" @@ -21,12 +20,13 @@ LICENSE="GPL-2" SLOT="0" IUSE="pulseaudio X" -DEPEND="pulseaudio? ( media-sound/pulseaudio ) +DEPEND="pulseaudio? ( media-libs/libpulse ) X? ( x11-libs/libX11 )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-sound/sox" src_prepare() { use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt use X || sed -i '/find_package( X11 )/d' CMakeLists.txt - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild index da7b10babdb7..8144bfe94435 100644 --- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild +++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake-utils +inherit cmake DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes" HOMEPAGE="https://github.com/EliasOenal/multimon-ng" @@ -11,7 +11,6 @@ HOMEPAGE="https://github.com/EliasOenal/multimon-ng" if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git" - KEYWORDS="" else SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm ~x86" @@ -21,12 +20,13 @@ LICENSE="GPL-2" SLOT="0" IUSE="pulseaudio X" -DEPEND="pulseaudio? ( media-sound/pulseaudio ) +DEPEND="pulseaudio? ( media-libs/libpulse ) X? ( x11-libs/libX11 )" -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + media-sound/sox" src_prepare() { use pulseaudio || sed -i '/find_package( PulseAudio )/d' CMakeLists.txt use X || sed -i '/find_package( X11 )/d' CMakeLists.txt - cmake-utils_src_prepare + cmake_src_prepare } diff --git a/net-analyzer/multipath-tcp-tools/Manifest b/net-analyzer/multipath-tcp-tools/Manifest new file mode 100644 index 000000000000..0911f9054218 --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/Manifest @@ -0,0 +1 @@ +DIST multipath-tcp-tools-2018_p12_p21.tar.gz 199660476 BLAKE2B a66274229e42c39c2c2821a02087602c76cd725bf850080db8ac9123b35428eaa2c2696d089ebb097365d912e37068b696b0e4f0afecf71f10625be0e75b055b SHA512 2be083f88d987bd5dd069319aecd427c46c962a24d1573b5dca32ec0a209f0b4ed9564968c0041813f7fa62bf2f0ff4bd1307eb562240687666a5636e807b8c3 diff --git a/net-analyzer/multipath-tcp-tools/metadata.xml b/net-analyzer/multipath-tcp-tools/metadata.xml new file mode 100644 index 000000000000..62a6bcb8233e --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/metadata.xml @@ -0,0 +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> + </maintainer> + <longdescription> + Contains a collection of applications written in C to help + both analyze and visualize MPTCP packet traces. + </longdescription> + <upstream> + <remote-id type="github">nasa/multipath-tcp-tools</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild new file mode 100644 index 000000000000..ad249861ca1a --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-2018_p12_p21-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" +HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" +SRC_URI="https://github.com/nasa/multipath-tcp-tools/archive/v${PV//_p/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="NOSA" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + dev-libs/openssl:= + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" +S=${WORKDIR}/${P//_p/-}/network-traffic-analysis-tools + +src_prepare() { + sed -i \ + -e 's|/man/man1|/share&|g' \ + -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ + Makefile || die + + default +} + +src_compile() { + # bug #861179 + append-flags -fno-strict-aliasing + + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake PREFIX="${D}/${EPREFIX}/usr" install + + dodoc README +} diff --git a/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild new file mode 100644 index 000000000000..3178d81adff6 --- /dev/null +++ b/net-analyzer/multipath-tcp-tools/multipath-tcp-tools-999999.ebuild @@ -0,0 +1,46 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit git-r3 flag-o-matic toolchain-funcs + +DESCRIPTION="Analysis tools for Multipath Transmission Control Protocol (MPTCP)" +HOMEPAGE="https://github.com/nasa/multipath-tcp-tools" +EGIT_REPO_URI="https://github.com/nasa/multipath-tcp-tools/" + +LICENSE="NOSA" +SLOT="0" +KEYWORDS="" + +DEPEND=" + dev-libs/openssl:= + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" +S=${WORKDIR}/${P}/network-traffic-analysis-tools + +src_prepare() { + sed -i \ + -e 's|/man/man1|/share&|g' \ + -e 's|$(LDLIBS)|$(LDFLAGS) &|g' \ + Makefile || die + + default +} + +src_compile() { + # bug #861179 + append-flags -fno-strict-aliasing + + emake \ + CXX="$(tc-getCXX)" \ + CXXFLAGS="${CXXFLAGS}" +} + +src_install() { + emake PREFIX="${D}/${EPREFIX}/usr" install + + dodoc README +} diff --git a/net-analyzer/munin-plugins-zfs/metadata.xml b/net-analyzer/munin-plugins-zfs/metadata.xml index b1859d9d69c6..18679fa7d735 100644 --- a/net-analyzer/munin-plugins-zfs/metadata.xml +++ b/net-analyzer/munin-plugins-zfs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> diff --git a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127-r1.ebuild index e552781d0f00..54b8503c30ee 100644 --- a/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127.ebuild +++ b/net-analyzer/munin-plugins-zfs/munin-plugins-zfs-0.20170127-r1.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 COMMIT="385f9e4cda592ace95b47c69db76553bcb6a42d6" DESCRIPTION="A Munin plugin for monitoring ZFS on Linux" HOMEPAGE="https://github.com/alexclear/ZoL-munin-plugin" SRC_URI="https://github.com/alexclear/ZoL-munin-plugin/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/ZoL-munin-plugin-${COMMIT}" +S=${WORKDIR}/ZoL-munin-plugin-${COMMIT} LICENSE="MIT" SLOT="0" @@ -16,8 +16,7 @@ KEYWORDS="~amd64" DEPEND="net-analyzer/munin" RDEPEND="${DEPEND} - sys-devel/bc - + app-alternatives/bc " src_install() { diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest index 7c918466c461..bce724fcc09e 100644 --- a/net-analyzer/munin/Manifest +++ b/net-analyzer/munin/Manifest @@ -1,8 +1,6 @@ -DIST munin-2.0.49-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.49.tar.gz 2257501 BLAKE2B f2852357e3aa0c1ca3e217b66c3e2d1c0d9c70bf1f8487517ee913e2223ca1c5ae9b922c07f83754522c51fddd0f72f87f5ceea9b7e9642a44aab04ead44538f SHA512 e8bf652000ab76f16bc3b18a16c5231ffb5523fe9f78a90bec97ca31e46ff73566e1cbbf0a3616931d0b46ceb6f5a2b5d4fdc68c797539419a2217dccf643762 -DIST munin-2.0.52-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.52.tar.gz 2266820 BLAKE2B 41233cd28ce4d682dfd47895061426404540c6b1c65798609a2d509d39ad5359b22087027662e7c03848e5676815843c34d078b782e3d0ab3a6a29b6a22e058b SHA512 7439ea10006a94227b71328d06411378f6855f23f17815a433b3a1c40ea23da5a25a366d48f911b9cfdc43c4b98f3bb9777b67db2b894441eb8941e84ede379c -DIST munin-2.0.54-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.54.tar.gz 2270295 BLAKE2B d0f573a46eedf9e9a7de61428de6c2261f6c9fddd3aa5696966c2ffdaa82a432dca72d60cd2e4b75601f312ad07918090a9dd45a10e3c9c81371b97200e28b12 SHA512 b9a8c7403b34d393115d833ee41e3b5c325e072729b66f6b8b7fd3546ab4660e59e59c6f192eabb706e2bc9c73aea9c50c880c2c36826c5f2962bca46098e732 -DIST munin-2.0.56-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 -DIST munin-2.0.56.tar.gz 2271203 BLAKE2B f3df227b905ab794e2253637d367819eff2625f9e0f2355d23916b033b3b23d14bb64a78bf6a334f0c7a1859e60c227d1f754a2689bf291cc5f43a46986d35fe SHA512 111b9b8d88474f480eac1e304a92a52c2295d72a1c6709bb2942ff6ee0ba26a56d25dc5d0cf08ddb98a23d6d9693ad0cddb2185e10df83d553655d017d102b1d +DIST munin-2.0.69-gentoo-1.tar.xz 3980 BLAKE2B 5aae9c29befa761f797d362c90d810051a7f3a5dc8250776ab6ae1659197d795dfb87274db66ff0a3deb4e10e14ced5b3765551a3f29357c436968a848f450ea SHA512 b21d6590bb9e1da127066a06818f1f3157362762f80526e2231b926956959e62af575f38235f72326376dc21bba63f9767efa379f1f2558ca9b20ddf5395e851 +DIST munin-2.0.69.tar.gz 2258024 BLAKE2B 2d270f6f67fc9a86a592e2b7cbcf4111d6ae40bf1928b0ad0adb99ad32384810e5768c17019f9163e8b22fd8524b28257df527df023db9c1ba333691b384dd74 SHA512 4976e394e046d3fe1cbb000acdf081060188517e09abcf8b60dd7c55e0e1cdf46e33d1760368cb1423dfb9286e397df2072a2c55ba8b79adeae4ea2303130667 +DIST munin-2.0.73.tar.gz 2259959 BLAKE2B 2d2e4ce00b2df06f083280b9253f875ded100e42c991152f3f8e4b39e85d605367efc18df369e07e18eac38aabd78faa959c367752b153f97246bb47a9732f20 SHA512 4f1d59ff3f163c8fac883973ebba1221619d716c4cde506d9265544c52e73f43e8b587cda3fd00bcf779ceeaf8fef6e7780d9ea4be5b99894f0bb5047f24b935 +DIST munin-2.0.74.tar.gz 2258466 BLAKE2B a993c97d1f2c3aec8c3970e75d0406ce8b5a56eb54c729cdd97c4fbd38190dc474336b9faf06881b4f293a72c4181e8138edefc51da548c179c082869d966f34 SHA512 ad75100576b74d1d75bb7f204975ce683c88aadb668d61feabc6652d5dc0495af4f94a9e8d485a242dbc178f003be91ec72c350b35186d9410035f1c8688f97b +DIST munin-2.0.75.tar.gz 2258514 BLAKE2B 689b436913a931c9002757267db236ba4ab1da947552c43ad2b96c2e5b26427499e681d0606d0045cfbbd90b70a69572b8550660a598d672babeba8388feacf5 SHA512 cceb47c27bfb3080980fd6342e805b5b9fecbef7033d6f2a83fe6c78d20f943961c9f1775ef5e464e49c25c9d246606594f2844827b38d34c04016f15dd68613 +DIST munin-remove-Date-Manip-DM5.patch 3587 BLAKE2B fab1fb61607e83aac5cbd699c93015d77ca6e58d9734a5a6bc17af6c3c7695ddf4257104cd69db4d3b3e1d36bb1d66a1893ddb51bfc52d0a1dd2efb3ba32a9c0 SHA512 976d7a50de6437a26fa77917368ab604c1987f686030e097c200fe9ebebd08e5fae10c04640cadbfecef90eda76ba123cf303d2d671cefa78b09752d1f6757af diff --git a/net-analyzer/munin/files/logrotate.d-munin.3 b/net-analyzer/munin/files/logrotate.d-munin.3 index e7e1dda3fc65..5133c47e8ba1 100644 --- a/net-analyzer/munin/files/logrotate.d-munin.3 +++ b/net-analyzer/munin/files/logrotate.d-munin.3 @@ -3,7 +3,7 @@ missingok rotate 7 compress - copytruncate + delaycompress notifempty create 640 root root postrotate @@ -17,6 +17,7 @@ missingok rotate 7 compress + delaycompress notifempty nocreate } @@ -26,6 +27,7 @@ missingok rotate 7 compress + delaycompress notifempty create 640 @CGIUSER@ } diff --git a/net-analyzer/munin/files/munin-asyncd.init.2 b/net-analyzer/munin/files/munin-asyncd.init.2 index 59ef4c6b0280..c9fc267f12ea 100644 --- a/net-analyzer/munin/files/munin-asyncd.init.2 +++ b/net-analyzer/munin/files/munin-asyncd.init.2 @@ -1,11 +1,12 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/libexec/munin/munin-asyncd command_args="--fork" pidfile="/run/munin-asyncd.pid" -start_stop_daemon_args="--background --make-pidfile --user munin-async" +command_background="yes" +command_user="munin-async" depend() { need munin-node diff --git a/net-analyzer/munin/files/munin-node_init.d_2.0.73 b/net-analyzer/munin/files/munin-node_init.d_2.0.73 new file mode 100644 index 000000000000..ef9ff691adeb --- /dev/null +++ b/net-analyzer/munin/files/munin-node_init.d_2.0.73 @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +get_munin_config() { + awk '$1 == "'$1'" { s=$2 } END { print s }' "$CFGFILE" +} + +: ${CFGFILE:=/etc/munin/munin-node.conf} + +command=/usr/sbin/munin-node +command_args="--config ${CFGFILE}" +pidfile=$(get_munin_config pid_file) +start_stop_daemon_args="--nicelevel ${NICE_LEVEL:-0} --wait 1500" +extra_started_commands="reload" + +depend() { + config "$CFGFILE" + + before cron + need hostname net + + [ "$(get_munin_config log_file)" = "Sys::Syslog" ] && \ + use logger +} + +# vim: filetype=gentoo-init-d: diff --git a/net-analyzer/munin/files/munin.apache.include-2.4-r1 b/net-analyzer/munin/files/munin.apache.include-2.4-r1 new file mode 100644 index 000000000000..290c2818eb9d --- /dev/null +++ b/net-analyzer/munin/files/munin.apache.include-2.4-r1 @@ -0,0 +1,29 @@ +# -*- apache -*- + +<IfDefine MUNIN_HTML_CGI> +RewriteEngine on + +RewriteRule ^/favicon.ico /static/favicon.ico [L] + +RewriteCond %{REQUEST_URI} (/|\.html)$ +RewriteCond %{REQUEST_URI} !/static +RewriteRule ^/(.*) /munin-cgi/munin-cgi-html/$1 [PT,L] +RewriteRule ^/munin-cgi/munin-cgi-graph/(.*) /$1 +RewriteCond %{REQUEST_URI} !^/static +RewriteRule ^/(.*.png) /munin-cgi/munin-cgi-graph/$1? [L,PT] + +ScriptAlias /munin-cgi/munin-cgi-graph /usr/libexec/munin/cgi/munin-cgi-graph +ScriptAlias /munin-cgi/munin-cgi-html /usr/libexec/munin/cgi/munin-cgi-html +</IfDefine> + +<Directory /usr/libexec/munin/cgi/> + Options +ExecCGI + Require all granted + + <IfModule mod_fcgid.c> + SetHandler fcgid-script + </IfModule> + <IfModule !mod_fcgid.c> + SetHandler cgi-script + </IfModule> +</Directory> diff --git a/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch new file mode 100644 index 000000000000..fee72bc23ad3 --- /dev/null +++ b/net-analyzer/munin/files/patches/0002-build-create-an-install-minimal-target-that-only-ins.patch @@ -0,0 +1,36 @@ +From 75ae794b1c497a82c4ce8f63c9d016cd11d3c7ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 21 Oct 2012 13:39:21 -0700 +Subject: [PATCH 2/7] build: create an install-minimal target that only + installs the Node components +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is what Gentoo does right now manually, it's easier to maintain +here though, and users might want to do the same if they are +installing from sources, and only want a node. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cdc3577..c119d38 100644 +--- a/Makefile ++++ b/Makefile +@@ -64,7 +64,9 @@ tags: + + ###################################################################### + +-install: install-master-prime install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-man install-async-prime ++install: install-master-prime install-minimal install-man ++ ++install-minimal: install-common-prime install-node-prime install-plugins-prime $(JAVA_INSTALL) install-async-prime + + install-pre: Makefile Makefile.config + @$(CHECKUSER) +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch new file mode 100644 index 000000000000..63897f552c9a --- /dev/null +++ b/net-analyzer/munin/files/patches/0003-master-make-it-possible-to-configure-the-default-cgi.patch @@ -0,0 +1,113 @@ +From b634d1396bc2fba170b414f09ea07d0de702fdb8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 4 Nov 2012 11:18:11 -0800 +Subject: [PATCH 3/7] master: make it possible to configure the default cgi-tmp + directory. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows distributions to use, for instance, /var/cache/munin-cgi, +so that /var/lib preserves its designed purpose. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + Makefile | 7 ++++--- + Makefile.config | 3 +++ + common/lib/Munin/Common/Defaults.pm | 2 +- + master/_bin/munin-cgi-graph.in | 2 +- + master/lib/Munin/Master/Config.pm | 2 +- + master/munin.conf.in | 2 +- + 6 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index c119d38..2e30052 100644 +--- a/Makefile ++++ b/Makefile +@@ -87,14 +87,14 @@ install-master-prime: $(INFILES_MASTER) install-pre install-master + mkdir -p $(PERLLIB)/Munin/Master + mkdir -p $(HTMLDIR) + mkdir -p $(DBDIR) +- mkdir -p $(DBDIR)/cgi-tmp ++ mkdir -p $(CGITMPDIR) + mkdir -p $(CGIDIR) + + $(CHOWN) $(USER) $(HTMLDIR) $(DBDIR) + $(CHMOD) 0755 $(DBDIR) + +- $(CHOWN) $(CGIUSER) $(DBDIR)/cgi-tmp +- $(CHMOD) 0755 $(DBDIR)/cgi-tmp ++ $(CHOWN) $(CGIUSER) $(CGITMPDIR) ++ $(CHMOD) 0755 $(CGITMPDIR) + + for p in master/www/*.tmpl ; do \ + $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ +diff --git a/Makefile.config b/Makefile.config +index f5557ea..4378b60 100644 +--- a/Makefile.config ++++ b/Makefile.config +@@ -44,6 +44,9 @@ CGIDIR = $(PREFIX)/www/cgi + # Where to put internal data for master (RRD, internal files, ...) + DBDIR = $(DESTDIR)/var/opt/munin + ++# Where to put CGI cached files (for master only) ++CGITMPDIR = $(DBDIR)/cgi-tmp ++ + # Where to put internal data for node (plugin state, ...) + DBDIRNODE = $(DESTDIR)/var/opt/munin-node + +diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm +index 131f52c..787b596 100644 +--- a/common/lib/Munin/Common/Defaults.pm ++++ b/common/lib/Munin/Common/Defaults.pm +@@ -25,7 +25,7 @@ our $MUNIN_DOCDIR = ''; + our $MUNIN_LIBDIR = ''; + our $MUNIN_HTMLDIR = ''; + our $MUNIN_CGIDIR = ''; +-our $MUNIN_CGITMPDIR = ''; ++our $MUNIN_CGITMPDIR = ''; + our $MUNIN_DBDIR = ''; + our $MUNIN_PLUGSTATE = ''; + our $MUNIN_SPOOLDIR = ''; +diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/munin-cgi-graph.in +index 651cf8c..f5a7ccd 100755 +--- a/master/_bin/munin-cgi-graph.in ++++ b/master/_bin/munin-cgi-graph.in +@@ -337,7 +337,7 @@ sub get_picture_filename { + my $params = shift; + + # XXX - hack to fix cgitmpdir default +- $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp"; ++ $config->{cgitmpdir} ||= "$Munin::Common::Defaults::MUNIN_CGITMPDIR"; + my $cgi_tmp_dir = $config->{cgitmpdir} . "/munin-cgi-graph"; + + $params = $params ? "?$params" : ""; +diff --git a/master/lib/Munin/Master/Config.pm b/master/lib/Munin/Master/Config.pm +index 291ffaf..b5c0813 100644 +--- a/master/lib/Munin/Master/Config.pm 2017-03-03 01:02:39.000000000 +0100 ++++ b/master/lib/Munin/Master/Config.pm 2017-07-18 19:29:44.861742592 +0200 +@@ -161,7 +161,7 @@ + tls_verify_depth => 5, + tmpldir => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates", + staticdir => "$Munin::Common::Defaults::MUNIN_CONFDIR/static", +- cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp", ++ cgitmpdir => "$Munin::Common::Defaults::MUNIN_CGITMPDIR", + ssh_command => "ssh", + ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no", + }, $class ), +diff --git a/master/munin.conf.in b/master/munin.conf.in +index 8d1a75f..046f369 100644 +--- a/master/munin.conf.in ++++ b/master/munin.conf.in +@@ -21,7 +21,7 @@ + # temporary cgi files are here. note that it has to be writable by + # the cgi user (usually nobody or httpd). + # +-# cgitmpdir @@DBDIR@@/cgi-tmp ++# cgitmpdir @@CGITMPDIR@@ + + # (Exactly one) directory to include all files from. + includedir @@CONFDIR@@/munin-conf.d +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch new file mode 100644 index 000000000000..214cc4c4e6b8 --- /dev/null +++ b/net-analyzer/munin/files/patches/0005-node-use-Net-Domain-hostfqdn-instead-of-Sys-Hostname.patch @@ -0,0 +1,44 @@ +From e504b83d0db596a39f32227d4c473575e227037a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 11 Nov 2012 14:38:16 -0800 +Subject: [PATCH 5/7] node: use Net::Domain::hostfqdn instead of + Sys::Hostname::hostname to get the hostname. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This actually makes the test work correctly, but might change the +returned values for some hosts. + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + node/lib/Munin/Node/OS.pm | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/node/lib/Munin/Node/OS.pm b/node/lib/Munin/Node/OS.pm +index 31bebac..b8fa58a 100644 +--- a/node/lib/Munin/Node/OS.pm ++++ b/node/lib/Munin/Node/OS.pm +@@ -12,7 +12,7 @@ use Munin::Node::Config; + use Munin::Common::Timeout; + + use POSIX (); +-use Sys::Hostname; ++use Net::Domain qw(hostfqdn); + + sub get_uid { + my ($class, $user) = @_; +@@ -38,9 +38,7 @@ sub _get_xid { + } + + sub get_fq_hostname { +- my $short = Sys::Hostname::hostname(); +- +- return (gethostbyname $short)[0] || $short || "unknown"; ++ return hostfqdn || "unknown"; + } + + sub check_perms_if_paranoid +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch new file mode 100644 index 000000000000..07b86e4a9f60 --- /dev/null +++ b/net-analyzer/munin/files/patches/0007-node-always-use-the-Effective-UID-not-just-the-UID.patch @@ -0,0 +1,139 @@ +From 50ca7989a481e31d2434f755812070ac8f4e14c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu> +Date: Sun, 11 Nov 2012 15:18:51 -0800 +Subject: [PATCH 7/7] node: always use the Effective UID not just the UID. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> +--- + common/lib/Munin/Common/Defaults.pm | 6 +++--- + node/t/munin_node_config.t | 12 ++++++------ + node/t/munin_node_os.t | 6 +++--- + node/t/munin_node_service.t | 14 +++++++------- + 4 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/common/lib/Munin/Common/Defaults.pm b/common/lib/Munin/Common/Defaults.pm +index 787b596..0f7f292 100644 +--- a/common/lib/Munin/Common/Defaults.pm ++++ b/common/lib/Munin/Common/Defaults.pm +@@ -32,9 +32,9 @@ our $MUNIN_SPOOLDIR = ''; + our $MUNIN_MANDIR = ''; + our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/"; + our $MUNIN_STATEDIR = ''; +-our $MUNIN_USER = getpwuid $UID; +-our $MUNIN_GROUP = getgrgid $GID; +-our $MUNIN_PLUGINUSER = getpwuid $UID; ++our $MUNIN_USER = getpwuid $EUID; ++our $MUNIN_GROUP = getgrgid $EGID; ++our $MUNIN_PLUGINUSER = getpwuid $EUID; + our $MUNIN_VERSION = 'svn'; + our $MUNIN_PERL = '/usr/bin/perl'; + our $MUNIN_PERLLIB = ''; +diff --git a/node/t/munin_node_config.t b/node/t/munin_node_config.t +index b8b6564..3d5530f 100644 +--- a/node/t/munin_node_config.t ++++ b/node/t/munin_node_config.t +@@ -43,13 +43,13 @@ isa_ok($conf, 'Munin::Node::Config'); + + ### Default user + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + + my @res = $conf->_parse_line("default_client_user $uname"); +- is_deeply(\@res, [defuser => $UID], 'Parsing default user name'); ++ is_deeply(\@res, [defuser => $EUID], 'Parsing default user name'); + + @res = $conf->_parse_line("default_client_user $UID"); +- is_deeply(\@res, [defuser => $UID], 'Parsing default user ID'); ++ is_deeply(\@res, [defuser => $EUID], 'Parsing default user ID'); + + eval { $conf->_parse_line("default_client_user xxxyyyzzz") }; + like($@, qr{Default user does not exist}, "Default user exists"); +@@ -184,13 +184,13 @@ isa_ok($conf, 'Munin::Node::Config'); + + ### user + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + + my @res = $conf->_parse_plugin_line("user $uname"); + is_deeply(\@res, [user => $uname], 'Parsing plugin user name'); + +- @res = $conf->_parse_plugin_line("user $UID"); +- is_deeply(\@res, [user => $UID], 'Parsing plugin user ID'); ++ @res = $conf->_parse_plugin_line("user $EUID"); ++ is_deeply(\@res, [user => $EUID], 'Parsing plugin user ID'); + } + + ### group +diff --git a/node/t/munin_node_os.t b/node/t/munin_node_os.t +index 96d7c74..e10d9e6 100644 +--- a/node/t/munin_node_os.t ++++ b/node/t/munin_node_os.t +@@ -13,10 +13,10 @@ my $os = 'Munin::Node::OS'; + + ### get_uid + { +- my $uname = getpwuid $UID; ++ my $uname = getpwuid $EUID; + +- is($os->get_uid($uname), $UID, 'Lookup by user name'); +- is($os->get_uid($UID), $UID, 'Lookup by user ID'); ++ is($os->get_uid($uname), $EUID, 'Lookup by user name'); ++ is($os->get_uid($EUID), $EUID, 'Lookup by user ID'); + + is($os->get_uid('%%SSKK¤¤'), undef, 'Nonexistent user name'); + is($os->get_uid(999999999), undef, 'Nonexistent user ID'); +diff --git a/node/t/munin_node_service.t b/node/t/munin_node_service.t +index 18bda89..7fa050e 100644 +--- a/node/t/munin_node_service.t ++++ b/node/t/munin_node_service.t +@@ -12,8 +12,8 @@ use Munin::Node::Service; + + use English qw(-no_match_vars); + +-my $uname = getpwuid $UID; +-my $gid = (split / /, $GID)[0]; ++my $uname = getpwuid $EUID; ++my $gid = (split / /, $EGID)[0]; + my $gname = getgrgid $gid; + + +@@ -39,7 +39,7 @@ $config->reinitialize({ + + # testing user resolution + uname => { user => $uname }, +- uid => { user => $UID }, ++ uid => { user => $EUID }, + bad_uname => { user => '%%SSKK¤¤' }, + bad_uid => { user => 999999999 }, + +@@ -155,7 +155,7 @@ $ENV{MUNIN_MASTER_IP} = ''; + + ### export_service_environment + { +- my $services = Munin::Node::Service->new(defuser => $UID); ++ my $services = Munin::Node::Service->new(defuser => $EUID); + + $services->export_service_environment('test'); + is($ENV{test_environment_variable}, 'fnord', 'Service-specific environment is exported'); +@@ -164,10 +164,10 @@ $ENV{MUNIN_MASTER_IP} = ''; + + ### _resolve_uid + { +- my $services = Munin::Node::Service->new(defuser => $UID); ++ my $services = Munin::Node::Service->new(defuser => $EUID); + +- is($services->_resolve_uid('uname'), $UID, 'Lookup by service-specific username'); +- is($services->_resolve_uid('uid'), $UID, 'Lookup by service-specific username'); ++ is($services->_resolve_uid('uname'), $EUID, 'Lookup by service-specific username'); ++ is($services->_resolve_uid('uid'), $EUID, 'Lookup by service-specific username'); + + $services->{defuser} = 0; + +-- +2.2.1 + diff --git a/net-analyzer/munin/files/patches/0009-perl-526.patch b/net-analyzer/munin/files/patches/0009-perl-526.patch new file mode 100644 index 000000000000..d3cabb9906c3 --- /dev/null +++ b/net-analyzer/munin/files/patches/0009-perl-526.patch @@ -0,0 +1,26 @@ + + +diff -ruN munin-2.0.33.orig/master/Build.PL munin-2.0.33/master/Build.PL +--- munin-2.0.33.orig/master/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/master/Build.PL 2017-08-05 15:06:55.799816839 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use MasterBuilder; + + use warnings; +diff -ruN munin-2.0.33.orig/node/Build.PL munin-2.0.33/node/Build.PL +--- munin-2.0.33.orig/node/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/node/Build.PL 2017-08-05 15:11:07.689824612 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use NodeBuilder; + + use warnings; +diff -ruN munin-2.0.33.orig/plugins/Build.PL munin-2.0.33/plugins/Build.PL +--- munin-2.0.33.orig/plugins/Build.PL 2017-03-03 00:02:39.000000000 -0000 ++++ munin-2.0.33/plugins/Build.PL 2017-08-05 15:13:57.056168401 -0000 +@@ -1,3 +1,4 @@ ++use lib q[.]; + use PluginsBuilder; + + use warnings; diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml index 591d8ce60e47..9116c71a1546 100644 --- a/net-analyzer/munin/metadata.xml +++ b/net-analyzer/munin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -90,6 +90,6 @@ </flag> </use> <upstream> - <remote-id type="sourceforge">munin</remote-id> + <remote-id type="github">munin-monitoring/munin</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/munin/munin-2.0.49.ebuild b/net-analyzer/munin/munin-2.0.49.ebuild deleted file mode 100644 index 1e0ed2049704..000000000000 --- a/net-analyzer/munin/munin-2.0.49.ebuild +++ /dev/null @@ -1,417 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PATCHSET=1 - -inherit user java-pkg-opt-2 systemd - -MY_P=${P/_/-} - -DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" -SRC_URI=" - https://github.com/munin-monitoring/munin/archive/${PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~graaff/munin/${P}-gentoo-${PATCHSET}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" -IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" -RESTRICT="!test? ( test )" -REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" - -# 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=" - dev-lang/perl:=[berkdb] - dev-perl/DBI - dev-perl/Date-Manip - dev-perl/File-Copy-Recursive - dev-perl/List-MoreUtils - dev-perl/Log-Log4perl - dev-perl/Net-CIDR - dev-perl/Net-DNS - dev-perl/Net-Netmask - dev-perl/Net-SNMP - dev-perl/Net-Server[ipv6(-)?] - virtual/perl-Digest-MD5 - virtual/perl-Getopt-Long - virtual/perl-MIME-Base64 - virtual/perl-Storable - virtual/perl-Text-Balanced - virtual/perl-Time-HiRes - apache2? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) - asterisk? ( dev-perl/Net-Telnet ) - cgi? ( - dev-perl/FCGI - dev-perl/CGI-Fast - ) - dhcpd? ( - >=net-misc/dhcp-3[server] - dev-perl/Net-IP - dev-perl/HTTP-Date - ) - doc? ( dev-python/sphinx ) - http? ( dev-perl/libwww-perl ) - irc? ( dev-perl/Net-IRC ) - ldap? ( dev-perl/perl-ldap ) - kernel_linux? ( sys-process/procps ) - memcached? ( dev-perl/Cache-Memcached ) - mysql? ( - virtual/mysql - dev-perl/Cache-Cache - dev-perl/DBD-mysql - ) - postgres? ( dev-perl/DBD-Pg dev-db/postgresql:* ) - ssl? ( dev-perl/Net-SSLeay ) - syslog? ( virtual/perl-Sys-Syslog ) - !minimal? ( - dev-perl/HTML-Template - dev-perl/IO-Socket-INET6 - dev-perl/URI - >=net-analyzer/rrdtool-1.3[graph,perl] - virtual/ssh - ) - " - -# Keep this seperate, as previous versions have had other deps here -DEPEND="${DEPEND_COM} - dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) - test? ( - dev-perl/Test-Deep - dev-perl/Test-Exception - dev-perl/Test-LongString - dev-perl/Test-Differences - dev-perl/Test-MockModule - dev-perl/Test-MockObject - dev-perl/File-Slurp - dev-perl/IO-stringy - dev-perl/IO-Socket-INET6 - )" -RDEPEND="${DEPEND_COM} - virtual/awk - ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) - java? ( - >=virtual/jre-1.5 - || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) - ) - !minimal? ( - virtual/cron - media-fonts/dejavu - ) - selinux? ( sec-policy/selinux-munin ) - !<sys-apps/openrc-0.11.8" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup munin - enewuser munin 177 -1 /var/lib/munin munin - enewuser munin-async -1 /bin/sh /var/spool/munin-async - esethome munin-async /var/spool/munin-async - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - echo ${PV} > RELEASE || die - - eapply "${WORKDIR}"/patches/*.patch - - eapply_user - - java-pkg-opt-2_src_prepare -} - -src_configure() { - local cgidir='$(DESTDIR)/usr/libexec/munin/cgi' - use cgi || cgidir="${T}/useless/cgi-bin" - - local cgiuser=$(usex apache2 apache munin) - - cat >> "${S}"/Makefile.config <<- EOF - PREFIX=\$(DESTDIR)/usr - CONFDIR=\$(DESTDIR)/etc/munin - DOCDIR=${T}/useless/doc - MANDIR=\$(PREFIX)/share/man - LIBDIR=\$(PREFIX)/libexec/munin - HTMLDIR=\$(DESTDIR)/var/www/localhost/htdocs/munin - CGIDIR=${cgidir} - CGITMPDIR=\$(DESTDIR)/var/cache/munin-cgi - CGIUSER=${cgiuser} - DBDIR=\$(DESTDIR)/var/lib/munin - DBDIRNODE=\$(DESTDIR)/var/lib/munin-node - SPOOLDIR=\$(DESTDIR)/var/spool/munin-async - LOGDIR=\$(DESTDIR)/var/log/munin - PERLSITELIB=$(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 - /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 DESTDIR="${D}" $(usex minimal "install-minimal install-man" install) - - # we remove /run from the install, as it's not the package's to deal - # with. - rm -rf "${D}"/run || die - - # remove the plugins for non-Gentoo package managers; use -f so that - # it doesn't fail when installing on non-Linux platforms. - rm -f "${D}"/usr/libexec/munin/plugins/{apt{,_all},yum} || die - - insinto /etc/munin/plugin-conf.d/ - newins "${FILESDIR}"/${PN}-1.3.2-plugins.conf munin-node - - newinitd "${FILESDIR}"/munin-node_init.d_2.0.19 munin-node - newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node - - newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF - d /run/munin 0700 munin munin - - - EOF - - systemd_dounit "${FILESDIR}"/munin-async.service - systemd_dounit "${FILESDIR}"/munin-graph.{service,socket} - systemd_dounit "${FILESDIR}"/munin-html.{service,socket} - systemd_dounit "${FILESDIR}"/munin-node.service - - cat >> "${T}"/munin.env <<- EOF - CONFIG_PROTECT=/var/spool/munin-async/.ssh - EOF - newenvd "${T}"/munin.env 50munin - - dodoc README ChangeLog INSTALL - if use doc; then - cd "${S}"/doc/_build/html || die - docinto html - dodoc -r * - cd "${S}" || die - fi - - dodir /etc/logrotate.d/ - sed -e "s:@CGIUSER@:$(usex apache2 apache munin):g" \ - "${FILESDIR}"/logrotate.d-munin.3 > "${D}"/etc/logrotate.d/munin - - dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_ - - if use syslog; then - sed -i -e '/log_file/s| .*| Sys::Syslog|' \ - "${D}"/etc/munin/munin-node.conf || die - fi - - # Use a simpler pid file to avoid trouble with /run in tmpfs. The - # munin-node service is ran as user root, and only later drops - # privileges. - sed -i -e 's:/run/munin/munin-node.pid:/run/munin-node.pid:' \ - "${D}"/etc/munin/munin-node.conf || die - - keepdir /var/spool/munin-async/.ssh - touch "${D}"/var/spool/munin-async/.ssh/authorized_keys - fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}} - fperms 0750 /var/spool/munin-async{,/.ssh} - fperms 0600 /var/spool/munin-async/.ssh/authorized_keys - - if use minimal; then - # This requires the presence of munin-update, which is part of - # the non-minimal install... - rm "${D}"/usr/libexec/munin/plugins/munin_stats - else - # remove font files so that we don't have to keep them around - rm "${D}"/usr/libexec/${PN}/*.ttf || die - - if use cgi; then - sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - - keepdir /var/cache/munin-cgi - touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log - fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ - /var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include - fi - else - sed \ - -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' \ - -i "${D}"/etc/munin/munin.conf || die - fi - - keepdir /var/lib/munin/.ssh - cat >> "${D}"/var/lib/munin/.ssh/config <<- EOF - IdentityFile /var/lib/munin/.ssh/id_ecdsa - IdentityFile /var/lib/munin/.ssh/id_rsa - EOF - - fowners munin:munin /var/lib/munin/.ssh/{,config} - fperms go-rwx /var/lib/munin/.ssh/{,config} - - dodir /usr/share/${PN} - cat >> "${D}"/usr/share/${PN}/crontab <<- EOF - # Force the shell to bash - SHELL=/bin/bash - # Mail reports to root@, not munin@ - MAILTO=root - - # This runs the munin task every 5 minutes. - */5 * * * * /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #*/1 * * * * /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #*/2 * * * * /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #*/5 * * * * nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #*/15 * * * * nice /usr/libexec/munin/munin-html - EOF - - cat >> "${D}"/usr/share/${PN}/fcrontab <<- EOF - # Mail reports to root@, not munin@, only execute one at a time - !mailto(root),serial(true) - - # This runs the munin task every 5 minutes. - @ 5 /usr/bin/munin-cron - - # Alternatively, this route works differently - # Update once a minute (for busy sites) - #@ 1 /usr/libexec/munin/munin-update - ## Check for limit excess every 2 minutes - #@ 2 /usr/libexec/munin/munin-limits - ## Update graphs every 5 minutes - #@ 5 nice /usr/libexec/munin/munin-graph - ## Update HTML pages every 15 minutes - #@ 15 nice /usr/libexec/munin/munin-html - EOF - - # remove .htaccess file - find "${D}" -name .htaccess -delete || die - fi -} - -pkg_config() { - if use minimal; then - einfo "Nothing to do." - return 0 - fi - - einfo "Press enter to install the default crontab for the munin master" - einfo "installation from /usr/share/${PN}/f?crontab" - einfo "If you have a large site, you may wish to customize it." - read - - ebegin "Setting up cron ..." - if has_version sys-process/fcron; then - fcrontab - -u munin < /usr/share/${PN}/fcrontab - else - # dcron is very fussy about syntax - # the following is the only form that works in BOTH dcron and vixie-cron - crontab - -u munin < /usr/share/${PN}/crontab - fi - eend $? - - einfo "Press enter to set up the SSH keys used for SSH transport" - read - - # generate one rsa (for legacy) and one ecdsa (for new systems) - ssh-keygen -t rsa \ - -f /var/lib/munin/.ssh/id_rsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - ssh-keygen -t ecdsa \ - -f /var/lib/munin/.ssh/id_ecdsa -N '' \ - -C "created by portage for ${CATEGORY}/${PN}" || die - chown -R munin:munin /var/lib/munin/.ssh || die - chmod 0600 /var/lib/munin/.ssh/id_{rsa,ecdsa} || die - - einfo "Your public keys are available in " - einfo " /var/lib/munin/.ssh/id_rsa.pub" - einfo " /var/lib/munin/.ssh/id_ecdsa.pub" - einfo "and follows for convenience" - echo - cat /var/lib/munin/.ssh/id_*.pub -} - -pkg_postinst() { - elog "Please follow the munin documentation to set up the plugins you" - elog "need, afterwards start munin-node." - elog "" - elog "To make use of munin-async, make sure to set up the corresponding" - elog "SSH key in /var/lib/munin-async/.ssh/authorized_keys" - elog "" - if ! use minimal; then - elog "Please run" - elog " emerge --config net-analyzer/munin" - elog "to automatically configure munin's cronjobs as well as generate" - elog "passwordless SSH keys to be used with munin-async." - fi - elog "" - elog "Further information about setting up Munin in Gentoo can be found" - elog "in the Gentoo Wiki: https://wiki.gentoo.org/wiki/Munin" - - if use cgi; then - chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ - "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log - - if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" - elog "host you want it to be served." - elog "If you want to enable CGI-based HTML as well, you have to add to" - elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." - else - elog "Effective CGI support has just been added in 2.0.7-r6." - elog "Documentation on how to use it is still sparse." - fi - fi - - # we create this here as we don't want Portage to check /run - # symlinks but we still need this to be present before the reboot. - if ! use minimal && ! [[ -d "${ROOT}"/run/munin ]]; then - mkdir "${ROOT}"/run/munin - chown munin:munin "${ROOT}"/run/munin - chmod 0700 "${ROOT}"/run/munin - fi -} diff --git a/net-analyzer/munin/munin-2.0.52-r1.ebuild b/net-analyzer/munin/munin-2.0.69-r1.ebuild index 80f46fab8967..a2e3e857ae21 100644 --- a/net-analyzer/munin/munin-2.0.52-r1.ebuild +++ b/net-analyzer/munin/munin-2.0.69-r1.ebuild @@ -1,23 +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 PATCHSET=1 -inherit java-pkg-opt-2 systemd +inherit java-pkg-opt-2 systemd tmpfiles MY_P=${P/_/-} DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" +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://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 ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" @@ -32,7 +34,6 @@ DEPEND_COM=" acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI - dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl @@ -41,6 +42,7 @@ DEPEND_COM=" 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 @@ -84,7 +86,7 @@ DEPEND_COM=" # Keep this seperate, as previous versions have had other deps here DEPEND="${DEPEND_COM} dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) + java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception @@ -97,10 +99,10 @@ 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.5 + >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( @@ -119,6 +121,9 @@ 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 @@ -131,7 +136,7 @@ src_configure() { local cgiuser=$(usex apache2 apache munin) - cat >> "${S}"/Makefile.config <<- EOF + cat >> "${S}"/Makefile.config <<- EOF || die PREFIX=\$(DESTDIR)/usr CONFDIR=\$(DESTDIR)/etc/munin DOCDIR=${T}/useless/doc @@ -204,8 +209,7 @@ src_install() { newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die d /run/munin 0700 munin munin - - EOF @@ -261,10 +265,8 @@ src_install() { if use cgi; then sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - keepdir /var/cache/munin-cgi touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ /var/log/munin/munin-cgi-{graph,html}.log if use apache2; then @@ -374,6 +376,8 @@ pkg_config() { } 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 "" @@ -392,7 +396,6 @@ pkg_postinst() { if use cgi; then chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log if use apache2; then diff --git a/net-analyzer/munin/munin-2.0.56.ebuild b/net-analyzer/munin/munin-2.0.73-r4.ebuild index 80f46fab8967..de992a88997d 100644 --- a/net-analyzer/munin/munin-2.0.56.ebuild +++ b/net-analyzer/munin/munin-2.0.73-r4.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PATCHSET=1 -inherit java-pkg-opt-2 systemd +inherit java-pkg-opt-2 systemd tmpfiles MY_P=${P/_/-} DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" +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" + " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" @@ -41,6 +41,7 @@ DEPEND_COM=" 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 @@ -84,7 +85,7 @@ DEPEND_COM=" # Keep this seperate, as previous versions have had other deps here DEPEND="${DEPEND_COM} dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) + java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception @@ -97,10 +98,10 @@ 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.5 + >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( @@ -118,7 +119,7 @@ pkg_setup() { src_prepare() { echo ${PV} > RELEASE || die - eapply "${WORKDIR}"/patches/*.patch + eapply "${FILESDIR}"/patches/*.patch eapply_user @@ -131,7 +132,7 @@ src_configure() { local cgiuser=$(usex apache2 apache munin) - cat >> "${S}"/Makefile.config <<- EOF + cat >> "${S}"/Makefile.config <<- EOF || die PREFIX=\$(DESTDIR)/usr CONFDIR=\$(DESTDIR)/etc/munin DOCDIR=${T}/useless/doc @@ -172,6 +173,8 @@ src_test() { } src_install() { + local cgiuser=$(usex apache2 apache munin) + local dirs=" /var/log/munin /var/lib/munin/plugin-state @@ -188,9 +191,9 @@ src_install() { # 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 + # we remove /run and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || die # remove the plugins for non-Gentoo package managers; use -f so that # it doesn't fail when installing on non-Linux platforms. @@ -199,14 +202,14 @@ src_install() { 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 + newinitd "${FILESDIR}"/munin-node_init.d_2.0.73 munin-node newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die d /run/munin 0700 munin munin - - + d /var/cache/munin-cgi 0755 ${cgiuser} munin - - EOF systemd_dounit "${FILESDIR}"/munin-async.service @@ -261,16 +264,13 @@ src_install() { if use cgi; then sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - keepdir /var/cache/munin-cgi touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ /var/log/munin/munin-cgi-{graph,html}.log if use apache2; then insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include + newins "${FILESDIR}"/munin.apache.include-2.4-r1 munin-2.4.include fi else sed \ @@ -374,6 +374,8 @@ pkg_config() { } 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 "" @@ -392,12 +394,11 @@ pkg_postinst() { if use cgi; then chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" + elog "To use Munin with CGI you should include" + elog "/etc/apache2/vhosts.d/munin-2.4.include from the virtual" elog "host you want it to be served." elog "If you want to enable CGI-based HTML as well, you have to add to" elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." diff --git a/net-analyzer/munin/munin-2.0.54.ebuild b/net-analyzer/munin/munin-2.0.74.ebuild index 80f46fab8967..d81f16efcec8 100644 --- a/net-analyzer/munin/munin-2.0.54.ebuild +++ b/net-analyzer/munin/munin-2.0.74.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PATCHSET=1 -inherit java-pkg-opt-2 systemd +inherit java-pkg-opt-2 systemd tmpfiles MY_P=${P/_/-} DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" +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" + " LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" @@ -41,6 +41,7 @@ DEPEND_COM=" 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 @@ -84,7 +85,7 @@ DEPEND_COM=" # Keep this seperate, as previous versions have had other deps here DEPEND="${DEPEND_COM} dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) + java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception @@ -97,10 +98,10 @@ 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.5 + >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( @@ -118,7 +119,7 @@ pkg_setup() { src_prepare() { echo ${PV} > RELEASE || die - eapply "${WORKDIR}"/patches/*.patch + eapply "${FILESDIR}"/patches/*.patch eapply_user @@ -131,7 +132,7 @@ src_configure() { local cgiuser=$(usex apache2 apache munin) - cat >> "${S}"/Makefile.config <<- EOF + cat >> "${S}"/Makefile.config <<- EOF || die PREFIX=\$(DESTDIR)/usr CONFDIR=\$(DESTDIR)/etc/munin DOCDIR=${T}/useless/doc @@ -172,6 +173,8 @@ src_test() { } src_install() { + local cgiuser=$(usex apache2 apache munin) + local dirs=" /var/log/munin /var/lib/munin/plugin-state @@ -188,9 +191,9 @@ src_install() { # 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 + # we remove /run and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || die # remove the plugins for non-Gentoo package managers; use -f so that # it doesn't fail when installing on non-Linux platforms. @@ -199,14 +202,14 @@ src_install() { 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 + newinitd "${FILESDIR}"/munin-node_init.d_2.0.73 munin-node newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die d /run/munin 0700 munin munin - - + d /var/cache/munin-cgi 0755 ${cgiuser} munin - - EOF systemd_dounit "${FILESDIR}"/munin-async.service @@ -261,16 +264,13 @@ src_install() { if use cgi; then sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - keepdir /var/cache/munin-cgi touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ /var/log/munin/munin-cgi-{graph,html}.log if use apache2; then insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include + newins "${FILESDIR}"/munin.apache.include-2.4-r1 munin-2.4.include fi else sed \ @@ -374,6 +374,8 @@ pkg_config() { } 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 "" @@ -392,12 +394,11 @@ pkg_postinst() { if use cgi; then chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" + elog "To use Munin with CGI you should include" + elog "/etc/apache2/vhosts.d/munin-2.4.include from the virtual" elog "host you want it to be served." elog "If you want to enable CGI-based HTML as well, you have to add to" elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." diff --git a/net-analyzer/munin/munin-2.0.52.ebuild b/net-analyzer/munin/munin-2.0.75.ebuild index 56f3cf00bae6..5163d71d6fe0 100644 --- a/net-analyzer/munin/munin-2.0.52.ebuild +++ b/net-analyzer/munin/munin-2.0.75.ebuild @@ -1,23 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PATCHSET=1 -inherit user java-pkg-opt-2 systemd +inherit java-pkg-opt-2 systemd tmpfiles MY_P=${P/_/-} DESCRIPTION="Munin Server Monitoring Tool" -HOMEPAGE="http://munin-monitoring.org/" +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" + " LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" IUSE="asterisk irc java ldap memcached minimal mysql postgres selinux ssl test cgi ipv6 syslog ipmi http dhcpd doc apache2" REQUIRED_USE="cgi? ( !minimal ) apache2? ( cgi )" RESTRICT="!test? ( test )" @@ -27,9 +27,11 @@ RESTRICT="!test? ( test )" # Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly. # We replace the original ipmi plugins with the freeipmi_ plugin which at least works. DEPEND_COM=" + acct-user/munin + acct-user/munin-async + acct-group/munin dev-lang/perl:=[berkdb] dev-perl/DBI - dev-perl/Date-Manip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl @@ -38,6 +40,7 @@ DEPEND_COM=" 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 @@ -81,7 +84,7 @@ DEPEND_COM=" # Keep this seperate, as previous versions have had other deps here DEPEND="${DEPEND_COM} dev-perl/Module-Build - java? ( >=virtual/jdk-1.5 ) + java? ( >=virtual/jdk-1.8 ) test? ( dev-perl/Test-Deep dev-perl/Test-Exception @@ -94,33 +97,28 @@ 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.5 + >=virtual/jre-1.8:* || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) - selinux? ( sec-policy/selinux-munin ) - !<sys-apps/openrc-0.11.8" + selinux? ( sec-policy/selinux-munin )" S="${WORKDIR}/${MY_P}" pkg_setup() { - enewgroup munin - enewuser munin 177 -1 /var/lib/munin munin - enewuser munin-async -1 /bin/sh /var/spool/munin-async - esethome munin-async /var/spool/munin-async java-pkg-opt-2_pkg_setup } src_prepare() { echo ${PV} > RELEASE || die - eapply "${WORKDIR}"/patches/*.patch + eapply "${FILESDIR}"/patches/*.patch eapply_user @@ -133,7 +131,7 @@ src_configure() { local cgiuser=$(usex apache2 apache munin) - cat >> "${S}"/Makefile.config <<- EOF + cat >> "${S}"/Makefile.config <<- EOF || die PREFIX=\$(DESTDIR)/usr CONFDIR=\$(DESTDIR)/etc/munin DOCDIR=${T}/useless/doc @@ -174,6 +172,8 @@ src_test() { } src_install() { + local cgiuser=$(usex apache2 apache munin) + local dirs=" /var/log/munin /var/lib/munin/plugin-state @@ -190,9 +190,9 @@ src_install() { # 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 + # we remove /run and /var/cache from the install, as it's not the + # package's to deal with. + rm -rf "${D}"/run "${D}"/var/cache || die # remove the plugins for non-Gentoo package managers; use -f so that # it doesn't fail when installing on non-Linux platforms. @@ -201,14 +201,14 @@ src_install() { 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 + newinitd "${FILESDIR}"/munin-node_init.d_2.0.73 munin-node newconfd "${FILESDIR}"/munin-node_conf.d_1.4.6-r2 munin-node newinitd "${FILESDIR}"/munin-asyncd.init.2 munin-asyncd - dodir /usr/lib/tmpfiles.d - cat > "${D}"/usr/lib/tmpfiles.d/${CATEGORY}:${PN}:${SLOT}.conf <<- EOF + newtmpfiles - ${CATEGORY}:${PN}:${SLOT}.conf <<-EOF || die d /run/munin 0700 munin munin - - + d /var/cache/munin-cgi 0755 ${cgiuser} munin - - EOF systemd_dounit "${FILESDIR}"/munin-async.service @@ -263,16 +263,13 @@ src_install() { if use cgi; then sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die - keepdir /var/cache/munin-cgi touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log fowners $(usex apache2 apache munin) \ - /var/cache/munin-cgi \ /var/log/munin/munin-cgi-{graph,html}.log if use apache2; then insinto /etc/apache2/vhosts.d - newins "${FILESDIR}"/munin.apache.include munin.include - newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include + newins "${FILESDIR}"/munin.apache.include-2.4-r1 munin-2.4.include fi else sed \ @@ -376,6 +373,8 @@ pkg_config() { } 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 "" @@ -394,12 +393,11 @@ pkg_postinst() { if use cgi; then chown $(usex apache2 apache munin) \ - "${ROOT}"/var/cache/munin-cgi \ "${ROOT}"/var/log/munin/munin-cgi-{graph,html}.log if use apache2; then - elog "To use Munin with CGI you should include /etc/apache2/vhosts.d/munin.include" - elog "or /etc/apache2/vhosts.d/munin-2.4.include (for Apache 2.4) from the virtual" + elog "To use Munin with CGI you should include" + elog "/etc/apache2/vhosts.d/munin-2.4.include from the virtual" elog "host you want it to be served." elog "If you want to enable CGI-based HTML as well, you have to add to" elog "/etc/conf.d/apache2 the option -D MUNIN_HTML_CGI." diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml index a15e870b6e07..9a52f67622ec 100644 --- a/net-analyzer/nagios-check_dnssec/metadata.xml +++ b/net-analyzer/nagios-check_dnssec/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_fail2ban/Manifest b/net-analyzer/nagios-check_fail2ban/Manifest deleted file mode 100644 index 7c3c26d68eab..000000000000 --- a/net-analyzer/nagios-check_fail2ban/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nagios-check_fail2ban-3.tar.gz 1848 BLAKE2B 61c1683bfa1e41ea27caa58ce9491d531751d96c4646e1d618a0f92bef2fe65b31c1d4bcebfe9c9c0b2498f7ad810d4dcabaf723e34bbde7e229020789e7b538 SHA512 a032042f8588575ef70c6644c5d385a18b25b89d71b067cdfe78230e5e53c2fb5bf88de1d97aa9411bfec00b213f6e1eae800e9545f0d8d4bad4e3c878927f9c diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml deleted file mode 100644 index 42237b76505e..000000000000 --- a/net-analyzer/nagios-check_fail2ban/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="github">hollow/check_fail2ban</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild deleted file mode 100644 index ac86c2830797..000000000000 --- a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib autotools - -GITHUB_AUTHOR="hollow" -GITHUB_PROJECT="check_fail2ban" -GITHUB_COMMIT="c554837" - -DESCRIPTION="A nagios plugin for checking the fail2ban daemon" -HOMEPAGE="https://github.com/hollow/check_fail2ban" -SRC_URI="https://nodeload.github.com/${GITHUB_AUTHOR}/${GITHUB_PROJECT}/tarball/v${PV} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 >=net-analyzer/monitoring-plugins-2 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${GITHUB_AUTHOR}-${GITHUB_PROJECT}-${GITHUB_COMMIT} - -src_prepare() { - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch b/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch new file mode 100644 index 000000000000..3e02afe6e004 --- /dev/null +++ b/net-analyzer/nagios-check_glsa2/files/nagios-check_glsa2-20120930-CACHEDIR.patch @@ -0,0 +1,11 @@ +--- a/check_glsa2_cached.sh ++++ b/check_glsa2_cached.sh +@@ -8,7 +8,7 @@ + # Caches the result of check_glsa2.sh + # First line is the return code, rest of the file is the message + NAME=$(basename $0 .sh) +-CACHEDIR=/var/lib/gentoo/ ++CACHEDIR=/var/cache/check_glsa2 + CACHEFILE=${CACHEDIR}/check_glsa2.cache + SCRIPT=/usr/lib/nagios/plugins/check_glsa2.sh + ret=0 diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml index d01f11d38ed2..8bf8203f36ea 100644 --- a/net-analyzer/nagios-check_glsa2/metadata.xml +++ b/net-analyzer/nagios-check_glsa2/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild index 5b6ab2dd057a..aba3bf1143f7 100644 --- a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild +++ b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild @@ -1,38 +1,31 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit multilib user - -DESCRIPTION="Nagios check script for GLSAs (Gentoo Linux Security Advisories)" -HOMEPAGE="https://github.com/craig/check_glsa2" +EAPI=7 MY_PN="${PN/nagios-/}" MY_P="${MY_PN}-${PV}" -S="${WORKDIR}/${MY_P}" +DESCRIPTION="Nagios check script for GLSAs (Gentoo Linux Security Advisories)" +HOMEPAGE="https://github.com/craig/check_glsa2" SRC_URI="https://dev.gentoo.org/~flameeyes/${MY_PN}/${MY_P}.tar.xz" + LICENSE="GPL-2 BSD-2" SLOT="0" - KEYWORDS="amd64" -RDEPEND="app-portage/gentoolkit" -DEPEND="" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /dev/null nagios -} +DEPEND=" + acct-group/nagios + acct-user/nagios" +RDEPEND=" + ${DEPEND} + app-portage/gentoolkit" -src_prepare() { - sed -i -e '/CACHEDIR=/s:=.*:=/var/cache/check_glsa2:' ${MY_PN}_cached.sh || die -} +S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}"/${PN}-20120930-CACHEDIR.patch ) src_install() { - local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins - exeinto ${nagiosplugindir} + exeinto /usr/$(get_libdir)/nagios/plugins doexe *.sh dodoc README diff --git a/net-analyzer/nagios-check_ipmi_sensor/Manifest b/net-analyzer/nagios-check_ipmi_sensor/Manifest index d625aa728559..45e45ed8c88f 100644 --- a/net-analyzer/nagios-check_ipmi_sensor/Manifest +++ b/net-analyzer/nagios-check_ipmi_sensor/Manifest @@ -1,2 +1 @@ -DIST check_ipmi_sensor_v3-14e6586.tgz 21836 BLAKE2B f56a44c5afd4583e64bd0e938aa03ec51a659a5f18c01685e3e03115f46ceda62ae899be677b1ba993cc0543c8cb775c9cc0c35c4b862b678a873e57e0361d21 SHA512 ac0744348e4d68459326396ee7fcc98bb0c3d2115fcf9724c7391f6f8dc9c0e2bb89a832822424b415acc3062201fb67d7eaceb4b9f2f41526e5fe8823187a0e -DIST check_ipmi_sensor_v3-8120430.tgz 20620 BLAKE2B 2542c4320498700362e8e7c1cfe0d00d98e4894e987aac002f0e2db499fdab4c27b33ff587349a836ae18d7b89939a96f6a66484b46486caa0d548c3e794d1c3 SHA512 89b3fd7ae2d523e1510c528d44d03ad9af5bc174bb325393f50a4a95380c996867b4502b55f38712515f556fe0f2019e15f6800ca1db00a9bbbcef655f1fd845 +DIST check_ipmi_sensor_v3-3.13.tar.gz 27079 BLAKE2B 19f2eddeeb43a73eb8faa2907b53f2b0514a19a3313e90487082c463ef12a128cb3b252457768c1afcacd06402b572f54cab7c05d159df4e6f7881b191663046 SHA512 b117ca13936e8c2201f3262302004bd0f903d19ee7289222962ee6b53119ba8306cdf355292c63b9d7639d850bd59c24b2875ccb8b3c408bdac60d144837e97a diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml index 465282765dab..fa9820eeefb9 100644 --- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml +++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>idl0r@gentoo.org</email> diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild index 331c378057a1..994a1a52d408 100644 --- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild +++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.13.ebuild @@ -1,16 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit multilib versionator - -MY_COMMIT="8120430" -MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}" +MY_P="${PN#nagios-}_v$(ver_cut 1)-${PV}" DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga" HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/" -SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz" +SRC_URI="https://github.com/thomas-krenn/check_ipmi_sensor_v3/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -28,5 +25,5 @@ src_install() { exeinto /usr/$(get_libdir)/nagios/plugins doexe check_ipmi_sensor - dodoc changelog.txt + dodoc changelog } diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild deleted file mode 100644 index d549df34bd51..000000000000 --- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib versionator - -MY_COMMIT="14e6586" -MY_P="${PN#nagios-}_v$(get_major_version $PV)-${MY_COMMIT}" - -DESCRIPTION="IPMI Sensor Monitoring Plugin for Nagios/Icinga" -HOMEPAGE="http://www.thomas-krenn.com/en/oss/ipmi-plugin/" -SRC_URI="http://git.thomas-krenn.com/?p=check_ipmi_sensor_v3.git;a=snapshot;h=${MY_COMMIT};sf=tgz -> ${MY_P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="" - -DEPEND="" -RDEPEND="dev-lang/perl - dev-perl/IPC-Run - sys-libs/freeipmi" - -S="${WORKDIR}/${MY_P}" - -src_install() { - exeinto /usr/$(get_libdir)/nagios/plugins - doexe check_ipmi_sensor - - dodoc changelog.txt -} diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest index b57e8c706be7..b567506ad048 100644 --- a/net-analyzer/nagios-check_linux_bonding/Manifest +++ b/net-analyzer/nagios-check_linux_bonding/Manifest @@ -1 +1 @@ -DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81 +DIST check_linux_bonding-1.4.gh.tar.gz 24921 BLAKE2B ef582184471e4ca9d4b9a1d5cdee481852f1f452806ca081e04e74b7b469109f3a5998708cdb7ee6d3ffa9240cdbf721f0cbf6b3f4be2c4cc62042fce6647ccd SHA512 e8195d012a3da53983acdb8ea54d87995541e4e303dce28683ca04b6a6f84826c37db42c295b7e121092482a49268f57355284b57bb77a2212c46b834dd57088 diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml index 7a38bb900964..ace7a7a10525 100644 --- a/net-analyzer/nagios-check_linux_bonding/metadata.xml +++ b/net-analyzer/nagios-check_linux_bonding/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> + <upstream> + <remote-id type="github">glynastill/check_linux_bonding-1.4</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild index f5b6af3adc6b..558d1eb00b93 100644 --- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild +++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4-r1.ebuild @@ -1,25 +1,23 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit multilib - -MY_P=${P/nagios-/} +EGIT_COMMIT="fde23cba225870ceb1162d918a6307c608e654a5" +MY_P="${P/nagios-/}" DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces" -HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html" -SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz" +HOMEPAGE="https://github.com/glynastill/check_linux_bonding-1.4" +SRC_URI="https://github.com/glynastill/${MY_P}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.gh.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND="dev-lang/perl" DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}"/${MY_P}-${EGIT_COMMIT} src_install() { default diff --git a/net-analyzer/nagios-check_logfiles/Manifest b/net-analyzer/nagios-check_logfiles/Manifest index cec2e146f4c3..79e3ec445ea2 100644 --- a/net-analyzer/nagios-check_logfiles/Manifest +++ b/net-analyzer/nagios-check_logfiles/Manifest @@ -1 +1 @@ -DIST nagios-check_logfiles-3.7.6.3.tar.gz 238683 BLAKE2B c2bd47a13263ac76c1bbced7a1410416c07ef35b39ea60bbf6037de3c10dd00df30a215f461270501240d5eb35e2b687fd5590d291028d7975c15470c06177a4 SHA512 2f72d571bfc0815e12b5c9a6e178b7b9b6e58d69e2d1a3efc560dd6b7bfd3d04a705d15e93069959611be1981941866e8775ee7d67c5dbf3983a155ab2ec3c91 +DIST nagios-check_logfiles-4.0.1.3.tar.gz 254371 BLAKE2B d4219e03ac2b981b08866baa4eab4fb16857215cb817ee44f23690094a3b29bf806caa6c1cd98c439ba81fa31cd63ce1fcfca5c92d1aad260490db087a560fd7 SHA512 1893e67d9b27939fae6f330b1f796e98becbb1c4bd1dfe11811236b0d9bcdab0b2fea2a49f7b90302d15c75328422f479d1a26a486cfbe1ec0d3b8f9b71a5150 diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml index 599b5a1c1aec..78600c1844fe 100644 --- a/net-analyzer/nagios-check_logfiles/metadata.xml +++ b/net-analyzer/nagios-check_logfiles/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild index bf4835955eaa..654975febfc5 100644 --- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild +++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-4.0.1.3.ebuild @@ -1,7 +1,7 @@ -# 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 DESCRIPTION="A nagios plugin for checking logfiles" HOMEPAGE="https://labs.consol.de/nagios/check_logfiles/index.html" diff --git a/net-analyzer/nagios-check_multiple/metadata.xml b/net-analyzer/nagios-check_multiple/metadata.xml index 9956f0ad2444..15b67112297a 100644 --- a/net-analyzer/nagios-check_multiple/metadata.xml +++ b/net-analyzer/nagios-check_multiple/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild index cb417ce910b5..8444b98c88c4 100644 --- a/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1.ebuild +++ b/net-analyzer/nagios-check_multiple/nagios-check_multiple-0.0.1-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) -DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python{3_10,3_11,3_12} ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 MY_PN="check_multiple" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/clarkbox/check_multiple/archive/v${PV}.tar.gz -> ${P LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml index 1e9767fee723..81522baa168e 100644 --- a/net-analyzer/nagios-check_mysql_health/metadata.xml +++ b/net-analyzer/nagios-check_mysql_health/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild new file mode 100644 index 000000000000..3de8e319875f --- /dev/null +++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN#nagios-}" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Nagios plugin for checking MySQL server health" +HOMEPAGE="https://labs.consol.de/nagios/check_mysql_health/" +SRC_URI="https://labs.consol.de/assets/downloads/nagios/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +# Found by grepping for "use " in the built +# plugins-scripts/check_mysql_health. +RDEPEND=" + dev-perl/DBD-mysql + dev-perl/DBI + virtual/perl-Data-Dumper + virtual/perl-File-Temp + virtual/perl-Net-Ping + virtual/perl-Time-HiRes + " + +src_configure() { + # Should match net-analyzer/{monitoring,nagios}-plugins. + econf --libexecdir="/usr/$(get_libdir)/nagios/plugins" +} + +# Here we should have a pkg_preinst() that creates the nagios user/group +# (using the same command from e.g. net-analyzer/nagios-plugins). But +# right now, the build system for check_mysql_health has a bug: it +# doesn't use the configured user (INSTALL_OPTIONS aren't passed to +# /usr/bin/install), so it's pointless. Don't forget to inherit +# user.eclass! diff --git a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild index c1ded10ef9f3..94445a4c903e 100644 --- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild +++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild @@ -26,7 +26,7 @@ RDEPEND="dev-perl/DBD-mysql S="${WORKDIR}/${MY_P}" -src_configure(){ +src_configure() { # Should match net-analyzer/{monitoring,nagios}-plugins. econf --libexecdir="/usr/$(get_libdir)/nagios/plugins" } diff --git a/net-analyzer/nagios-check_pidfile/Manifest b/net-analyzer/nagios-check_pidfile/Manifest deleted file mode 100644 index 00126e06f315..000000000000 --- a/net-analyzer/nagios-check_pidfile/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST nagios-check_pidfile-1.tar.gz 2137 BLAKE2B bb0b7239ab9dfb4acb3a40f16cc5537605c60256f6c1efcddc9b6001dffc71f7e7ae8f58b6cbb568afd71200e672e3b348ce3b9c360407b731d3f40ab81fa514 SHA512 a24493a72f6d9fb4daf606a131a3a6cafe6085b1d47f7b0f7944642929e86b5d29cf46fb28c20b7683ea5b9a99beb93bb5f32a08542e2e9af613e4cc62197ffe diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml deleted file mode 100644 index b0bc64ef4267..000000000000 --- a/net-analyzer/nagios-check_pidfile/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="github">hollow/check_pidfile</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild deleted file mode 100644 index 0c557fdb768e..000000000000 --- a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools - -DESCRIPTION="A nagios plugin for checking daemons via pidfiles" -HOMEPAGE="https://github.com/hollow/check_pidfile" -SRC_URI="https://github.com/hollow/check_pidfile/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="|| ( >=net-analyzer/nagios-plugins-1.4.13-r1 net-analyzer/monitoring-plugins )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/check_pidfile-${PV} - -src_prepare() { - eautoreconf -} - -src_install() { - emake DESTDIR="${D}" install -} diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest index 1b3800e794d7..49b67622e22b 100644 --- a/net-analyzer/nagios-check_rbl/Manifest +++ b/net-analyzer/nagios-check_rbl/Manifest @@ -1 +1 @@ -DIST check_rbl-1.4.1.tar.gz 47585 BLAKE2B 24979d1579ef46f6d0626700bb8b9aa3f3acd4b422398ecbfa98909248fd6ffe61a763e377e7942d3078d8b91488f3fc0e2ab25f7c4821bcfa5cde08d000bd5c SHA512 3023aab6ba42dec46cb93eb2ef15e1998a1b3226bd1f143441e14a4271279ac9b24b85b9fc41a382eb203e5d2846b7f4ea4fe27db99d75b104d9182ea53079cb +DIST check_rbl-1.7.0.tar.gz 51673 BLAKE2B 7e2d23ea5cd44082ebe9963326bc2a8517c737640fada229d0b65d64ac92ce50e80b675834f4bd7dbc56d653e0243558fe6f1c402b11498d48bc948d3facda57 SHA512 5b219362bfa736832e935c64019ee50b87d4f9cc2bce0ab4795eb4c59e03712adc9461cdd6624cbaf1d98a5afdd9f611dbdc58fd913a4478b0fef0664cddcf80 diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml index 366e3f343c3c..4590e0aecc4c 100644 --- a/net-analyzer/nagios-check_rbl/metadata.xml +++ b/net-analyzer/nagios-check_rbl/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild index dad8c4b7918b..96510e0ddb18 100644 --- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.4.1.ebuild +++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.7.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Monitor whether or not a host is blacklisted" HOMEPAGE="https://github.com/matteocorti/check_rbl" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/matteocorti/check_rbl/releases/download/v${PV}/${MY_ LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 hppa sparc x86" +KEYWORDS="amd64 ~hppa sparc x86" IUSE="" # No, this is not redundant -- see bug 627082. @@ -20,6 +20,7 @@ RESTRICT=test # The package's INSTALL/Makefile.PL files specify its dependencies. # +# * Capture::Tiny (dev-perl/Capture-Tiny) # * Data::Validate::Domain (dev-perl/Data-Validate-Domain) # * Data::Validate::IP (dev-perl/Data-Validate-IP) # * IO::Select (dev-lang/perl) @@ -29,14 +30,17 @@ RESTRICT=test # * Net::DNS (dev-perl/Net-DNS) # * Net::IP (dev-perl/Net-IP) # * Readonly (dev-perl/Readonly) +# * Socket (virtual/perl-Socket) # RDEPEND="dev-lang/perl + dev-perl/Capture-Tiny dev-perl/Data-Validate-Domain dev-perl/Data-Validate-IP dev-perl/Monitoring-Plugin dev-perl/Net-DNS dev-perl/Net-IP - dev-perl/Readonly" + dev-perl/Readonly + virtual/perl-Socket" DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest index c1cd0864f89f..6a4ac48da0dc 100644 --- a/net-analyzer/nagios-core/Manifest +++ b/net-analyzer/nagios-core/Manifest @@ -1,3 +1,3 @@ -DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316 -DIST nagios-4.4.5.tar.gz 11304463 BLAKE2B e1152c2cd14aa790fbdb84c0d7b3eb4691b05793640bf2871bc4ab1e2d645bb52bb2d1660b7389fb26d599d015f71820988ed1cd58003ed978dd9df38c357675 SHA512 14372e2e4470229bd000a8ad94def6ae504ce3f8e2cf94a9da73736560d1e3b2633302fe232ee7099d88ba00aecde5a9e352901828d6d9a9cd1fdce203deca30 +DIST nagios-4.4.14.tar.gz 11341108 BLAKE2B 254b17fdd90670701d42f4bc90c741592bc21f0813903e5cdcaa671c9b4b7eb32964ae56acf56567198bb8b6d96ce7539bf343b870a4732a46d31557d161a1c1 SHA512 dd7ddaf114ac6451b5f157f36bdba27068e94dcfe583cc217f220162b013341984622828574feda8c3c0990388a03ab886791a3188e56bf2eb6b3f8c777c3641 +DIST nagios-4.5.1.tar.gz 11540195 BLAKE2B 8fa4654a2e7f218d65c8a318418002f09b0e118f44382030900587881d9fac868e8b4416be8e9fb2ae74444aecb9555719ef29bc88fd95067d84aecca4bacf28 SHA512 71b57d4e0bd2971e8e62b7013c406888d0afd40bc23b032ee9bfdb6e2b3cb083746c5259ef997df241249d2ddaafd6ba5a6470527feddf02e03da32cc0c724b9 DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766 diff --git a/net-analyzer/nagios-core/files/99_nagios4.conf b/net-analyzer/nagios-core/files/99_nagios4.conf deleted file mode 100644 index b04c2980ebab..000000000000 --- a/net-analyzer/nagios-core/files/99_nagios4.conf +++ /dev/null @@ -1,16 +0,0 @@ -<IfDefine NAGIOS> - - ScriptAlias /nagios/cgi-bin/ /usr/lib/nagios/cgi-bin/ - <Directory "/usr/lib/nagios/cgi-bin/"> - AllowOverride AuthConfig - Options ExecCGI - Require all granted - </Directory> - - Alias /nagios /usr/share/nagios/htdocs - <Directory "/usr/share/nagios/htdocs"> - AllowOverride AuthConfig - Require all granted - </Directory> - -</IfDefine> diff --git a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf b/net-analyzer/nagios-core/files/lighttpd_nagios4.conf deleted file mode 100644 index a073f177f238..000000000000 --- a/net-analyzer/nagios-core/files/lighttpd_nagios4.conf +++ /dev/null @@ -1,15 +0,0 @@ -server.modules += ("mod_cgi") -server.modules += ("mod_alias") - -$HTTP["url"] =~ "^/nagios/cgi-bin/" { - dir-listing.activate = "disable" - cgi.assign = ( - ".pl" => "/usr/bin/perl", - ".cgi" => "" - ) -} - -alias.url += ( - "/nagios/cgi-bin" => "/usr/lib/nagios/cgi-bin", - "/nagios" => "/usr/share/nagios/htdocs" -) diff --git a/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch new file mode 100644 index 000000000000..eda71db9bcd4 --- /dev/null +++ b/net-analyzer/nagios-core/files/nagios-core-4.5.1-musl.patch @@ -0,0 +1,98 @@ +From 19602faf7111203b748a4dc9ccaf3111586a8e96 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:01:52 -0400 +Subject: [PATCH 1/2] Fix #952 - s/uint/unsigned int/g + +--- + Changelog | 4 ++++ + lib/t-utils.c | 10 +++++----- + lib/test-dkhash.c | 2 +- + 3 files changed, 10 insertions(+), 6 deletions(-) + +diff --git a/Changelog b/Changelog +index ec3cd64fc..fcf4742f2 100644 +--- a/Changelog ++++ b/Changelog +@@ -2,6 +2,10 @@ + Nagios Core 4 Change Log + ######################## + ++4.5.2 - 2024-04-30 ++------------------ ++* Fix build when compiling against musl libc (#952) (Sebastian Wolf) ++ + 4.5.1 - 2024-02-28 + ------------------- + * Fix text rendering in Configuration -> Command Expansion when the command ends in whitespace (Thanks Joran LEREEC for reporting this issue) (Dylan Anderson) +diff --git a/lib/t-utils.c b/lib/t-utils.c +index badab7c03..123f114c8 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -1,8 +1,8 @@ + #include "t-utils.h" + + const char *cyan = "", *red = "", *green = "", *yellow = "", *reset = ""; +-uint passed, failed, t_verbose = 0; +-static uint t_depth; ++unsigned int passed, failed, t_verbose = 0; ++static unsigned int t_depth; + static const char *indent_str = " "; + + /* can't be used when a or b has side-effects, but we don't care here */ +@@ -27,9 +27,9 @@ void t_set_colors(int force) + } + } + +-static void t_indent(uint depth) ++static void t_indent(unsigned int depth) + { +- uint i; ++ unsigned int i; + for (i = 0; i < depth; i++) { + printf("%s", indent_str); + } +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_uint(uint a, uint b, const char *name) ++int ok_unsigned int(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); +diff --git a/lib/test-dkhash.c b/lib/test-dkhash.c +index 6db1d7a92..15c2b676c 100644 +--- a/lib/test-dkhash.c ++++ b/lib/test-dkhash.c +@@ -68,7 +68,7 @@ static struct test_data *ddup(int x, int i, int j) + } + + struct dkhash_check { +- uint entries, count, max, added, removed; ++ unsigned int entries, count, max, added, removed; + int ent_delta, addrm_delta; + }; + + +From c4f56318e6ecfab85d592ea302d747c80be5f557 Mon Sep 17 00:00:00 2001 +From: Sebastian Wolf <swolf@nagios.com> +Date: Fri, 29 Mar 2024 17:04:29 -0400 +Subject: [PATCH 2/2] derp + +--- + lib/t-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/t-utils.c b/lib/t-utils.c +index 123f114c8..24098655f 100644 +--- a/lib/t-utils.c ++++ b/lib/t-utils.c +@@ -136,7 +136,7 @@ int ok_int(int a, int b, const char *name) + return TEST_FAIL; + } + +-int ok_unsigned int(unsigned int a, unsigned int b, const char *name) ++int ok_uint(unsigned int a, unsigned int b, const char *name) + { + if (a == b) { + t_pass("%s", name); diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml index 2837e2b7ed5c..a696209a6257 100644 --- a/net-analyzer/nagios-core/metadata.xml +++ b/net-analyzer/nagios-core/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild deleted file mode 100644 index 53142ce95408..000000000000 --- a/net-analyzer/nagios-core/nagios-core-4.3.4.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs user - -MY_P=${PN/-core}-${PV} -DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation" -HOMEPAGE="https://www.nagios.org/" - -# The name of the directory into which our Gentoo icons will be -# extracted, and also the basename of the archive containing it. -GENTOO_ICONS="${PN}-gentoo-icons-20141125" -SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz - web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86" -IUSE="apache2 classicui lighttpd perl +web vim-syntax" - -# In pkg_postinst(), we change the group of the Nagios configuration -# directory to that of the web server user. It can't belong to both -# apache/lighttpd groups at the same time, so we block this combination -# for our own sanity. -# -# This could be made to work, but we would need a better way to allow -# the web user read-only access to Nagios's configuration directory. -# -REQUIRED_USE="apache2? ( !lighttpd )" - -# sys-devel/libtool dependency is bug #401237. -# -# Note, we require one of the apache2 CGI modules: -# -# * mod_cgi -# * mod_cgid -# * 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 -DEPEND="sys-devel/libtool - virtual/mailx - perl? ( dev-lang/perl:= ) - web? ( - app-arch/unzip - media-libs/gd[jpeg,png] - lighttpd? ( www-servers/lighttpd[php] ) - apache2? ( - || ( - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) - || ( - dev-lang/php:*[apache2] - dev-lang/php:*[cgi] - dev-lang/php:*[fpm] ) - ) - )" -RDEPEND="${DEPEND} - vim-syntax? ( app-vim/nagios-syntax )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -src_configure() { - local myconf - - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - - if use !apache2 && use !lighttpd ; then - myconf="${myconf} --with-command-group=nagios" - else - if use apache2 ; then - myconf="${myconf} --with-command-group=apache" - myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d" - elif use lighttpd ; then - myconf="${myconf} --with-command-group=lighttpd" - fi - fi - - econf ${myconf} \ - --prefix=/usr \ - --bindir=/usr/sbin \ - --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \ - --datadir=/usr/share/nagios/htdocs \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins -} - -src_compile() { - emake CC=$(tc-getCC) nagios - - if use web; then - # Only compile the CGIs/HTML when USE=web is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis html - fi -} - -src_install() { - dodoc Changelog CONTRIBUTING.md README.asciidoc 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 - - if use web; then - # There is no way to install the CGIs unstripped from the - # top-level makefile, so descend into cgi/ here. The empty - # INSTALL_OPTS ensures that root:root: owns the CGI executables. - cd "${S}/cgi" || die - emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped - cd "${S}" || die - - # install-html installs the new exfoliation theme - emake INSTALL_OPTS="" DESTDIR="${D}" install-html - - if use classicui; then - # This overwrites the already-installed exfoliation theme - emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui - fi - - # Install cute Gentoo icons (bug #388323), setting their - # owner, group, and mode to match those of the rest of Nagios's - # images. - insinto /usr/share/nagios/htdocs/images/logos - doins "${WORKDIR}/${GENTOO_ICONS}"/*.* - fi - - newinitd openrc-init nagios - - if use web ; then - if use apache2 ; then - # Install the Nagios configuration file for Apache. - insinto "/etc/apache2/modules.d" - doins "${FILESDIR}"/99_nagios4.conf - elif use lighttpd ; then - # Install the Nagios configuration file for Lighttpd. - insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios4.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 -} diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild index b6994129cefe..fe6f6dd27afe 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r3.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.4.14.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs user +inherit systemd toolchain-funcs -MY_P=${PN/-core}-${PV} +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 +SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="apache2 classicui lighttpd perl +web vim-syntax" +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 @@ -33,9 +33,9 @@ REQUIRED_USE="apache2? ( !lighttpd )" # # Note, we require one of the apache2 CGI modules: # -# * mod_cgi -# * mod_cgid -# * mod_fcgid +# * 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 @@ -47,41 +47,52 @@ REQUIRED_USE="apache2? ( !lighttpd )" # extract a snapshot of AngularJS, but that's only needed when USE=web. # MOD_ALIAS=apache2_modules_alias -DEPEND="dev-libs/libltdl:0 + +# The dependencies checked by the configure script. All of these are +# also runtime dependencies; that's why ./configure checks for them. +CONFIGURE_DEPEND="acct-group/nagios + acct-user/nagios virtual/mailx - perl? ( dev-lang/perl:= ) + 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? ( - app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) + 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] ) ) - )" -RDEPEND="${DEPEND} + ) vim-syntax? ( app-vim/nagios-syntax )" S="${WORKDIR}/${MY_P}" -pkg_setup() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - src_configure() { local myconf - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - if use !apache2 && use !lighttpd ; then myconf="${myconf} --with-command-group=nagios" else @@ -93,22 +104,39 @@ src_configure() { 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=/usr \ - --bindir=/usr/sbin \ - --localstatedir=/var/lib/nagios \ - --sysconfdir=/etc/nagios \ - --libexecdir=/usr/$(get_libdir)/nagios/plugins \ - --with-cgibindir=/usr/$(get_libdir)/nagios/cgi-bin \ - --with-webdir=/usr/share/nagios/htdocs + --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 + emake CC="$(tc-getCC)" nagios if use web; then # Only compile the CGIs/HTML when USE=web is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis html + emake CC="$(tc-getCC)" cgis html fi } @@ -170,17 +198,23 @@ src_install() { 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" - doins "${FILESDIR}"/99_nagios4.conf + newins "${T}/99_nagios4-r1.conf" "99_nagios4.conf" elif use lighttpd ; then # Install the Nagios configuration file for Lighttpd. insinto /etc/lighttpd - newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf + 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" @@ -195,13 +229,13 @@ pkg_postinst() { 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 "${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 "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios" elog "will be available at," elog fi @@ -219,11 +253,11 @@ pkg_postinst() { 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 "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 " 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" diff --git a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild index 6ec6bb7044f5..8350b6e27910 100644 --- a/net-analyzer/nagios-core/nagios-core-4.4.5-r6.ebuild +++ b/net-analyzer/nagios-core/nagios-core-4.5.1.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit systemd toolchain-funcs -MY_P=${PN/-core}-${PV} +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 +SRC_URI="https://downloads.sourceforge.net/nagios/${MY_P}.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="apache2 classicui lighttpd perl +web vim-syntax" +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 @@ -33,9 +33,9 @@ REQUIRED_USE="apache2? ( !lighttpd )" # # Note, we require one of the apache2 CGI modules: # -# * mod_cgi -# * mod_cgid -# * mod_fcgid +# * 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 @@ -47,38 +47,54 @@ REQUIRED_USE="apache2? ( !lighttpd )" # extract a snapshot of AngularJS, but that's only needed when USE=web. # MOD_ALIAS=apache2_modules_alias -DEPEND="acct-group/nagios + +# 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 - dev-libs/libltdl:0 virtual/mailx - perl? ( dev-lang/perl:= ) + dev-lang/perl:=" + +# In addition to the things that the ./configure script checks for, +# we also need to be able to unzip stuff on the build host. +# +# We need the apache/lighttpd groups in src_install() for the things +# installed as the --with-command-group argument, so they go here too. +# The groups are also needed at runtime, but that is ensured by apache +# and lighttpd themselves being in RDEPEND. +BDEPEND="${CONFIGURE_DEPEND} + apache2? ( acct-group/apache ) + lighttpd? ( acct-group/lighttpd ) + web? ( app-arch/unzip )" + +# This is linked into /usr/bin/nagios{,tats} +DEPEND="dev-libs/libltdl:0" + +RDEPEND="${CONFIGURE_DEPEND} + ${DEPEND} web? ( - app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid] - >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] ) + 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] ) ) - )" -RDEPEND="${DEPEND} + ) vim-syntax? ( app-vim/nagios-syntax )" S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}/${P}-musl.patch" ) + src_configure() { local myconf - if use perl; then - myconf="${myconf} --enable-embedded-perl --with-perlcache" - fi - if use !apache2 && use !lighttpd ; then myconf="${myconf} --with-command-group=nagios" else @@ -90,6 +106,9 @@ src_configure() { 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" \ @@ -97,7 +116,8 @@ src_configure() { --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-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. @@ -114,11 +134,11 @@ src_configure() { } src_compile() { - emake CC=$(tc-getCC) nagios + emake CC="$(tc-getCC)" nagios if use web; then # Only compile the CGIs/HTML when USE=web is set. - emake CC=$(tc-getCC) DESTDIR="${D}" cgis html + emake CC="$(tc-getCC)" cgis html fi } @@ -180,7 +200,13 @@ src_install() { 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 @@ -205,13 +231,13 @@ pkg_postinst() { 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 "${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 "file at ${ROOT}/etc/lighttpd/lighttpd.conf. Then Nagios" elog "will be available at," elog fi @@ -229,11 +255,11 @@ pkg_postinst() { 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 "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 " 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" diff --git a/net-analyzer/nagios-icinga-openvpn/metadata.xml b/net-analyzer/nagios-icinga-openvpn/metadata.xml index 45125b9b6e99..e8fbfcfe3519 100644 --- a/net-analyzer/nagios-icinga-openvpn/metadata.xml +++ b/net-analyzer/nagios-icinga-openvpn/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> <name>Michael Orlitzky</name> </maintainer> + <upstream> + <remote-id type="github">liquidat/nagios-icinga-openvpn</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.ebuild index fce8d525b7e6..f2cd71d9e794 100644 --- a/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1.ebuild +++ b/net-analyzer/nagios-icinga-openvpn/nagios-icinga-openvpn-0.0.1-r4.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_10 python3_11 python3_12 ) +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 MY_PN="check_openvpn" @@ -14,7 +15,6 @@ SRC_URI="https://github.com/liquidat/nagios-icinga-openvpn/archive/${PV}.tar.gz LICENSE="MIT" SLOT="0" KEYWORDS="amd64" -IUSE="" src_install() { distutils-r1_src_install diff --git a/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml index 3ded77e652ff..14eeb18b6469 100644 --- a/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml +++ b/net-analyzer/nagios-plugin-check_lm_sensors/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> diff --git a/net-analyzer/nagios-plugin-check_raid/Manifest b/net-analyzer/nagios-plugin-check_raid/Manifest index 3d7870ca0332..4eeb321c9ee5 100644 --- a/net-analyzer/nagios-plugin-check_raid/Manifest +++ b/net-analyzer/nagios-plugin-check_raid/Manifest @@ -1,6 +1 @@ -DIST nagios-plugin-check_raid-02b6425dac3db7e98d4c36bf0836357c6b36196c.tar.gz 49866 BLAKE2B 067097f4aae85615e85e5481c3c3a5e6f6f3ce61056c61f59e5c6febca3f84e697999dad87626aaae04f853ade9efbd07d17c61c933fafd9252ee8d372a4cfc7 SHA512 548241cd344c135dd6509e930329a9957184330a6f317f758a35c32fc680d421932e3daa12a8f7c0ec8071f96f9e63619de4dff2ea648652b6c2494e800d7ed4 -DIST nagios-plugin-check_raid-4.0.0.tar.gz 46308 BLAKE2B 025f983416ef5b1340fe2c3c1b4aa8784be23201ebdbf2ab9ed7c4e885c91b992d523ab26d7aed42cb9df44f7ab890034a968ee60e7d928311c99021ab10abb4 SHA512 0f80321615a29665c32bef8b5426fad5994c28b48446167d81504b8ae5720c28b9eaf449f48147e5fc7b24907560994d61b81bed68f9b8caa9a87b18eddd9ee9 -DIST nagios-plugin-check_raid-4.0.1.tar.gz 50173 BLAKE2B 35831f0511fc71b883919303f534bb9c4760160031ff62beff6d5eedea44f1f058bd80bfe770585e2f256b1ba8e53e2708808fdc420d3bb8ca95941f73c5ab40 SHA512 882d76d71231d675caaf75883962c3983acbec194ee437ee7447f75607b1767e3aed3e939bdafb90cfab5d131c40d3e0b1d77b90a4c19a4809f18c9e64c114fd -DIST nagios-plugin-check_raid-4.0.2.tar.gz 50680 BLAKE2B f483876d3c7f7ec5d266d1cd22eddb50534505caa90d0715325148f6314e54aa83e4b42ad4ec8d7edcfed6c640af7e6f86f1f93314d92de39b02b67598f82339 SHA512 b02f32c91eb6bf54f4bd66cb57bf3d43b5f89320be095fcf31b224865f04f24c91245be2afee5ff8588757ff75462e62e1d89ef824e6fbe4d3f90d4a015e0ba3 -DIST nagios-plugin-check_raid-4.0.8.tar.gz 53803 BLAKE2B debc312ccf688c6ed4c4d89d77efbf454ae030260741277f1f10966d28348a317255a69a932ceba69300c37b98448ebb3ca3a0b463d64814a4ca11043bdc5850 SHA512 237cbe798aa6c65b4bd6b9c9e24923e172d3d62c50afd7df23e2b6c8888041368025860edf5f826a77c6858e6312bba05225f0e20787e1bb579d833950b324ee -DIST nagios-plugin-check_raid-5da4400ff978189d6be889f2448099535baa01f4.tar.gz 46422 BLAKE2B a6049f58a4ff50bf86f85c6d8f35ffbc19a1a6ba6dccfb275bc59ea6e15635b8c8c001d5fbda6030f75adea78fb75dbb7e83628c73f9af76291c3547f64a1ee7 SHA512 4c4d372735576cf104886c62c071dc98512687ecc1b2f3d56f614c24b747566ff849119c3e0a71b011db5a32e67f50c9d772c0c68a895320e0a5b63322cf6446 +DIST nagios-plugin-check_raid-4.0.10.tar.gz 54895 BLAKE2B 6432624de419fca2d376362e5d13031272b6feeccdc6202b8a7eec92ab1f6c362ab88f9c912b10695c34347388dd154b12757a8b4268d30c0436589da060d5cc SHA512 1b8c353fbd0dff6fea5311c4149af16b1e1a5778794ef0085dcd8ee18f196579cca0b9f8c1ecef51f3ee36665aec6069f64ebe4d2e565bf7223bed59f2de5ee1 diff --git a/net-analyzer/nagios-plugin-check_raid/metadata.xml b/net-analyzer/nagios-plugin-check_raid/metadata.xml index 512cb3611534..92b1823c07b8 100644 --- a/net-analyzer/nagios-plugin-check_raid/metadata.xml +++ b/net-analyzer/nagios-plugin-check_raid/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> @@ -14,14 +14,13 @@ <remote-id type="github">glensc/nagios-plugin-check_raid</remote-id> </upstream> <use> - <flag name='3ware'>Support 3ware RAID controllers</flag> - <flag name='aacraid'>Support Adaptec AAC-RAID controllers</flag> - <flag name='dmraid'>Support Device-Mapper RAID</flag> - <flag name='hpa'>Support HP Array controllers</flag> - <flag name='hpsa'>Support HP SmartArray (CCISS) controllers</flag> - <flag name='megaraid-sas'>Support LSI MegaRAID SAS controllers</flag> - <flag name='megaraid-scsi'>Support LSI MegaRAID SCSI controllers</flag> - <flag name='mpt-sas2'>Support LSI SAS-2 controllers</flag> - <flag name='mpt'>Support LSI MPT Fusion controllers</flag> + <flag name="3ware">Support 3ware RAID controllers</flag> + <flag name="aacraid">Support Adaptec AAC-RAID controllers</flag> + <flag name="dmraid">Support Device-Mapper RAID</flag> + <flag name="hpa">Support HP Array controllers</flag> + <flag name="hpsa">Support HP SmartArray (CCISS) controllers</flag> + <flag name="megaraid-sas">Support LSI MegaRAID SAS controllers</flag> + <flag name="mpt-sas2">Support LSI SAS-2 controllers</flag> + <flag name="mpt">Support LSI MPT Fusion controllers</flag> </use> </pkgmetadata> diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild deleted file mode 100644 index a4f6fd702221..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -# TODO: -# Package all the other Perl build pieces, and stop using the monolithic perl script. -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild deleted file mode 100644 index 5ced7dc757a8..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -COMMIT="5da4400ff978189d6be889f2448099535baa01f4" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild deleted file mode 100644 index 3a3e90fbab65..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -COMMIT="02b6425dac3db7e98d4c36bf0836357c6b36196c" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${COMMIT}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild deleted file mode 100644 index 2e72240ec989..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -#COMMIT="" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild index 26049ac2dfbc..e5295fefced0 100644 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.8.ebuild +++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.10-r3.ebuild @@ -1,53 +1,53 @@ -# 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 -inherit eutils perl-module +inherit perl-module -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" #COMMIT="" -MY_PV="${COMMIT:-$PV}" +MY_PV="${COMMIT:-${PV}}" MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" +HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" +IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas mpt mpt-sas2" -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" +DEPEND=" + dev-perl/Monitoring-Plugin + dev-perl/Module-Pluggable" RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" + sys-apps/smartmontools + sys-fs/lsscsi + 3ware? ( sys-block/tw_cli ) + aacraid? ( sys-block/arcconf ) + dmraid? ( sys-fs/dmraid ) + hpa? ( sys-block/hpacucli ) + hpsa? ( sys-apps/cciss_vol_status ) + megaraid-sas? ( sys-block/megacli ) + mpt-sas2? ( sys-block/sas2ircu ) + mpt? ( sys-block/mpt-status )" src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL default + + # Upstream has a custom Makefile that is meant to build bundles + sed -i '/CPANfile/d' Makefile.PL || die } src_install() { default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" dodoc README.md CHANGELOG.md CONTRIBUTING.md check_raid.cfg + + local plugindir="/usr/$(get_libdir)/nagios/plugins" + dodir "${plugindir}" + mv -f "${ED}"/usr/bin/check_raid.pl "${ED}/${plugindir}" || die } pkg_postinst() { diff --git a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild deleted file mode 100644 index 2e72240ec989..000000000000 --- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils perl-module - -DESCRIPTION="Nagios/Icinga plugin to check current server's RAID status" -HOMEPAGE="https://github.com/glensc/nagios-plugin-check_raid" -#COMMIT="" -MY_PV="${COMMIT:-$PV}" -MY_P="${PN}-${MY_PV}" -SRC_URI="https://github.com/glensc/nagios-plugin-check_raid/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="3ware aacraid dmraid hpa hpsa megaraid-sas megaraid-scsi mpt mpt-sas2" - -DEPEND="dev-perl/Monitoring-Plugin - dev-perl/Module-Pluggable" -RDEPEND="${DEPEND} - sys-apps/smartmontools - sys-fs/lsscsi - 3ware? ( sys-block/tw_cli ) - aacraid? ( sys-block/arcconf ) - dmraid? ( sys-fs/dmraid ) - hpa? ( sys-block/hpacucli ) - hpsa? ( sys-apps/cciss_vol_status ) - megaraid-sas? ( sys-block/megacli ) - megaraid-scsi? ( sys-block/megarc ) - mpt-sas2? ( sys-block/sas2ircu ) - mpt? ( sys-block/mpt-status ) - " - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - # Upstream has a custom Makefile that is meant to build bundles. - mv -f Makefile Makefile.upstream - sed -i '/CPANfile/d' Makefile.PL - default -} - -src_install() { - default - plugindir="/usr/$(get_libdir)/nagios/plugins" - dodir "$plugindir" - mv -f "${D}"/usr/bin/check_raid.pl "${D}"/"${plugindir}" - dodoc README.md ChangeLog.md CONTRIBUTING.md check_raid.cfg -} - -pkg_postinst() { - einfo "The following RAID controllers are supported without special tools:" - einfo "GDT (Intel/ICP) RAID Controller" - einfo "HP MSA (special configuration needed)" - einfo "The following RAID controllers do not have tools packaged in Gentoo, but ARE supported by this tool:" - einfo "Intel: CmdTool2" - einfo "Areca: areca-cli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/10" - einfo "Marvell RAID: mvcli" - einfo "See https://github.com/glensc/nagios-plugin-check_raid/issues/92" - einfo "Adaptec ServeRAID: aaccli" - einfo "Adaptec AACRAID: afacli (* some controllers supported by USE=aacraid, sys-block/arcconf)" - einfo "Adaptec ServeRAID 7k: ipssend" -} diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml deleted file mode 100644 index 7bf85b98253c..000000000000 --- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sysadmin@gentoo.org</email> - <name>Gentoo Sysadmin Project</name> - </maintainer> - <use> - <flag name="smart"> - Install <pkg>sys-apps/smartmontools</pkg> required for - S.M.A.R.T. disk monitoring. Disabling the flag removes the - plugin file. This plugin also requires the sudo flag to be - enable. - </flag> - </use> - <upstream> - <remote-id type="github">Flameeyes/nagios-plugins-flameeyes</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild deleted file mode 100644 index 351eac1d17cc..000000000000 --- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit git-r3 multilib - -EGIT_REPO_URI="https://github.com/Flameeyes/${PN}.git" -SRC_URI="" -KEYWORDS="" - -DESCRIPTION="Flameeyes's custom Nagios/Icinga plugins" -HOMEPAGE="https://github.com/Flameeyes/nagios-plugins-flameeyes" - -LICENSE="MIT" -SLOT="0" -IUSE="smart samba" - -RDEPEND=" - dev-perl/Monitoring-Plugin - sys-apps/portage - dev-perl/Time-Duration - dev-perl/TimeDate - smart? ( - sys-apps/smartmontools - app-admin/sudo - ) - samba? ( dev-perl/Filesys-SmbClient )" -DEPEND="" - -src_compile() { - cat - > "${T}"/50${PN} <<EOF -Cmnd_Alias NAGIOS_PLUGINS_FLAMEEYES_CMDS = /usr/sbin/smartctl -User_Alias NAGIOS_PLUGINS_FLAMEEYES_USERS = nagios, icinga - -NAGIOS_PLUGINS_FLAMEEYES_USERS ALL=(root) NOPASSWD: NAGIOS_PLUGINS_FLAMEEYES_CMDS -EOF -} - -src_install() { - insinto /etc/sudoers.d - doins "${T}"/50${PN} - - dodir /usr/$(get_libdir)/nagios/plugins/flameeyes - cp -Rp $(find . -type d -mindepth 1 -maxdepth 1 -not -name .git) \ - "${D}/usr/$(get_libdir)/nagios/plugins/flameeyes" || die - - dodoc README.md -} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/Manifest b/net-analyzer/nagios-plugins-linux-madrisan/Manifest index 02102b1d690a..b3b7c1490f2a 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/Manifest +++ b/net-analyzer/nagios-plugins-linux-madrisan/Manifest @@ -1 +1,3 @@ -DIST nagios-plugins-linux-madrisan-25.tar.xz 371712 BLAKE2B 60637426d9ced289a1acdf61c3e7c5a2b3227afb20079ef93d445057b2127d12a6c76ab5a780571ac8bdd6ac3b55de2761722236d2ed7a057ab84559d97610e9 SHA512 64961a16e24802d66c48d0c33bd63d75aba8492f38dd83a57ee2e7cb728cf6876c7869622256c4249a9e9da39b744a332df6ecad80f6039861887bb5c8d806ec +DIST nagios-plugins-linux-madrisan-31.tar.xz 401556 BLAKE2B 5eca1e96f14b518d9ab5304bb2a54ba47f194bf22cea8445d7fef0769c3b14c800e4ed24c5c0ca32f0daf53aa81a0bd52234478c606a8d2d1a12e96abb90179c SHA512 34d8ae400766e9c7ddd246998f004a50c87ec9ad8dc13deb8e31fc6fcfa07fbe5af2f091d0523b93d06b26438d1a25240bd82d60946e5897bc257fff7c1b73d0 +DIST nagios-plugins-linux-madrisan-32.tar.xz 402976 BLAKE2B ef66934315f3ddbee1a2d84723477773549c9a5ed731853780ef15b9f44ea462256f730f854d517415dce2b944a4bf0abcbfa0623a7a1faffef4b5bbf162af76 SHA512 42392c123961bb17192344f20973a3d26c74aeef112638384d5b7a687e7117a3378d6efdb07ad15a7309f5db621404602e9c2beb0dcc4e207924d0d3a466ab59 +DIST nagios-plugins-linux-madrisan-33.tar.xz 397516 BLAKE2B 39e428d7b44104e01f8101ec33d250b8317c2ab9a5772bd815baf91c14eb1aeffc2aaaec1696e338d9aa31ebd9cb67d10a2049bc78a1bd8fea813761def36d26 SHA512 9b0df712d799ea5ae1eca8135089e41f167446e40416dbfe090ec855476318b26d8fdc3865470bf6cf54e7dcbce483d1f577a886ef35023e983e2508a307df70 diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch deleted file mode 100644 index 74bddd66e749..000000000000 --- a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-25-fix-fno-common.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4936ca25f3e9a2875ce063033e5e8f3a3590dab2 Mon Sep 17 00:00:00 2001 -From: Davide Madrisan <davide.madrisan@gmail.com> -Date: Mon, 27 Jan 2020 22:00:41 +0100 -Subject: [PATCH] The build fails when '-fno-common' is added to CFLAGS - -As reported by 'sbraz', the build stops with the error message: - - (.bss+0x8): multiple definition of `program_name' - (.bss+0x0): multiple definition of `program_name_short' - -This flag will be apparently enabled by default in gcc 10. - -Fix this build problem by correctly referencing as extern both -the variables in the header file. - -Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com> ---- - include/progname.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/progname.h b/include/progname.h -index 576ed16..847122a 100644 ---- a/include/progname.h -+++ b/include/progname.h -@@ -25,10 +25,10 @@ extern "C" { - #endif - - /* String containing name the program is called with. */ -- const char *program_name; -+ extern const char *program_name; - - /* String containing a short version of 'program_name'. */ -- const char *program_name_short; -+ extern const char *program_name_short; - - /* Set program_name, based on argv[0]. - argv0 must be a string allocated with indefinite extent, and must not be diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch new file mode 100644 index 000000000000..f47319dcd39a --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-rename-with-systemd.patch @@ -0,0 +1,86 @@ +https://github.com/madrisan/nagios-plugins-linux/commit/63914284097e3a59e3407bf894376b859a0d1a2e + +From 63914284097e3a59e3407bf894376b859a0d1a2e Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Tue, 30 Jan 2024 18:57:16 +0100 +Subject: [PATCH] fix(configure): rename cmdline option --with-systemd + + Rename --with-systemd to --enable-systemd for consistency + with the other optional boolean options. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/configure.ac ++++ b/configure.ac +@@ -337,7 +337,7 @@ AC_CHECK_DECLS([CPU_ALLOC], [], [], + + dnl Check for libcurl + AC_ARG_ENABLE([libcurl], +- AS_HELP_STRING([--enable-libcurl], [Enable libcurl])) ++ AS_HELP_STRING([--enable-libcurl], [enable libcurl])) + AS_IF([test "x$enable_libcurl" = "xyes"], [ + LIBCURL_CHECK_CONFIG([], [7.40.0], [], + [AC_MSG_ERROR([Missing required libcurl >= 7.40.0])]) +@@ -346,27 +346,9 @@ AS_IF([test "x$enable_libcurl" = "xyes"], [ + AM_CONDITIONAL(HAVE_LIBCURL, [test "$libcurl_cv_lib_curl_usable" = "yes"]) + ], [AM_CONDITIONAL(HAVE_LIBCURL, false)]) + +-dnl Check for systemd-login libraries +-AC_ARG_WITH([systemd], +- AS_HELP_STRING([--without-systemd], [do not build with systemd support]), +- [], [with_systemd=check] +-) +-have_systemd=no +-AS_IF([test "x$with_systemd" != "xno"], [ +- PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no]) +- AS_CASE([$with_systemd:$have_systemd], +- [yes:no], +- [AC_MSG_ERROR([systemd expected but libsystemd not found])], +- [*:yes], +- AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available]) +- AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted ]) +- ) +-]) +-AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"]) +- + dnl Check for libvarlink + AC_ARG_ENABLE([libvarlink], +- AS_HELP_STRING([--enable-libvarlink], [Enable libvarlink])) ++ AS_HELP_STRING([--enable-libvarlink], [enable libvarlink])) + AS_IF([test "x$enable_libvarlink" = "xyes"], [ + PKG_CHECK_EXISTS([libvarlink], + [PKG_CHECK_MODULES(LIBVARLINK, [libvarlink >= 18], +@@ -394,6 +376,24 @@ AS_IF([test "x$enable_libprocps" = "xyes"], [ + ]) + AM_CONDITIONAL(HAVE_LIBPROCPS, [test "$have_libprocps" = "yes"]) + ++dnl Check for systemd-login libraries ++AC_ARG_ENABLE([systemd], ++ AS_HELP_STRING([--enable-systemd], [enable systemd related features]), ++ [], [enable_systemd=check] ++) ++have_systemd=no ++AS_IF([test "x$enable_systemd" != "xno"], [ ++ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [have_systemd=yes], [have_systemd=no]) ++ AS_CASE([$enable_systemd:$have_systemd], ++ [yes:no], ++ [AC_MSG_ERROR([systemd expected but libsystemd not found])], ++ [*:yes], ++ AC_DEFINE([HAVE_LIBSYSTEMD], [1], [Define if libsystemd is available]) ++ AC_DEFINE([USE_SYSTEMD], [1], [Define if systemd support is wanted]) ++ ) ++]) ++AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$have_systemd" = "xyes"]) ++ + dnl Add the option '--with-proc-meminfo=PATH' + AC_ARG_WITH(proc-meminfo, + AS_HELP_STRING([--with-proc-meminfo=PATH], +@@ -604,3 +604,9 @@ if test "$have_libvarlink" = "yes"; then + echo " VARLINK_ADDRESS = $VARLINK_ADDRESS" + echo + fi ++ ++if test "$have_systemd" = "yes"; then ++ echo "Optional systemd library support is enabled:" ++ echo " SYSTEMD_CFLAGS = $SYSTEMD_CFLAGS" ++ echo " SYSTEMD_LIBS = $SYSTEMD_LIBS" ++fi diff --git a/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch new file mode 100644 index 000000000000..657cd458f06e --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/files/nagios-plugins-linux-madrisan-32-x86-fixes.patch @@ -0,0 +1,148 @@ +https://github.com/madrisan/nagios-plugins-linux/pull/146 + +From d09bfd1b3974743af4b719629f59b5b96e1393a1 Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 09:29:59 +0100 +Subject: [PATCH 1/3] fix: size_t variables on 32 and 64 bits arch have + different type + +Fix the following warning on 32-bits architectures: + + In file included from ../lib/container_docker_count.c:44, + from tslibcontainer_docker_count.c:33: + ../lib/container_docker_count.c: In function 'docker_running_containers': + ../include/logging.h:28:44: warning: format '%lu' expects argument of type 'long unsigned int', + but argument 3 has type 'size_t' {aka 'unsigned int'} [-Wformat=] + 28 | # define dbg(format, ...) fprintf (stdout, "DEBUG: " format, ##__VA_ARGS__) + | ^~~~~~~~~ + ../lib/container_docker_count.c:213:3: note: in expansion of macro 'dbg' + 213 | dbg ("%lu bytes retrieved\n", chunk.size); + | ^~~ + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/lib/container_docker_count.c ++++ b/lib/container_docker_count.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + /* + * License: GPLv3+ +- * Copyright (c) 2018 Davide Madrisan <davide.madrisan@gmail.com> ++ * Copyright (c) 2018,2024 Davide Madrisan <davide.madrisan@gmail.com> + * + * A library for checking for Docker exposed metrics. + * +@@ -210,7 +210,7 @@ docker_running_containers (unsigned int *count, const char *image, + #endif /* NPL_TESTING */ + + assert (chunk.memory); +- dbg ("%lu bytes retrieved\n", chunk.size); ++ dbg ("%zu bytes retrieved\n", chunk.size); + dbg ("json data: %s", chunk.memory); + + hashtable = docker_json_parser (chunk.memory, "Image", 1); + +From 4574e9ed77ebda062279622bb3d8678fa983d272 Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 17:36:04 +0100 +Subject: [PATCH 2/3] fix: workaround for a round issue on 32 bits + +On Gentoo Base System release 2.14 for 32-bits + + (unsigned long)(6.26*100) = 625 + +So the test fails. +As a workaround modify the data file used by the test. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/tests/ts_procpressurecpu.data ++++ b/tests/ts_procpressurecpu.data +@@ -1 +1 @@ +-some avg10=7.48 avg60=6.26 avg300=6.66 total=200932088 ++some avg10=7.48 avg60=6.25 avg300=6.66 total=200932088 +--- a/tests/tslibpressure.c ++++ b/tests/tslibpressure.c +@@ -103,7 +103,7 @@ mymain (void) + /* we multiply by 100 the averages to somewhat transform + * the double values into integer ones */ + DO_TEST ("cpu some avg10", psi_oneline->avg10 * 100, 748ULL); +- DO_TEST ("cpu some avg60", psi_oneline->avg60 * 100, 626ULL); ++ DO_TEST ("cpu some avg60", psi_oneline->avg60 * 100, 625ULL); + DO_TEST ("cpu some avg300", psi_oneline->avg300 * 100, 666ULL); + DO_TEST ("cpu single total", psi_oneline->total, 200932088ULL); + + +From c90afc02705fd6c32a6764741616b4e17688117b Mon Sep 17 00:00:00 2001 +From: Davide Madrisan <d.madrisan@proton.me> +Date: Wed, 27 Mar 2024 21:06:25 +0100 +Subject: [PATCH 3/3] fix: fix test tslibxstrton_sizetollint on 32-bit arch + +Fix the following errors: + + 1) check function sizetollint with arg 1024b ... OK + 2) check function sizetollint with arg 8k ... OK + 3) check function sizetollint with arg 50m ... OK + 4) check function sizetollint with arg 2g ... OK + 5) check function sizetollint with arg 3t ... FAILED + 6) check function sizetollint with arg 2p ... FAILED + 7) check function sizetollint with arg 1024B ... OK + 8) check function sizetollint with arg 8K ... OK + 9) check function sizetollint with arg 50M ... OK + 10) check function sizetollint with arg 2G ... OK + 11) check function sizetollint with arg 3T ... FAILED + 12) check function sizetollint with arg 2P ... FAILED + +The long int is not large enough on 32-bit architectures. + +Signed-off-by: Davide Madrisan <d.madrisan@proton.me> +--- a/tests/tslibxstrton_sizetoint64.c ++++ b/tests/tslibxstrton_sizetoint64.c +@@ -1,7 +1,7 @@ + // SPDX-License-Identifier: GPL-3.0-or-later + /* + * License: GPLv3+ +- * Copyright (c) 2022 Davide Madrisan <davide.madrisan@gmail.com> ++ * Copyright (c) 2022,2024 Davide Madrisan <davide.madrisan@gmail.com> + * + * Unit test for lib/xstrton.c + * +@@ -29,11 +29,11 @@ + typedef struct test_data + { + char *size; +- int64_t expect_value; ++ long long int expect_value; + } test_data; + + static int +-test_sizetoint64 (const void *tdata) ++test_sizetollint (const void *tdata) + { + const struct test_data *data = tdata; + long long int result; +@@ -57,19 +57,19 @@ mymain (void) + .size = SIZE, \ + .expect_value = EXPECT_VALUE, \ + }; \ +- if (test_run("check function sizetoint64 with arg " SIZE, \ +- test_sizetoint64, (&data)) < 0) \ ++ if (test_run("check function sizetollint with arg " SIZE, \ ++ test_sizetollint, (&data)) < 0) \ + ret = -1; \ + } \ + while (0) + + /* test the function sizetoint64() */ + +-#define ONE_KILOBYTE 1000UL +-#define ONE_MEGABYTE (1000UL * ONE_KILOBYTE) +-#define ONE_GIGABYTE (1000UL * ONE_MEGABYTE) +-#define ONE_TERABYTE (1000UL * ONE_GIGABYTE) +-#define ONE_PETABYTE (1000UL * ONE_TERABYTE) ++#define ONE_KILOBYTE 1000ULL ++#define ONE_MEGABYTE (1000ULL * ONE_KILOBYTE) ++#define ONE_GIGABYTE (1000ULL * ONE_MEGABYTE) ++#define ONE_TERABYTE (1000ULL * ONE_GIGABYTE) ++#define ONE_PETABYTE (1000ULL * ONE_TERABYTE) + + DO_TEST ("1024b", 1024); + DO_TEST ("8k", 8 * ONE_KILOBYTE); diff --git a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml index 2485783589cb..e1a109026d7c 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml +++ b/net-analyzer/nagios-plugins-linux-madrisan/metadata.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>sbraz@gentoo.org</email> <name>Louis Sautier</name> </maintainer> <use> - <flag name="curl">Build check_docker which requires <pkg>net-misc/curl</pkg></flag> + <flag name="curl">Build check_container which requires <pkg>net-misc/curl</pkg></flag> + <flag name="varlink">Build check_podman which requires <pkg>dev-libs/libvarlink</pkg></flag> </use> <upstream> <remote-id type="github">madrisan/nagios-plugins-linux</remote-id> diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild index 284d0d9d1a83..6e71445b286d 100644 --- a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-25-r1.ebuild +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-31.ebuild @@ -1,7 +1,7 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -11,21 +11,19 @@ MY_P="${MY_PN}-${PV}" DESCRIPTION="Additional and alternative Nagios plugins for Linux" HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux" SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="curl" +IUSE="curl varlink" -DEPEND="curl? ( net-misc/curl:0= )" +DEPEND=" + curl? ( net-misc/curl:0= ) + varlink? ( dev-libs/libvarlink:= ) +" RDEPEND="${DEPEND}" -# https://github.com/madrisan/nagios-plugins-linux/issues/48 -# Will be in the next release -PATCHES=( "${FILESDIR}/${P}-fix-fno-common.patch" ) - -S="${WORKDIR}/${MY_P}" - src_prepare() { default # Avoid collision with net-analyzer/monitoring-plugins @@ -40,6 +38,7 @@ src_configure() { # Most options are already defaults for Gentoo --disable-hardening $(use_enable curl libcurl) + $(use_enable varlink libvarlink) ) econf "${myconf[@]}" } diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild new file mode 100644 index 000000000000..bcd369b7e003 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-32-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="nagios-plugins-linux" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Additional and alternative Nagios plugins for Linux" +HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux" +SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl systemd varlink" + +DEPEND=" + curl? ( net-misc/curl:0= ) + systemd? ( sys-apps/systemd:= ) + varlink? ( dev-libs/libvarlink:= ) +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-rename-with-systemd.patch" + "${FILESDIR}/${P}-x86-fixes.patch" +) + +src_prepare() { + default + # Avoid collision with net-analyzer/monitoring-plugins + # and net-analyzer/nagios-plugins + sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" + # Most options are already defaults for Gentoo + --disable-hardening + $(use_enable curl libcurl) + $(use_enable systemd) + $(use_enable varlink libvarlink) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} diff --git a/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild new file mode 100644 index 000000000000..4e7690db9073 --- /dev/null +++ b/net-analyzer/nagios-plugins-linux-madrisan/nagios-plugins-linux-madrisan-33.ebuild @@ -0,0 +1,48 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PN="nagios-plugins-linux" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Additional and alternative Nagios plugins for Linux" +HOMEPAGE="https://github.com/madrisan/nagios-plugins-linux" +SRC_URI="https://github.com/madrisan/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz -> ${P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl systemd" + +DEPEND=" + curl? ( net-misc/curl:0= ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + # Avoid collision with net-analyzer/monitoring-plugins + # and net-analyzer/nagios-plugins + sed -ri "s/check_(load|swap|uptime|users)/&_madrisan/" plugins/Makefile.am || die + eautoreconf +} + +src_configure() { + local myconf=( + --libexecdir="${EPREFIX}/usr/$(get_libdir)/nagios/plugins" + # Most options are already defaults for Gentoo + --disable-hardening + $(use_enable curl libcurl) + $(use_enable systemd) + ) + econf "${myconf[@]}" +} + +src_test() { + emake check VERBOSE=1 +} diff --git a/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch new file mode 100644 index 000000000000..926a96d74d1c --- /dev/null +++ b/net-analyzer/nagios-plugins-snmp/files/nagios-plugins-snmp-0.6.0-fno-common.patch @@ -0,0 +1,86 @@ +diff --git a/src/nagios_common_snmp.c b/src/nagios_common_snmp.c +index 5bdc571..73f96e8 100755 +--- a/src/nagios_common_snmp.c ++++ b/src/nagios_common_snmp.c +@@ -1,5 +1,21 @@ + #include "nagios_common_snmp.h"
+
++char plugin_name[30]; /* plugin name */
++char plugin_tmp_prefix[50];
++char output[MAX_OUTPUT];
++int output_overflow;
++char *p_output;
++char *o_host;
++int o_verb;
++char* error;
++int o_port,o_timeout;
++int o_help, o_verbose,o_version,o_v2c;
++int retries;
++int o_snmpver,snmp_bulk;
++char *o_community,*o_login,*o_passwd,*o_privpasswd;
++char *o_protocols[2],*o_authproto,*o_privproto;
++struct snmp_session session, *ss;
++
+ int init_plugins_gettext(){
+ if (setlocale( LC_ALL, "" )==NULL) return 1;
+ bindtextdomain( PACKAGE, LOCALEDIR );
+diff --git a/src/nagios_common_snmp.h b/src/nagios_common_snmp.h +index 8903fd0..1b3fa3a 100755 +--- a/src/nagios_common_snmp.h ++++ b/src/nagios_common_snmp.h +@@ -56,8 +56,8 @@ int init_plugins_gettext(); + /*********************************** Utilities ****************************************/
+ /* cache utilities */
+
+-char plugin_name[30]; /* plugin name */
+-char plugin_tmp_prefix[50];
++extern char plugin_name[30]; /* plugin name */
++extern char plugin_tmp_prefix[50];
+
+ /* defined in configure script */
+ /*#define BASE_CACHE "/tmp/cache"*/
+@@ -71,12 +71,12 @@ int write_cache(snmp_table **descT,int num); +
+ /* maximum caracters in ouput */
+ #define MAX_OUTPUT 500
+-char output[MAX_OUTPUT];
+-int output_overflow;
++extern char output[MAX_OUTPUT];
++extern int output_overflow;
+
+ /* maximum caracters for performance output label*/
+ #define MAX_LABEL_SIZE 50
+-char *p_output;
++extern char *p_output;
+
+ /* Put data in output */
+ void strcat_output(const char *string);
+@@ -143,18 +143,18 @@ int get_options (int narg, char* const valarg[],options_nagsnmp *liste, int n_li + #define TIMEOUT_DEFAULT 3
+
+ /* standard options */
+-char *o_host;
+-int o_verb;
+-char* error;
++extern char *o_host;
++extern int o_verb;
++extern char* error;
+ /* snmp options */
+-int o_port,o_timeout;
+-int o_help, o_verbose,o_version,o_v2c;
+-int retries;
+-int o_snmpver,snmp_bulk;
+-char *o_community,*o_login,*o_passwd,*o_privpasswd;
+-char *o_protocols[2],*o_authproto,*o_privproto;
++extern int o_port,o_timeout;
++extern int o_help, o_verbose,o_version,o_v2c;
++extern int retries;
++extern int o_snmpver,snmp_bulk;
++extern char *o_community,*o_login,*o_passwd,*o_privpasswd;
++extern char *o_protocols[2],*o_authproto,*o_privproto;
+ /* snmp sessions */
+-struct snmp_session session, *ss;
++extern struct snmp_session session, *ss;
+
+ /* Common options definition and check */
+ #define common_usage "[-v -V] -H <host> -C <snmp_community> [-2] | (-l login -x passwd [-X pass -L <authp>,<privp>) [-p <port>] [-t <timeout>]"
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml index a15e870b6e07..9a52f67622ec 100644 --- a/net-analyzer/nagios-plugins-snmp/metadata.xml +++ b/net-analyzer/nagios-plugins-snmp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild index c89ed52c8249..005fd81aef64 100644 --- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild +++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit autotools user +inherit autotools DESCRIPTION="Additional Nagios plugins for monitoring SNMP capable devices" HOMEPAGE="http://nagios.manubulon.com" @@ -12,31 +12,30 @@ SRC_URI="http://nagios.manubulon.com/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" -IUSE="" -DEPEND="net-analyzer/net-snmp" +DEPEND=" + acct-group/nagios + acct-user/nagios + net-analyzer/net-snmp" RDEPEND="${DEPEND}" -S=${WORKDIR}/nagios-plugins-snmp +S="${WORKDIR}"/nagios-plugins-snmp -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} +PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { - sed -i -e '/^CFLAGS=""/d' configure.in + default + sed -i -e '/^CFLAGS=""/d' configure.in || die + mv configure.{in,ac} || die eautoreconf } src_configure() { econf \ - --sysconfdir=/etc/nagios \ - --libexec=/usr/$(get_libdir)/nagios/plugins + --sysconfdir="${EPREFIX}"/etc/nagios \ + --libexec="${EPREFIX}"/usr/$(get_libdir)/nagios/plugins } -DOCS=( README NEWS AUTHORS ) - src_install() { default diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest index a61327a7e254..1b065025a063 100644 --- a/net-analyzer/nagios-plugins/Manifest +++ b/net-analyzer/nagios-plugins/Manifest @@ -1,2 +1 @@ -DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3 -DIST nagios-plugins-2.3.1.tar.gz 2833267 BLAKE2B f89eda7a29558dd33dedbf0de150b6a13ba66d213d74041d9eb8c680880b3825bcc9312d251d22f3b483a14c0de7c59d7801954e7563c16352bfc38236676863 SHA512 89208f211e51db4e0d56725a6ff6d2fcf4eb2207f877a2b8f130cda8480a70f318eceb94140eb4f2a17fe3dd967bb3615ccc366c1a531ebd4ff0a04b60c61b8a +DIST nagios-plugins-2.4.6.tar.gz 2751770 BLAKE2B a85da8eaa8d926e2ccae3451d9faa680b75ebd736ba1306c69e7d3b2b8749787743dd6e26013d3a72fba12ef49fdf635c60052791fab558eb49c379bdbb6bac7 SHA512 f2a12a5b6a70849d7233debd1ca95667df981d3627287e3b8813d8fd709c4f4a26cf2128851837f33e0df3132132a4f891edef90e220bc16b1a6351d514faa43 diff --git a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch b/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch deleted file mode 100644 index 67bc65cad880..000000000000 --- a/net-analyzer/nagios-plugins/files/define-own-mysql-port-constant.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 43ff2e8607c0b7095c2a4dcab6e466bc67e2e2ff Mon Sep 17 00:00:00 2001 -From: Michael Orlitzky <michael@orlitzky.com> -Date: Thu, 26 Oct 2017 15:01:17 -0400 -Subject: [PATCH 1/3] plugins/check_mysql*.c: define our own default MySQL - port. - -The MYSQL_PORT constant used to be defined in mysql.h, and was used as -the default port in the two plugins check_mysql and check_mysql_query. -Now that mysql.h no longer defines that constant, our plugins fail to -build against newer versions of MySQL and MariaDB. - -Since MYSQL_PORT used the "default port" on the local system, it -actually was not the best choice as the default for the check plugins: -when monitoring remote MySQL servers, the usual default of 3306 is -more likely to be correct than whatever the local server happens to be -listening on. - -As a result, we fix the issue by defining our own constant, called -CHECK_PORT_DEFAULT, as "3306" at the top of both check_mysql.c and -check_mysql_query.c. The existing uses of MYSQL_PORT have been changed -to use the new CHECK_PORT_DEFAULT. - -This change is backwards-incompatible: any users who compiled in a -MYSQL_PORT other than 3306 and who were running their checks on the -same server as the database will now need to specify that port -explicitly. - -Closes: https://github.com/nagios-plugins/nagios-plugins/issues/288 ---- - plugins/check_mysql.c | 7 +++++-- - plugins/check_mysql_query.c | 7 +++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c -index 83f89c85..c0b61292 100644 ---- a/plugins/check_mysql.c -+++ b/plugins/check_mysql.c -@@ -36,6 +36,9 @@ const char *email = "devel@nagios-plugins.org"; - - #define SLAVERESULTSIZE 70 - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -58,7 +61,7 @@ char *ciphers = NULL; - bool ssl = false; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - int check_slave = 0, warn_sec = 0, crit_sec = 0; - int ignore_auth = 0; - int verbose = 0; -@@ -505,7 +508,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - -diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c -index 436e0685..e9c3acfb 100644 ---- a/plugins/check_mysql_query.c -+++ b/plugins/check_mysql_query.c -@@ -33,6 +33,9 @@ const char *progname = "check_mysql_query"; - const char *copyright = "1999-2014"; - const char *email = "devel@nagios-plugins.org"; - -+/* The default port that MySQL servers listen on. */ -+#define CHECK_PORT_DEFAULT 3306 -+ - #include "common.h" - #include "utils.h" - #include "utils_base.h" -@@ -48,7 +51,7 @@ char *db_pass = NULL; - char *db = NULL; - char *opt_file = NULL; - char *opt_group = NULL; --unsigned int db_port = MYSQL_PORT; -+unsigned int db_port = CHECK_PORT_DEFAULT; - - int process_arguments (int, char **); - int validate_arguments (void); -@@ -300,7 +303,7 @@ void - print_help (void) - { - char *myport; -- xasprintf (&myport, "%d", MYSQL_PORT); -+ xasprintf (&myport, "%d", CHECK_PORT_DEFAULT); - - print_revision (progname, NP_VERSION); - --- -2.13.6 - diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml index 21e64f4399ba..10fc78d5339d 100644 --- a/net-analyzer/nagios-plugins/metadata.xml +++ b/net-analyzer/nagios-plugins/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> @@ -10,6 +10,10 @@ <name>Gentoo Sysadmin Project</name> </maintainer> <use> + <!-- leave this global flag defined here to avoid a pkgcheck warning --> + <flag name="ipv6"> + Enable ipv6 checks. + </flag> <flag name="nagios-dns"> Install <pkg>net-dns/bind-tools</pkg> required for monitoring DNS servers. Disabling the flag does not remove any plugin file. diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild deleted file mode 100644 index 77dac5af3930..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r3.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ppc ppc64 sparc x86" -IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild deleted file mode 100644 index 2c15df43c502..000000000000 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r4.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user - -DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" - -# Most of the plugins use automagic dependencies, i.e. the plugin will -# get built if the binary it uses is installed. For example, check_snmp -# will be built only if snmpget from net-analyzer/net-snmp[-minimal] is -# installed. End result: most of our runtime dependencies are required -# at build time as well. -# -# REAL_DEPEND contains the dependencies that are actually needed to -# build. DEPEND contains those plus the automagic dependencies. -# -REAL_DEPEND="dev-lang/perl - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) - postgres? ( dev-db/postgresql:* ) - ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) - ) - radius? ( net-dialup/freeradius-client )" - -DEPEND="${REAL_DEPEND} - nagios-dns? ( net-dns/bind-tools ) - nagios-game? ( games-util/qstat ) - nagios-ping? ( net-analyzer/fping ) - samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) - snmp? ( dev-perl/Net-SNMP - net-analyzer/net-snmp[-minimal] )" - -# Basically everything collides with nagios-plugins. -RDEPEND="${DEPEND} - !net-analyzer/monitoring-plugins - selinux? ( sec-policy/selinux-nagios )" - -# At least one test is interactive. -RESTRICT="test" - -DOCS=( - ACKNOWLEDGEMENTS - AUTHORS - CODING - ChangeLog - FAQ - NEWS - README - REQUIREMENTS - SUPPORT - THANKS -) - -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) - -src_prepare() { - default - - # Fix the path to our perl interpreter - sed -i -e "1s:/usr/local/bin/perl:/usr/bin/perl:" \ - "${S}"/plugins-scripts/*.pl \ - || die 'failed to fix perl interpreter path' -} - -src_configure() { - # Use an array to prevent econf from mangling the ping args. - local myconf=() - - if use ssl; then - myconf+=( $(use_with ssl openssl /usr) ) - else - myconf+=( --without-openssl ) - myconf+=( --without-gnutls ) - fi - - # The autodetection for these two commands can hang if localhost is - # down or ICMP traffic is filtered. Bug #468296. - myconf+=( --with-ping-command="/bin/ping -n -U -w %d -c %d %s" ) - - if use ipv6; then - myconf+=( --with-ping6-command="/bin/ping6 -n -U -w %d -c %d %s" ) - fi - - econf \ - $(use_with mysql) \ - $(use_with ipv6) \ - $(use_with ldap) \ - $(use_with postgres pgsql /usr) \ - $(use_with radius) \ - "${myconf[@]}" \ - --libexecdir="/usr/$(get_libdir)/nagios/plugins" \ - --sysconfdir="/etc/nagios" -} - -pkg_preinst() { - enewgroup nagios - enewuser nagios -1 -1 -1 nagios -} - -pkg_postinst() { - elog "This ebuild has a number of USE flags that determine what you" - elog "are able to monitor. Depending on what you want to monitor, some" - elog "or all of these USE flags need to be set." - elog - elog "The plugins are installed in ${ROOT}usr/$(get_libdir)/nagios/plugins" -} diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild index ec9cb103f719..e7c725947880 100644 --- a/net-analyzer/nagios-plugins/nagios-plugins-2.3.1-r1.ebuild +++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.6.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Official plugins for Nagios" -HOMEPAGE="http://nagios-plugins.org/" -SRC_URI="http://nagios-plugins.org/download/${P}.tar.gz" +HOMEPAGE="https://nagios-plugins.org/" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="ipv6 ldap libressl mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 sparc x86" +IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game postgres radius samba selinux snmp ssh +ssl" # Most of the plugins use automagic dependencies, i.e. the plugin will # get built if the binary it uses is installed. For example, check_snmp @@ -22,7 +22,7 @@ AUTOMAGIC_DEPEND=" nagios-game? ( games-util/qstat ) nagios-ping? ( net-analyzer/fping ) samba? ( net-fs/samba ) - ssh? ( net-misc/openssh ) + ssh? ( virtual/openssh ) snmp? ( dev-perl/Net-SNMP net-analyzer/net-snmp[-minimal] )" @@ -31,12 +31,11 @@ BDEPEND="${AUTOMAGIC_DEPEND} dev-lang/perl" DEPEND=" - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c ) + ldap? ( net-nds/openldap:= ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:* ) ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) + dev-libs/openssl:0= ) radius? ( net-dialup/freeradius-client )" @@ -63,7 +62,15 @@ DOCS=( THANKS ) -PATCHES=( "${FILESDIR}/define-own-mysql-port-constant.patch" ) +# These all come from gnulib and the ./configure checks are working as +# intended when the functions aren't present. Bugs 907755 and 924341. +QA_CONFIG_IMPL_DECL_SKIP=( + statvfs64 + re_set_syntax + re_compile_pattern + re_search + re_match +) src_prepare() { default @@ -86,11 +93,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/metadata.xml b/net-analyzer/nagios/metadata.xml index 6d334d5e5ae3..1c4f635649ea 100644 --- a/net-analyzer/nagios/metadata.xml +++ b/net-analyzer/nagios/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>mjo@gentoo.org</email> diff --git a/net-analyzer/nagios/nagios-4.3.4.ebuild b/net-analyzer/nagios/nagios-4.4.14.ebuild index 1c10d69b68b9..6369ad6956d0 100644 --- a/net-analyzer/nagios/nagios-4.3.4.ebuild +++ b/net-analyzer/nagios/nagios-4.4.14.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="The Nagios metapackage" HOMEPAGE="https://www.nagios.org/" -LICENSE="GPL-2" +LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86" IUSE="" RDEPEND="~net-analyzer/nagios-core-${PV} diff --git a/net-analyzer/nagios/nagios-4.4.5.ebuild b/net-analyzer/nagios/nagios-4.5.1.ebuild index 39d47b09dafc..371d0ad43626 100644 --- a/net-analyzer/nagios/nagios-4.4.5.ebuild +++ b/net-analyzer/nagios/nagios-4.5.1.ebuild @@ -1,15 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="The Nagios metapackage" HOMEPAGE="https://www.nagios.org/" -LICENSE="GPL-2" +LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND="~net-analyzer/nagios-core-${PV} || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )" diff --git a/net-analyzer/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml index 1d0d59c9a025..c4359a0e38d8 100644 --- a/net-analyzer/nagircbot/metadata.xml +++ b/net-analyzer/nagircbot/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild index 6d748bc63809..74adb3d2cf47 100644 --- a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild +++ b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 inherit toolchain-funcs @@ -12,26 +12,25 @@ SRC_URI="http://www.vanheusden.com/nagircbot/${P}.tgz" LICENSE="GPL-2" # GPL-2 only SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="libressl" -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= )" -DEPEND="virtual/pkgconfig - ${CDEPEND}" -RDEPEND="net-analyzer/nagios-core - ${CDEPEND}" +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND} +net-analyzer/nagios-core" +BDEPEND="virtual/pkgconfig" src_prepare() { -cp -av Makefile{,.org} + default + cp -av Makefile{,.org} || die + sed -i Makefile \ - -e 's:-lcrypto -lssl:$(shell pkg-config --libs openssl):g' \ + -e 's:-lcrypto -lssl:$(shell ${PKG_CONFIG} --libs openssl):g' \ -e 's:-O2::g;s:-g::g' \ || die } src_compile() { - emake CC=$(tc-getCC) CXX=$(tc-getCXX) + tc-export PKG_CONFIG + emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" } src_install() { diff --git a/net-analyzer/nagstamon/Manifest b/net-analyzer/nagstamon/Manifest index 5939b337c395..ff966dc10895 100644 --- a/net-analyzer/nagstamon/Manifest +++ b/net-analyzer/nagstamon/Manifest @@ -1,4 +1,2 @@ -DIST Nagstamon-2.0.1.tar.gz 535814 BLAKE2B f366a0b5d2f2e4c7168bbb996b68aea7f9ea2f248c25505f8e2ca553d4c275260eec8fdad27b7c1187826cca0cebc7c027491a4f7b6acb24ddf604b6b6a8a930 SHA512 f9c8ab928a78f289693ae58cd3dde6fa75dd66dc931dbec6a4affc35bd96f16c39a03cb441575c9ca42e810ae5962fc7226513b8cc2a17871e0365aa3a207db6 -DIST Nagstamon-3.0.2.tar.gz 542005 BLAKE2B 090875cabbf22feea5cfe0eab0934b503d68df0f49c0a2e8056ccfed8251f278e149da5d0f8002cc5c96ffddd5b89a3ad997d90790e33c9cf1b9ffd9e32a83c0 SHA512 8b05b74adc7399b84cfb66d4c55ff80b2a37af7612496578bdc72ce00f712c8eae087204d00e7d7f1e1d35377f7bb8460d5cf337e315943a48a4ad5108e8d14f -DIST Nagstamon-3.2.1.tar.gz 545190 BLAKE2B ce8b6624a3b1b61e307281ba193d07850bd5d104205d21e2967c1f65c0fdb217be2b2422d0312cfccaba766b814cb1f298a2ed62d07b7377530fd2ef3200a46f SHA512 c3ddda8d046d08514f7633b9129abebdc039e7faee5a618ef8ef77fc2c518bad798572fb549eb9ab9ef96377cd390e159934f268d9bd97c071c4895682bff8e6 -DIST Nagstamon-3.4.1.tar.gz 563745 BLAKE2B 3ac35c90757eb525e7e7953f63a8798a0087470e4a94161987f3c382b6be43240aa8b5c44f279d23d841dbf9e4536f38d3f5e2f63234538a00fe6b6e0ee9c680 SHA512 68f8a7345c606b8ad4511b34e2d76383faf8831202c9429ab24eeb215073984f00f580c83a7f5e348f7d4104d3c82bd6f4661939801444e463c3fcf64c8240bd +DIST nagstamon-3.12.0.tar.gz 581087 BLAKE2B 1f54decdd6cf1fdba8abd7f97102cd84d9f38e68391c31f413860d7c80410e38ee8929cf4d1bfbf7cca1fa54b9088409a47ba669c6ff78d8edecb3313a7e5690 SHA512 029d3dcf5ea5a512940b8e6ed0d3a146e727b3c8ffcbd530fc28f4a896a1a801bb0029a33b62e311c1b0c281810bd001f323c9e3e4c4fc9199bacc7b962ff794 +DIST nagstamon-3.14.0.tar.gz 585452 BLAKE2B a05c6a5a4a2b1e98d2831bef8000f81e306807f0706915d73bcf04f67a070fbd1787d0f98f8650b08bcd94a13b13f21c2b36ef79ee820bb526ff7074b5b5d996 SHA512 6896b0c1a58f1ee6f597ff5022d3bd675760a2c7a0403fc72f0e5c7edde6e2177f0eddb2af5a66e0fbe6166d85394fdcedc92cc0e64e0ac469681a380879a0ab diff --git a/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch deleted file mode 100644 index 3a58227e0144..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-2.0-setup.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/setup.py b/setup.py -index 467bb42..24644a3 100644 ---- a/setup.py -+++ b/setup.py -@@ -35,7 +35,7 @@ if platform.system() not in ['Windows', 'Darwin']: - NAME = NAME.lower() - VERSION = AppInfo.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 - import os.path -@@ -134,10 +134,7 @@ setup(name=NAME, - 'Nagstamon.thirdparty.Xlib.ext', - 'Nagstamon.thirdparty.Xlib.protocol', - 'Nagstamon.thirdparty.Xlib.support', -- 'Nagstamon.thirdparty.Xlib.xobject', -- 'Nagstamon.thirdparty.keyring', -- 'Nagstamon.thirdparty.keyring.backends', -- 'Nagstamon.thirdparty.keyring.util'], -+ 'Nagstamon.thirdparty.Xlib.xobject',], - 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.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch deleted file mode 100644 index 26bb22fec4df..000000000000 --- a/net-analyzer/nagstamon/files/nagstamon-3.0-setup.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.py b/setup.py -index 267ced2..538c5bb 100644 ---- a/setup.py -+++ b/setup.py -@@ -37,7 +37,7 @@ if OS not in ['Windows', 'Darwin']: - NAME = NAME.lower() - VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION - --NAGSTAMON_SCRIPT = 'nagstamon.py' -+NAGSTAMON_SCRIPT = 'nagstamon' - - # workaround to get directory of Qt5 plugins to add missing 'mediaservice' folder needed for audio on OSX and Windows - from PyQt5 import QtCore -@@ -130,12 +130,7 @@ setup(name=NAME, - packages=['Nagstamon', - 'Nagstamon.QUI', - 'Nagstamon.Servers', -- 'Nagstamon.thirdparty', -- 'Nagstamon.thirdparty.Xlib', -- 'Nagstamon.thirdparty.Xlib.ext', -- 'Nagstamon.thirdparty.Xlib.protocol', -- 'Nagstamon.thirdparty.Xlib.support', -- 'Nagstamon.thirdparty.Xlib.xobject'], -+ 'Nagstamon.thirdparty',], - package_dir={'Nagstamon': 'Nagstamon'}, - package_data={'Nagstamon': ['resources/*']}, - data_files=[('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1.gz']), diff --git a/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch new file mode 100644 index 000000000000..f9fe785df978 --- /dev/null +++ b/net-analyzer/nagstamon/files/nagstamon-3.12.0-setup.patch @@ -0,0 +1,27 @@ +--- a/setup.py 2023-01-29 09:29:13.885165525 +0100 ++++ b/setup.py 2023-01-29 09:30:32.585630680 +0100 +@@ -45,9 +45,9 @@ + else: + DIST, DIST_VERSION, DIST_NAME = platform.dist() + NAME = NAME.lower() + #VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION + VERSION = AppInfo.VERSION.replace('-', '.') +-NAGSTAMON_SCRIPT = 'nagstamon.py' ++NAGSTAMON_SCRIPT = 'nagstamon' + + from setuptools import setup + +@@ -120,12 +120,7 @@ + 'Nagstamon.Servers', + 'Nagstamon.Servers.Alertmanager', + 'Nagstamon.Servers.Centreon', +- 'Nagstamon.thirdparty', +- 'Nagstamon.thirdparty.Xlib', +- 'Nagstamon.thirdparty.Xlib.ext', +- 'Nagstamon.thirdparty.Xlib.protocol', +- 'Nagstamon.thirdparty.Xlib.support', +- 'Nagstamon.thirdparty.Xlib.xobject'], ++ 'Nagstamon.thirdparty'], + package_dir={'Nagstamon': 'Nagstamon'}, + package_data={'Nagstamon': ['resources/*.*', + 'resources/qui/*', diff --git a/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch new file mode 100644 index 000000000000..1bb994201637 --- /dev/null +++ b/net-analyzer/nagstamon/files/nagstamon-3.14.0-setup.patch @@ -0,0 +1,24 @@ +--- a/setup.py 2023-01-29 09:29:13.885165525 +0100 ++++ b/setup.py 2023-01-29 09:30:32.585630680 +0100 +@@ -45,6 +45,6 @@ + #VERSION = AppInfo.VERSION.replace('-', '.') + '.' + DIST + DIST_VERSION + VERSION = AppInfo.VERSION.replace('-', '.') +-NAGSTAMON_SCRIPT = 'nagstamon.py' ++NAGSTAMON_SCRIPT = 'nagstamon' + + from setuptools import setup + +@@ -120,12 +120,7 @@ + 'Nagstamon.Servers', + 'Nagstamon.Servers.Alertmanager', + 'Nagstamon.Servers.Centreon', +- 'Nagstamon.thirdparty', +- 'Nagstamon.thirdparty.Xlib', +- 'Nagstamon.thirdparty.Xlib.ext', +- 'Nagstamon.thirdparty.Xlib.protocol', +- 'Nagstamon.thirdparty.Xlib.support', +- 'Nagstamon.thirdparty.Xlib.xobject'], ++ 'Nagstamon.thirdparty'], + package_dir={'Nagstamon': 'Nagstamon'}, + package_data={'Nagstamon': ['resources/*.*', + 'resources/qui/*', diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml index 596c2d8745d0..a3a1f9a6d9b5 100644 --- a/net-analyzer/nagstamon/metadata.xml +++ b/net-analyzer/nagstamon/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>idl0r@gentoo.org</email> - <name>Christian Ruppert</name> + <email>graaff@gentoo.org</email> + <name>Hans de Graaff</name> </maintainer> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild deleted file mode 100644 index 9e0174ed0c60..000000000000 --- a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils python-r1 distutils-r1 - -MY_PN="Nagstamon" -MY_P="${MY_PN}-${PV/_}" - -DESCRIPTION="Nagstamon is a systray monitor for displaying realtime status of a Nagios box" -HOMEPAGE="http://nagstamon.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# TODO: secretstorage -# TODO: Xlib - https://github.com/python-xlib/python-xlib/tree/master/Xlib -RDEPEND="${PYTHON_DEPS} - dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}" - -PATCHES="${FILESDIR}/${PN}-2.0-setup.patch" - -src_prepare() { - default - - mv ${PN}.py ${PN} || die - -# rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die - rm -rf "${S}/Nagstamon/thirdparty/keyring/" || die -} diff --git a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild deleted file mode 100644 index bd34a19dbb02..000000000000 --- a/net-analyzer/nagstamon/nagstamon-3.0.2-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils python-r1 distutils-r1 - -MY_PN="Nagstamon" -MY_P="${MY_PN}-${PV/_p/-}" - -DESCRIPTION="status monitor for the desktop" -DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" -HOMEPAGE="https://nagstamon.ifw-dresden.de" -SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/secretstorage[${PYTHON_USEDEP}] - >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}" - -PATCHES="${FILESDIR}/${PN}-3.0-setup.patch" - -src_prepare() { - default_src_prepare - - mv ${PN}.py ${PN} || die - - rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die -} diff --git a/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild new file mode 100644 index 000000000000..7745a3ac4a41 --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.12.0-r1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools + +inherit desktop distutils-r1 virtualx + +distutils_enable_tests pytest + +MY_PN="Nagstamon" +MY_P="${MY_PN}-${PV/_p/-}" + +DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" +HOMEPAGE="https://nagstamon.de" +SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + ) + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/secretstorage[${PYTHON_USEDEP}] + >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] + dev-python/requests-kerberos[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pylint[${PYTHON_USEDEP}] )" + +PATCHES=( "${FILESDIR}/${PN}-3.12.0-setup.patch" ) + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -e 's:\(nagstamon\.1\)\.gz:\1:' \ + -e '/share/ s:^:#:' \ + -i setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} + +python_test() { + virtx epytest +} + +distutils-r1_python_install_all() { + default + + doman Nagstamon/resources/nagstamon.1 + domenu Nagstamon/resources/nagstamon.desktop + doicon Nagstamon/resources/nagstamon.svg +} diff --git a/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild index bb891b8c5697..132181cc389e 100644 --- a/net-analyzer/nagstamon/nagstamon-3.4.1.ebuild +++ b/net-analyzer/nagstamon/nagstamon-3.12.0.ebuild @@ -1,45 +1,51 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{10..11} ) +DISTUTILS_USE_PEP517=setuptools -inherit eutils python-r1 distutils-r1 +inherit distutils-r1 virtualx + +distutils_enable_tests pytest 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" +HOMEPAGE="https://nagstamon.de" +SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" +KEYWORDS="amd64 x86" +IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + ) + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/keyring[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/cryptography[${PYTHON_USEDEP}] dev-python/secretstorage[${PYTHON_USEDEP}] >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" + dev-python/requests-kerberos[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pylint[${PYTHON_USEDEP}] )" -PATCHES="${FILESDIR}/${PN}-3.0-setup.patch" +PATCHES=( "${FILESDIR}/${PN}-3.12.0-setup.patch" ) src_prepare() { default_src_prepare @@ -52,3 +58,7 @@ src_prepare() { rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die } + +python_test() { + virtx epytest +} diff --git a/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild new file mode 100644 index 000000000000..5f85aa5424c7 --- /dev/null +++ b/net-analyzer/nagstamon/nagstamon-3.14.0.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=setuptools + +inherit desktop distutils-r1 virtualx + +distutils_enable_tests pytest + +MY_PN="Nagstamon" +MY_P="${MY_PN}-${PV/_p/-}" + +DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" +HOMEPAGE="https://nagstamon.de" +SRC_URI="https://github.com/HenriWahl/Nagstamon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/lxml[${PYTHON_USEDEP}] + || ( + dev-python/PyQt6[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] + ) + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/keyring[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/secretstorage[${PYTHON_USEDEP}] + >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] + dev-python/requests-kerberos[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pylint[${PYTHON_USEDEP}] )" + +PATCHES=( "${FILESDIR}/${PN}-3.14.0-setup.patch" ) + +src_prepare() { + default_src_prepare + + # pre-compressed already + rm Nagstamon/resources/nagstamon.1.gz || die + sed -e 's:\(nagstamon\.1\)\.gz:\1:' \ + -e '/share/ s:^:#:' \ + -i setup.py || die + + mv ${PN}.py ${PN} || die + + rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die +} + +python_test() { + virtx epytest +} + +distutils-r1_python_install_all() { + default + + doman Nagstamon/resources/nagstamon.1 + domenu Nagstamon/resources/nagstamon.desktop + doicon Nagstamon/resources/nagstamon.svg +} diff --git a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild b/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild deleted file mode 100644 index bb891b8c5697..000000000000 --- a/net-analyzer/nagstamon/nagstamon-3.2.1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python3_6 ) - -inherit eutils python-r1 distutils-r1 - -MY_PN="Nagstamon" -MY_P="${MY_PN}-${PV/_p/-}" - -DESCRIPTION="status monitor for the desktop" -DESCRIPTION="systray monitor for displaying realtime status of several monitoring systems" -HOMEPAGE="https://nagstamon.ifw-dresden.de" -SRC_URI="https://nagstamon.ifw-dresden.de/files/stable/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,multimedia,svg,widgets,${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/keyring[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - dev-python/secretstorage[${PYTHON_USEDEP}] - >=dev-python/python-xlib-0.19[${PYTHON_USEDEP}] - dev-python/requests-kerberos[${PYTHON_USEDEP}] - virtual/python-typing[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" - -S="${WORKDIR}/${MY_PN}" - -PATCHES="${FILESDIR}/${PN}-3.0-setup.patch" - -src_prepare() { - default_src_prepare - - # pre-compressed already - rm Nagstamon/resources/nagstamon.1.gz || die - sed -i -e 's:\(nagstamon\.1\)\.gz:\1:' setup.py || die - - mv ${PN}.py ${PN} || die - - rm -rf "${S}/Nagstamon/thirdparty/Xlib/" || die -} diff --git a/net-analyzer/nagtrap/metadata.xml b/net-analyzer/nagtrap/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/nagtrap/metadata.xml +++ b/net-analyzer/nagtrap/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild index a287f19e46bc..8f20f2c81674 100644 --- a/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild +++ b/net-analyzer/nagtrap/nagtrap-0.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ IUSE="" DEPEND="virtual/httpd-php" RDEPEND="dev-lang/php[mysql] - net-analyzer/snmptt[mysql] + net-analyzer/snmptt net-analyzer/nagios-core virtual/httpd-php" @@ -22,11 +22,11 @@ src_install() { dodoc ChangeLog THANKS dodir /usr/share/nagtrap - cp -r {db,nagtrap} "${D}"/usr/share/nagtrap/ - fperms 640 "${D}"/usr/share/nagtrap/nagtrap/etc/config.ini.php-dist + cp -r {db,nagtrap} "${ED}"/usr/share/nagtrap/ || die + fperms 640 /usr/share/nagtrap/nagtrap/etc/config.ini.php-dist sed -i -e 's#use lib.*#use lib "/usr/lib/nagios/plugins";#g' \ - plugin/check_snmptraps.pl || die "sed failed" + plugin/check_snmptraps.pl || die "sed failed" insinto /usr/$(get_libdir)/nagios/plugins insopts -m 750 -g nagios @@ -35,10 +35,10 @@ src_install() { pkg_postinst() { elog "Before running NagTrap for the first time, you will need setup its configuration" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php" elog "A sample is installed in" - elog "/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" + elog "${EROOT}/usr/share/nagtrap/nagtrap/etc/config.ini.php-sample" elog elog "NagTrap requires snmptt to write traps into a MySQL database." - elog "A database schema is available in {$D}usr/share/nagtrap/db" + elog "A database schema is available in ${EROOT}/usr/share/nagtrap/db" } diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml index 01ab90fe15dc..b5b76fdc2ceb 100644 --- a/net-analyzer/nast/metadata.xml +++ b/net-analyzer/nast/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild deleted file mode 100644 index 9eefa451cd9c..000000000000 --- a/net-analyzer/nast/nast-0.2.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="NAST - Network Analyzer Sniffer Tool" -HOMEPAGE="https://sourceforge.net/projects/nast.berlios/" -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 x86" -IUSE="ncurses" - -RDEPEND=" - >=net-libs/libnet-1.1.1 - net-libs/libpcap - ncurses? ( >=sys-libs/ncurses-5.4:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - eautoreconf -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} - -src_install() { - dosbin nast - doman nast.8 - dodoc AUTHORS BUGS CREDITS ChangeLog NCURSES_README README TODO -} diff --git a/net-analyzer/nast/nast-0.2.0-r2.ebuild b/net-analyzer/nast/nast-0.2.0-r3.ebuild index b2e8f7dd0342..fa2602d1b025 100644 --- a/net-analyzer/nast/nast-0.2.0-r2.ebuild +++ b/net-analyzer/nast/nast-0.2.0-r3.ebuild @@ -1,15 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools flag-o-matic DESCRIPTION="NAST - Network Analyzer Sniffer Tool" HOMEPAGE="https://sourceforge.net/projects/nast.berlios/" -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}.berlios/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 x86" IUSE="ncurses" RDEPEND=" @@ -17,10 +19,9 @@ RDEPEND=" net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4:= ) " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest index fb0740d0dcf2..b7743fc91159 100644 --- a/net-analyzer/nbtscan/Manifest +++ b/net-analyzer/nbtscan/Manifest @@ -1,2 +1 @@ -DIST nbtscan-1.5.1.tar.gz 82107 BLAKE2B dd49ee25995c522f3cf75e35cca427be7a2b5e697b374323b0be4c6a92a2a96c9e30ca1844e953354f3490ed4090682592e1c0ea5192512b2883b1085356783f SHA512 2e2ac6a3ce7b188552c4f5f82b1e2bb99049bd0cd6f69361c59066c0b262d9311186aabc0c03c3096b7d2c48276052b1ddf230eba43051e221019c9bf223ae3e -DIST nbtscan-1.6.tar.gz 27290 BLAKE2B 3e38e946aa875be2bca8ad0155a5bf4c612cecda3761623d75657b2ab54aa7a7526d284a78db764518748e092c2719a4c02bcdce32095c87537c9979571c10f7 SHA512 b791357160ae7fe784ebf3b74df551c0b7dcaeefae2ddd585a9e5ac0fe7dd1bb32f00d2b898dcd700e74809708f42fc8e5f0022254e1282914b3f668564b4bcb +DIST nbtscan-1.7.2.tar.gz 29758 BLAKE2B 8e6af433a600865c391d0f7a72a8aa0b82d6ae61abedec8c2dc5cc89515f92c2ebdfd4868d578d4028b9aee4224b2f972bd574040db3c30caf9e0e59f9eb303a SHA512 b20eafe6737aa378e230dd2842e045bf2a48497e21b87ce6c534366cbb162862168a5c8143c0a69d495525caca75e91e437b87d9778e4cfe573b20461e2ccbbf diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch deleted file mode 100644 index dbf2457bc29f..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-gentoo.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,10 +11,10 @@ - BINDIR = @bindir@ - - nbtscan: $(OBJECTS) -- $(CC) $(CFLAGS) -o nbtscan $(OBJECTS) $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o nbtscan $(OBJECTS) $(LIBS) - - install: -- $(INSTALL) $(TARGET) $(BINDIR)/$(TARGET) -+ $(INSTALL) $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET) - - nbtscan.o: nbtscan.c statusq.h range.h list.h - $(CC) $(CFLAGS) $(DEFS) -c nbtscan.c diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch deleted file mode 100644 index a585d4495fb5..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-includes-declarations.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/list.h -+++ b/list.h -@@ -19,3 +19,5 @@ - int compare(struct list_item* item1, struct list_item* item2); - - int insert(struct list* lst, unsigned long content); -+ -+int in_list(struct list* lst, unsigned long content); ---- a/nbtscan.c -+++ b/nbtscan.c -@@ -5,6 +5,8 @@ - #include <stdlib.h> - #include <sys/time.h> - #include <string.h> -+#include <ctype.h> -+#include <unistd.h> - #if HAVE_STDINT_H - #include <stdint.h> - #endif ---- a/statusq.h -+++ b/statusq.h -@@ -103,4 +103,10 @@ - char* service_name; - } nb_service_t ; - -+char* getnbservicename(my_uint8_t service, int unique, char* name); -+ -+struct nb_host_info* parse_response(char* buff, int buffsize); -+ -+int send_query(int sock, struct in_addr dest_addr, my_uint32_t rtt_base); -+ - #endif /* STATUSQ_H */ ---- a/statusq.c -+++ b/statusq.c -@@ -29,6 +29,7 @@ - #include <sys/time.h> - #include "statusq.h" - #include <string.h> -+#include <ctype.h> - #include <stdio.h> - #include <stddef.h> - #include "errors.h" diff --git a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch b/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch deleted file mode 100644 index 4aca976dcd38..000000000000 --- a/net-analyzer/nbtscan/files/nbtscan-1.5.1-script-whitespace.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- a/nbtscan.c -+++ b/nbtscan.c -@@ -86,7 +86,7 @@ - int d_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo) { - int i; - unsigned char service; /* 16th byte of NetBIOS name */ -- char name[16]; -+ char comp_name[16]; - - printf("\nPacket dump for Host %s:\n\n", inet_ntoa(addr)); - if(hostinfo->is_broken) printf("Incomplete packet, %d bytes long.\n", hostinfo->is_broken); -@@ -110,9 +110,9 @@ - printf("Names received:\n"); - for(i=0; i< hostinfo->header->number_of_names; i++) { - service = hostinfo->names[i].ascii_name[15]; -- strncpy(name, hostinfo->names[i].ascii_name, 15); -- name[16]=0; -- printf("%-17s Service: 0x%02x Flags: 0x%04x\n", name, service, hostinfo->names[i].rr_flags); -+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -+ comp_name[15]=0; -+ printf("%-17s Service: 0x%02x Flags: 0x%04x\n", comp_name, service, hostinfo->names[i].rr_flags); - } - }; - -@@ -147,9 +147,9 @@ - - - int v_print_hostinfo(struct in_addr addr, const struct nb_host_info* hostinfo, char* sf, int hr) { -- int i, unique; -+ int i, j, unique; - my_uint8_t service; /* 16th byte of NetBIOS name */ -- char name[16]; -+ char comp_name[16]; - char* sname; - - if(!sf) { -@@ -163,20 +163,27 @@ - if(hostinfo->header && hostinfo->names) { - for(i=0; i< hostinfo->header->number_of_names; i++) { - service = hostinfo->names[i].ascii_name[15]; -- strncpy(name, hostinfo->names[i].ascii_name, 15); -- name[16]=0; -+ strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; -+ - unique = !(hostinfo->names[i].rr_flags & 0x0080); - if(sf) { -- printf("%s%s%s%s", inet_ntoa(addr), sf, name, sf); -- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name)); -+ printf("%s%s%s%s", inet_ntoa(addr), sf, comp_name, sf); -+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name)); - else { - printf("%02x", service); - if(unique) printf("U\n"); - else printf("G\n"); - } - } else { -- printf("%-17s", name); -- if(hr) printf("%s\n", (char*)getnbservicename(service, unique, name)); -+ printf("%-17s", comp_name); -+ if(hr) printf("%s\n", (char*)getnbservicename(service, unique, comp_name)); - else { - printf("<%02x>", service); - if(unique) printf(" UNIQUE\n"); -@@ -199,7 +206,7 @@ - }; - - int print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, char* sf) { -- int i; -+ int i,j; - unsigned char service; /* 16th byte of NetBIOS name */ - char comp_name[16], user_name[16]; - int is_server=0; -@@ -215,7 +222,13 @@ - if(service == 0 && unique && first_name) { - /* Unique name, workstation service - this is computer name */ - strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -- comp_name[15] = 0; -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; - first_name = 0; - }; - if(service == 0x20 && unique) { -@@ -252,7 +265,7 @@ - /* If l is true adds #PRE to each line of output (for lmhosts) */ - - int l_print_hostinfo(struct in_addr addr, struct nb_host_info* hostinfo, int l) { -- int i; -+ int i,j; - unsigned char service; /* 16th byte of NetBIOS name */ - char comp_name[16]; - int is_server=0; -@@ -268,7 +281,13 @@ - if(service == 0 && unique && first_name) { - /* Unique name, workstation service - this is computer name */ - strncpy(comp_name, hostinfo->names[i].ascii_name, 15); -- comp_name[15]=0; -+ -+ // Eliminate trailing spaces -+ for(j=0; j < 15; j++) { -+ if (comp_name[j] == ' ') -+ break; -+ } -+ comp_name[j] = 0; - first_name = 0; - }; - }; - diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml index 74c2baebb4ec..932760670984 100644 --- a/net-analyzer/nbtscan/metadata.xml +++ b/net-analyzer/nbtscan/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/nbtscan</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild deleted file mode 100644 index a44802134398..000000000000 --- a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information" -HOMEPAGE="http://www.inetcat.net/software/nbtscan.html" -SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz" -SRC_URI="http://www.inetcat.net/software/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -S=${WORKDIR}/${P}a - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-includes-declarations.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-script-whitespace.patch -} - -src_install () { - dobin ${PN} - dodoc ChangeLog README -} diff --git a/net-analyzer/nbtscan/nbtscan-1.6.ebuild b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild index 9241d68431a2..567fd3977c0b 100644 --- a/net-analyzer/nbtscan/nbtscan-1.6.ebuild +++ b/net-analyzer/nbtscan/nbtscan-1.7.2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information" @@ -10,23 +11,12 @@ 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" -PATCHES=( -# "${FILESDIR}"/${PN}-1.5.1-script-whitespace.patch -) -DOCS=( - AUTHORS - CONTRIBUTING.md - ChangeLog - NEWS - README.md -) +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DOCS=( AUTHORS CONTRIBUTING.md ChangeLog NEWS README.md ) src_prepare() { default - eautoreconf -} -src_install () { - default + eautoreconf } diff --git a/net-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml index 07903da6f676..064f3550e966 100644 --- a/net-analyzer/nbwmon/metadata.xml +++ b/net-analyzer/nbwmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild index f2c7742f396c..613256373c42 100644 --- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild +++ b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="ncurses bandwidth monitor" -HOMEPAGE="http://causes.host.funtoo.org/?p=nbwmon https://github.com/causes-/nbwmon" +HOMEPAGE="https://github.com/causes-/nbwmon" SRC_URI="https://github.com/causes-/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -RDEPEND=" - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +RDEPEND="sys-libs/ncurses" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-0.5.2-tinfo.patch ) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.5.2-tinfo.patch + default tc-export CC PKG_CONFIG } diff --git a/net-analyzer/ndoutils/files/secure-install-permissions.patch b/net-analyzer/ndoutils/files/secure-install-permissions.patch new file mode 100644 index 000000000000..a4c50ab6cedc --- /dev/null +++ b/net-analyzer/ndoutils/files/secure-install-permissions.patch @@ -0,0 +1,183 @@ +From 18ef12037f4a68772d6840cbaa08aa2da07d2891 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 2 Mar 2024 19:30:54 -0500 +Subject: [PATCH 1/2] configure.ac: don't install binaries as + ndo2db_user:ndo2db_group + +In configure.ac we were adding two flags to INSTALL_OPTS that change +the owner:group of all installed files to ndo2db_user:ndo2db_group. +This is often a security vulnerability, since executables (we have a +few) are typically installed into everyone's PATH. If root ever +executes them, the ndo2db_user can take advantage of the situation to +run malicious code as root. + +Fortunately the change in ownership is not really needed. We simply +drop the INSTALL_OPTS, which are used for nothing else, allowing our +files to be installed as the user who is doing the installing. When +installing to one of the system PATHs, that will almost always be +root. +--- + Makefile.in | 9 ++++----- + configure.ac | 2 -- + docs/docbook/en-en/Makefile.in | 1 - + src/Makefile.in | 31 +++++++++++++++---------------- + 4 files changed, 19 insertions(+), 24 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 58c9f0f..68774c2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -37,7 +37,6 @@ INSTALL=@INSTALL@ + GREP=@GREP@ + EGREP=@EGREP@ + +-INSTALL_OPTS=@INSTALL_OPTS@ + OPSYS=@opsys@ + DIST=@dist_type@ + +@@ -98,10 +97,10 @@ install: + @echo "" + + install-config: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR) +- $(INSTALL) -m 644 $(INSTALL_OPTS) config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 644 config/ndo2db.cfg-sample $(DESTDIR)$(CFGDIR) ++ $(INSTALL) -m 644 config/ndomod.cfg-sample $(DESTDIR)$(CFGDIR) + @echo "" + @echo "*** Config files installed ***" + @echo "" +diff --git a/configure.ac b/configure.ac +index 58b47a4..3279397 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -317,8 +317,6 @@ AC_ARG_WITH(ndo2db_user,AC_HELP_STRING([--with-ndo2db-user=<user>],[sets user na + AC_ARG_WITH(ndo2db_group,AC_HELP_STRING([--with-ndo2db-group=<group>],[sets group name to run NDO2DB]),ndo2db_group=$withval,ndo2db_group=nagios) + AC_SUBST(ndo2db_user) + AC_SUBST(ndo2db_group) +-INSTALL_OPTS="-o $ndo2db_user -g $ndo2db_group" +-AC_SUBST(INSTALL_OPTS) + + + dnl Does the user want to check for systemd? +diff --git a/docs/docbook/en-en/Makefile.in b/docs/docbook/en-en/Makefile.in +index d72b68c..29e1e1e 100644 +--- a/docs/docbook/en-en/Makefile.in ++++ b/docs/docbook/en-en/Makefile.in +@@ -13,7 +13,6 @@ BINDIR=@bindir@ + LIBEXECDIR=@libexecdir@
+ DATAROOTDIR=@datarootdir@
+ INSTALL=@INSTALL@
+-INSTALL_OPTS=@INSTALL_OPTS@
+
+
+ all:
+diff --git a/src/Makefile.in b/src/Makefile.in +index 532cc82..352a768 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -26,7 +26,6 @@ exec_prefix=@exec_prefix@ + PIPEDIR=@localstatedir@ + BINDIR=@bindir@ + INSTALL=@INSTALL@ +-INSTALL_OPTS=@INSTALL_OPTS@ + + CC=@CC@ + +@@ -126,9 +125,9 @@ distclean: clean + devclean: distclean + + install: install-4x +- $(INSTALL) -m 774 $(INSTALL_OPTS) file2sock $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) log2ndo $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) sockdebug $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR) + @echo "" + @echo " Hint: NDOUtils Installation against Nagios v4.x" + @echo " completed." +@@ -147,20 +146,20 @@ install: install-4x + @echo "" + + install-2x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-2x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-2x.o $(DESTDIR)$(BINDIR)/ndomod.o + + install-3x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-3x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-3x.o $(DESTDIR)$(BINDIR)/ndomod.o + + install-4x: +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PIPEDIR) +- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db +- $(INSTALL) -m 755 $(INSTALL_OPTS) ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o ++ $(INSTALL) -m 775 -d $(DESTDIR)$(PIPEDIR) ++ $(INSTALL) -m 775 -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 ndo2db-4x $(DESTDIR)$(BINDIR)/ndo2db ++ $(INSTALL) -m 755 ndomod-4x.o $(DESTDIR)$(BINDIR)/ndomod.o + +-- +2.43.0 + +From 69a80d6a9bf1196ffcfffa7f756633bb13a62b5f Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky <michael@orlitzky.com> +Date: Sat, 2 Mar 2024 19:52:47 -0500 +Subject: [PATCH 2/2] src/Makefile.in: install all executables with mode 0755 + +Three executables -- file2sock, log2ndo, and sockdebug -- are +currently being installed group-writable but not +world-executable. This is in contrast with the other two executables, +ndo2db and ndomod.o, that are installed mode 0755. + +Having recently removed the INSTALL_OPTS that were altering the +owner:group of these files, there is no longer any security risk to +mode 0774. However, 0755 is more consistent with both the rest of our +executables, and with the typical permissions on /usr/bin that arise +from the (extremely common) umask of 0022. + +We change these three to 0755 for a little bit of extra peace of mind. + +changes. Lines starting # with '#' will be ignored, and an empty +message aborts the commit. # # Date: Sat Mar 2 19:52:47 2024 -0500 # +src/Makefile.in # +--- + src/Makefile.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.in b/src/Makefile.in +index 352a768..e6a1816 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -125,9 +125,9 @@ distclean: clean + devclean: distclean + + install: install-4x +- $(INSTALL) -m 774 file2sock $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 log2ndo $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 sockdebug $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 file2sock $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 log2ndo $(DESTDIR)$(BINDIR) ++ $(INSTALL) -m 755 sockdebug $(DESTDIR)$(BINDIR) + @echo "" + @echo " Hint: NDOUtils Installation against Nagios v4.x" + @echo " completed." +-- +2.43.0 + diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml index 5c2264521203..704d45ff9538 100644 --- a/net-analyzer/ndoutils/metadata.xml +++ b/net-analyzer/ndoutils/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild index 784309fee43a..32d8d3bd8c57 100644 --- a/net-analyzer/ndoutils/ndoutils-2.1.3-r2.ebuild +++ b/net-analyzer/ndoutils/ndoutils-2.1.3-r4.ebuild @@ -1,45 +1,45 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit systemd +EAPI=8 -DESCRIPTION="Nagios addon to store Nagios data in a MySQL database" -HOMEPAGE="https://www.nagios.org/" +inherit autotools systemd + +DESCRIPTION="Nagios addon to store Nagios data in a database" +HOMEPAGE="https://github.com/NagiosEnterprises/ndoutils" SRC_URI="https://github.com/NagiosEnterprises/${PN}/archive/${P}.tar.gz" +S="${WORKDIR}/${PN}-${P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -# 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" + dev-perl/DBI" + +# The default value of the --with-ndo2db-{user,group} flag is "nagios". +# For unrelated reasons, we actually patch out the build-time dependency +# on the user/group, but it should still be there at runtime. RDEPEND="${DEPEND} + acct-user/nagios + acct-group/nagios virtual/mysql" -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 + "${FILESDIR}"/secure-install-permissions.patch ) +src_prepare() { + default + eautoreconf +} + src_configure() { # The localstatedir is where our socket will be created by the # nagios daemon, so we put it in /var/lib/nagios where the "nagios" @@ -48,6 +48,9 @@ src_configure() { # And normally, we would use /run for the pid file, but the daemon # drops permissions before creating it, so the piddir also needs # to be writable by the nagios user. + # + # Oh, and the build fails without --enable-mysql, so don't try. + # econf --enable-mysql \ --localstatedir=/var/lib/nagios \ --sysconfdir=/etc/nagios \ @@ -58,34 +61,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" - - # The documentation isn't installed by the build system - dodoc -r docs/html + newinitd startup/openrc-init ndo2db + newconfd startup/openrc-conf ndo2db - 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/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml index 18ff97735235..f5859181ac93 100644 --- a/net-analyzer/ndsad/metadata.xml +++ b/net-analyzer/ndsad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild deleted file mode 100644 index 5ccdff9433d7..000000000000 --- a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources" -HOMEPAGE="https://sourceforge.net/projects/ndsad" -SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" - -DEPEND=">=net-libs/libpcap-0.8" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-conf_path.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-getpid.patch \ - "${FILESDIR}"/${P}-log-path.patch \ - "${FILESDIR}"/${P}-strncpy-overflow.patch - - eautoreconf -} - -src_configure() { - econf --with-ulog=yes -} - -DOCS=( ChangeLog AUTHORS README ) - -src_install() { - default - - doman ndsad.conf.5 - - insinto /etc - newins ndsad.conf ndsad.conf - - newinitd "${FILESDIR}"/ndsad.init ndsad - newconfd "${FILESDIR}"/ndsad.conf.d ndsad -} diff --git a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild index e7f9a919a4a4..d60e8c6b7702 100644 --- a/net-analyzer/ndsad/ndsad-1.33-r2.ebuild +++ b/net-analyzer/ndsad/ndsad-1.33-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,11 @@ inherit autotools DESCRIPTION="Cisco netflow probe from libpcap, ULOG, tee/divert sources" HOMEPAGE="https://sourceforge.net/projects/ndsad" -SRC_URI="mirror://sourceforge/ndsad/ndsad-${PV}.tgz" +SRC_URI="https://downloads.sourceforge.net/ndsad/ndsad-${PV}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="x86" DEPEND=" >=net-libs/libpcap-0.8 diff --git a/net-analyzer/nessus-agent-bin/Manifest b/net-analyzer/nessus-agent-bin/Manifest index 5961ec0f2cd7..394824b917b2 100644 --- a/net-analyzer/nessus-agent-bin/Manifest +++ b/net-analyzer/nessus-agent-bin/Manifest @@ -1,2 +1,2 @@ -DIST NessusAgent-7.4.2-es7.x86_64.rpm 15989044 BLAKE2B 7fdc998acc4a5ee38519a3cf4d41d1de29cb8ddacb05bd6f734a458c63d7ce22c547b4d080320631d489dc381c4553d99a81786dcb48231833a77561ffa6928f SHA512 4aacc51d360c41963ad46c0976322cd29012d52e054337d4e0a303257796923bd35059324a041827ce0c54ef5c5dd6738311fcc4f0bcba19b6d4ea1e3730a146 -DIST NessusAgent-7.5.0-es7.x86_64.rpm 16793328 BLAKE2B 2a7409477f0d08d2be6d3c5e482f33e73861bc01c3c26e1edd689d71861621f5699ce0e2bb67e994dcd54e9e1314dee056b46aea79fe990bf1629e229ada8e64 SHA512 ed82b37d67a27a3fc9d317a9009afd42332b2935f869f72344f60946a28446ee606821b927f74a4899bb3c5d485b1a607935714ab604e206108db3abe99dcc38 +DIST NessusAgent-10.6.1-el8.aarch64.rpm 18910012 BLAKE2B 810d8aed4391ef9782d19a9963ee0f3582b4aced89ccf7a12950e286eb42b1e314a0cba480982a681b413da73f060cdd909dd675702c2261d1406b2866617673 SHA512 81e91d0cc9bfe89a65ad1b83acad8512dcfbafa68a4f9b6311b31475c5b36ae44be4a82c32e359f60842d97b3e65c5ba75e1211de9d8025c194bf41464659c73 +DIST NessusAgent-10.6.1-el8.x86_64.rpm 20397988 BLAKE2B 5d75a5b21ed9ec4c4d4b4142cd37000e304c765a334118dd149f69b0c8dd2b729e08bd3a40ad5df5ed02ed43b336baed3edf3103b455aeb7f45dce4ca2a8f591 SHA512 51edba9a836b80a2ece40ff3b4995b2b8351e3cd8e637d04c3a55f5b90814cea453ee836ba71d691a6076032fd0d9b95c694c1ebed66c4fe75f821e23b2bd757 diff --git a/net-analyzer/nessus-agent-bin/metadata.xml b/net-analyzer/nessus-agent-bin/metadata.xml index c8e172bcbf62..8dbe725d1f4e 100644 --- a/net-analyzer/nessus-agent-bin/metadata.xml +++ b/net-analyzer/nessus-agent-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.1.ebuild index 20d896ea6290..fcc153bf0cb4 100644 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.5.0.ebuild +++ b/net-analyzer/nessus-agent-bin/nessus-agent-bin-10.6.1.ebuild @@ -1,45 +1,37 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit rpm pax-utils systemd +inherit rpm systemd -MY_P="NessusAgent-${PV}-es7" +MY_P="NessusAgent-${PV}-el8" DESCRIPTION="A remote security scanner for Linux - agent component" HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" +SRC_URI=" + amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN/-bin/s}/files/${MY_P}.x86_64.rpm ) + arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN/-bin/s}/files/${MY_P}.aarch64.rpm ) +" -LICENSE="GPL-2 Nessus-EULA" +LICENSE="GPL-2 Tenable-Master-Agreement" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="-* ~amd64 ~arm64" -RESTRICT="mirror fetch strip" +RESTRICT="mirror strip" -QA_PREBUILT="opt/nessus_agent/bin/nasl - opt/nessus_agent/bin/nessus-mkrand - opt/nessus_agent/lib/nessus/libjemalloc.so.${PV} - opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so - opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc - opt/nessus_agent/sbin/nessus-check-signature - opt/nessus_agent/sbin/nessus-service - opt/nessus_agent/sbin/nessuscli - opt/nessus_agent/sbin/nessusd" +QA_PREBUILT="opt/nessus_agent/bin/* + opt/nessus_agent/lib/nessus/*.so + opt/nessus_agent/lib/nessus/iconv/*.so + opt/nessus_agent/lib/nessus/libjemalloc.so.* + opt/nessus_agent/sbin/*" S="${WORKDIR}" -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" - einfo "The archive should then be placed into your DISTDIR directory." -} - src_install() { # Using doins -r would strip executable bits from all binaries cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd - # Make sure these originally empty directories do not vanish, # Nessus will not run properly without them keepdir /opt/nessus_agent/com/nessus/CA @@ -53,6 +45,12 @@ src_install() { } pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus_agent/sbin/nessuscli install "${EROOT}"/opt/nessus_agent/var/nessus/plugins-core.tar.gz + if [[ -z "${REPLACING_VERSIONS}" ]]; then elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," elog "obtain an appropriate linking key and run" @@ -60,5 +58,7 @@ pkg_postinst() { elog " /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]" elog "" elog "This can be done before the agent is started." + else + elog "Please restart the nessusagent service to complete the update process" fi } diff --git a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild b/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild deleted file mode 100644 index 20d896ea6290..000000000000 --- a/net-analyzer/nessus-agent-bin/nessus-agent-bin-7.4.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="NessusAgent-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux - agent component" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus_agent/bin/nasl - opt/nessus_agent/bin/nessus-mkrand - opt/nessus_agent/lib/nessus/libjemalloc.so.${PV} - opt/nessus_agent/lib/nessus/libnessus-glibc-fix.so - opt/nessus_agent/lib/nessus/plugins/ovaldi64-rhel7.inc - opt/nessus_agent/sbin/nessus-check-signature - opt/nessus_agent/sbin/nessus-service - opt/nessus_agent/sbin/nessuscli - opt/nessus_agent/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus-agents" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus_agent/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus_agent/com/nessus/CA - keepdir /opt/nessus_agent/etc/nessus - keepdir /opt/nessus_agent/var/nessus/logs - keepdir /opt/nessus_agent/var/nessus/tmp - keepdir /opt/nessus_agent/var/nessus/users - - newinitd "${FILESDIR}"/nessusagent.initd nessusagent - systemd_dounit usr/lib/systemd/system/nessusagent.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "In order to link the agent to Tenable.io or an instance of Nessus Manager," - elog "obtain an appropriate linking key and run" - elog "" - elog " /opt/nessus_agent/sbin/nessuscli agent link --key=<key> --host=<host> --port=<port> [optional parameters]" - elog "" - elog "This can be done before the agent is started." - fi -} diff --git a/net-analyzer/nessus-bin/Manifest b/net-analyzer/nessus-bin/Manifest index 2f734c36f535..4fb920a6d1f7 100644 --- a/net-analyzer/nessus-bin/Manifest +++ b/net-analyzer/nessus-bin/Manifest @@ -1,3 +1,2 @@ -DIST Nessus-8.5.2-es7.x86_64.rpm 72892020 BLAKE2B c5ae05c02da4fe3265ae1b31da0d8dc025c7275ef466d7f889ebefe6a6006e500e2df029ab90ab37cd0c5089078a22b4f0474a4cfa830a378aead68337154f91 SHA512 ef96ee30b693c72a33981757a8e9616ce7813837de90065c8d140e9702552798e09c0941c282d1a54817f036f606a9934bc9020e86dce12baf50a1a57dbcec08 -DIST Nessus-8.8.0-es7.x86_64.rpm 77275432 BLAKE2B 437d4f958d0f45924cb0c994710d908b6a0a48bbee9ffa184391e7a31484d9c933a210c7d4c6d68fa918a873e09874a58ed40ca81203aaef5c44541037777dbd SHA512 d779703db9c114a51e282dde35257121278fa4ec6035c0c861ebc9f04e967aa2a0cde1efdd4f08c2652ecfab3978a8853970081759e9dee492a3ebe8c4fc502b -DIST Nessus-8.9.0-es7.x86_64.rpm 81085048 BLAKE2B fc4717c31b59261199e87e2080f04a492a96fced562b2ded36741303d0f1c0fc447113f080cf64d2fd606148109f558499383433b39caafb2b8f77684f1b2ad5 SHA512 d397dd545a6c02f906b998c55f2d3b0ae06b247d648f1c25d260190ca4f161199f494d903c430cf2d9a664345b88f6ca5f4cd865a6a39b19be22a1d8a236c603 +DIST Nessus-10.7.2-el8.aarch64.rpm 62540368 BLAKE2B 6f8ce0cdbf4c4805da666ba954fc717296e325dc693b1301e2586e9bbb880e85edf6f65a246d782663d6964d1f8c508bd57cc797801853163a39309b399d2e86 SHA512 10896aedd260cdb3cecdbf3fe2cbd9ea904c880935969f44d776be8e5326abbb7e31ea177afff2bfb65589bbb03d92f4b99a59c3c714a9671cc40589e2e22bf1 +DIST Nessus-10.7.2-el8.x86_64.rpm 63974168 BLAKE2B 34e765cbda0484d67e8c119661dde82c27056a383eef7eca019fd570905988cd76776b2ab2c90c1b25c4effa026b59b501a4d133f038aeba6978a758ff3f0aab SHA512 0caa0c28189560cee6058d309f821d9a287c72c9dcb177d1686dbc61173bc44a462b22c714a9e34989cfa579009e87722249e5314326ccd398c99a0fc07c9acb diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml index 240647db5de6..3a59c704b098 100644 --- a/net-analyzer/nessus-bin/metadata.xml +++ b/net-analyzer/nessus-bin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> diff --git a/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild new file mode 100644 index 000000000000..3fe24e9b4ae0 --- /dev/null +++ b/net-analyzer/nessus-bin/nessus-bin-10.7.2.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit rpm systemd + +MY_P="Nessus-${PV}-el8" + +DESCRIPTION="A remote security scanner for Linux" +HOMEPAGE="https://www.tenable.com/" +SRC_URI=" + amd64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.x86_64.rpm ) + arm64? ( https://www.tenable.com/downloads/api/v2/pages/${PN%-bin}/files/${MY_P}.aarch64.rpm ) +" + +LICENSE="GPL-2 Tenable-Master-Agreement" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64" + +RESTRICT="mirror strip" + +QA_PREBUILT="opt/nessus/bin/* + opt/nessus/lib/nessus/*.so + opt/nessus/lib/nessus/iconv/*.so + opt/nessus/lib/nessus/libjemalloc.so.* + opt/nessus/sbin/*" + +S="${WORKDIR}" + +src_install() { + # Using doins -r would strip executable bits from all binaries + cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" + + # Make sure these originally empty directories do not vanish, + # Nessus will not run properly without them + keepdir /opt/nessus/com/nessus/CA + keepdir /opt/nessus/etc/nessus + keepdir /opt/nessus/var/nessus/logs + keepdir /opt/nessus/var/nessus/tmp + + newinitd "${FILESDIR}"/nessusd-initd nessusd-bin + systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service +} + +pkg_postinst() { + # Actually update Nessus core components. According to upstream packages, + # harmless to invoke on fresh installations too - and it may make life easier + # for people who had restored Nessus state from backups, had it lying around + # from older installations and so on. + "${EROOT}"/opt/nessus/sbin/nessuscli install "${EROOT}"/opt/nessus/var/nessus/plugins-core.tar.gz + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To get started launch the nessusd-bin service, then point your Web browser to" + elog " https://<yourhost>:8834/" + else + elog "Please restart the nessusd-bin service to use the new version of Nessus" + fi +} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild deleted file mode 100644 index 45aa75d3c45a..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.5.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="Nessus-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "You may want to restart the nessusd-bin service to use" - elog "the new version of Nessus." - fi -} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild deleted file mode 100644 index 45aa75d3c45a..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.8.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="Nessus-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "You may want to restart the nessusd-bin service to use" - elog "the new version of Nessus." - fi -} diff --git a/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild b/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild deleted file mode 100644 index eedc870324ec..000000000000 --- a/net-analyzer/nessus-bin/nessus-bin-8.9.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit rpm pax-utils systemd - -MY_P="Nessus-${PV}-es7" - -DESCRIPTION="A remote security scanner for Linux" -HOMEPAGE="https://www.tenable.com/" -SRC_URI="${MY_P}.x86_64.rpm" - -LICENSE="GPL-2 Nessus-EULA" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="mirror fetch strip" - -QA_PREBUILT="opt/nessus/bin/nasl - opt/nessus/bin/ndbg - opt/nessus/bin/nessus-mkrand - opt/nessus/lib/nessus/libjemalloc.so.2 - opt/nessus/lib/nessus/libnessus-glibc-fix.so - opt/nessus/sbin/nessus-service - opt/nessus/sbin/nessuscli - opt/nessus/sbin/nessusd" - -S="${WORKDIR}" - -pkg_nofetch() { - einfo "Please download ${A} from ${HOMEPAGE}downloads/nessus" - einfo "The archive should then be placed into your DISTDIR directory." -} - -src_install() { - # Using doins -r would strip executable bits from all binaries - cp -pPR "${S}"/opt "${D}"/ || die "Failed to copy files" - - pax-mark m "${D}"/opt/nessus/sbin/nessusd - - # Make sure these originally empty directories do not vanish, - # Nessus will not run properly without them - keepdir /opt/nessus/com/nessus/CA - keepdir /opt/nessus/etc/nessus - keepdir /opt/nessus/var/nessus/logs - keepdir /opt/nessus/var/nessus/tmp - - newinitd "${FILESDIR}"/nessusd-initd nessusd-bin - systemd_newunit usr/lib/systemd/system/nessusd.service nessusd-bin.service -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "To get started launch the nessusd-bin service, then point your Web browser to" - elog " https://<yourhost>:8834/" - else - elog "You may want to restart the nessusd-bin service to use" - elog "the new version of Nessus." - fi -} diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest index 196eb1052f75..b0d07d45b397 100644 --- a/net-analyzer/net-snmp/Manifest +++ b/net-analyzer/net-snmp/Manifest @@ -1,3 +1,3 @@ DIST net-snmp-5.7.3-patches-3.tar.xz 3176 BLAKE2B 1a71d6743afb841f664c6058e32c7c411af62b0f36acd3bb9251804893ed12f462a0c5bab828e309eeec7824def2dca8fa866350b90a62ec4f0df1141b51ecae SHA512 d8a91b9668320a1e19d062eb86dd4d16beb7c2d15ac7ebbb9d2a4bd298af39bbb0a2613504dbb0057cccdec731f08f2308c5a15395e1fbc29bb0611ed8aca636 -DIST net-snmp-5.8.1.pre1.tar.gz 6630615 BLAKE2B 32ae7177fc08a773928da7f19cd06617feb1358c0dd21d39e08db460fa4267b6353f4afede1f5a500a628235a6a94d95700c84df6e85bda18b7a7a6e7bf3781f SHA512 e1ad421970abb67490a08fa735bbe9ff77a6fc5a19b8bf6942bef80f5b328f8038373cd5995970085177bcfe939dfa309019512b2abce0e8cf779e693f7d6dbd -DIST net-snmp-5.8.tar.gz 6591680 BLAKE2B ac1bff4152310da57818a00d752a08a7fc61d697b02479d9952ca12d024d3d68dc8bfa674571e93d6f3597605b2fe91513fb6839057a80f2c3dd8d0cce0077f2 SHA512 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7 +DIST net-snmp-5.9.3.tar.gz 6646950 BLAKE2B b8e3de60e178ec16ad2848ad77f3bd4cbd35eaa9be103c0fa5d17514c29df4e69015ac53b54c9e565e3032b0c0bb47c19729e65310a6acefae901e101ea49451 SHA512 a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc +DIST net-snmp-5.9.4.tar.gz 6681606 BLAKE2B 2f3dfdc4ce2f4d9a1a771a77e0b0c427a89e3de6dc217009df385baabc7d860ca7714fa76360a4d14521f1b88c9c13ad46b25d3975e33e8bc4bce3eb3b27b99d SHA512 a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423 diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch deleted file mode 100644 index 04eafbbe9c5d..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch +++ /dev/null @@ -1,15 +0,0 @@ -POSIX requires <limits.h> for PATH_MAX and NAME_MAX - -Author: Anthony G. Basile <blueness@gentoo.org> - -diff -Naur net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c ---- net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c 2014-12-08 15:23:22.000000000 -0500 -+++ net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c 2018-02-21 15:34:06.237028136 -0500 -@@ -6,6 +6,7 @@ - - #include <ctype.h> - #include <stdio.h> -+#include <limits.h> - #if HAVE_STDLIB_H - #include <stdlib.h> - #endif diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch deleted file mode 100644 index 72127d053c0a..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-my_bool.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 9f4af8c42d515e6b214738cc97212dfbe7f749cf -Author: Andreas Hasenack <ahasenack2@users.sourceforge.net> -Date: Tue Feb 5 18:21:40 2019 -0800 - - apps/snmptrapd_sql: Fix build against MySQL 8 - - See also https://sourceforge.net/p/net-snmp/bugs/2922/. - - [bvanassche: changed 'int' into 'char'] - -diff --git a/apps/snmptrapd_sql.c b/apps/snmptrapd_sql.c -index 6126ca916..32a3b1799 100644 ---- a/apps/snmptrapd_sql.c -+++ b/apps/snmptrapd_sql.c -@@ -199,7 +199,7 @@ typedef struct sql_buf_t { - * static bind structures, plus 2 static buffers to bind to. - */ - static MYSQL_BIND _tbind[TBIND_MAX], _vbind[VBIND_MAX]; --static my_bool _no_v3; -+static char _no_v3; - - static void _sql_process_queue(u_int dontcare, void *meeither); - diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch b/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch deleted file mode 100644 index 746575a9b7fb..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -611,6 +611,7 @@ - AC_CHECK_HEADERS([curses.h]) - AC_CHECK_HEADERS([ncurses/curses.h]) - NETSNMP_SEARCH_LIBS([endwin], [curses ncurses],,,,[LIBCURSES]) -+NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) - AC_SUBST([LIBCURSES]) - - # libm for ceil diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch new file mode 100644 index 000000000000..94811747d2b4 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.8.1-mysqlclient.patch @@ -0,0 +1,30 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,8 @@ + + AC_MSG_CACHE_INIT() + ++PKG_PROG_PKG_CONFIG ++ + # + # save the configure arguments + # +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -516,6 +516,8 @@ + # mysql + ## + if test "x$with_mysql" = "xyes" ; then ++ PKG_CHECK_MODULES([MYSQL],[mysqlclient],[MYSQL_INCLUDES="$MYSQL_CFLAGS"],) ++ if test -x "$MYSQL_LIBS"; then + AC_PATH_PROGS(MYSQLCONFIG,mysql_config) + test -x "$MYSQLCONFIG" \ + || AC_MSG_ERROR([Could not find mysql_config and was specifically asked to use MySQL support]) +@@ -523,6 +525,7 @@ + MYSQL_INCLUDES=`$MYSQLCONFIG --include` + _libs="${LIBS}" + _cppflags="${CPPFLAGS}" ++ fi + LIBS="${LIBS} ${MYSQL_LIBS}" + CPPFLAGS="${CPPFLAGS} ${MYSQL_INCLUDES}" + AC_CHECK_HEADER(mysql.h,, diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch b/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch deleted file mode 100644 index fd53973c2bec..000000000000 --- a/net-analyzer/net-snmp/files/net-snmp-5.8.1-pkg-config.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/netsnmp-agent.pc.in -+++ b/netsnmp-agent.pc.in -@@ -9,4 +9,4 @@ - 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@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ---- a/netsnmp.pc.in -+++ b/netsnmp.pc.in -@@ -9,4 +9,4 @@ - Version: @PACKAGE_VERSION@ - Cflags: -I${includedir} - Libs: -L${libdir} -lnetsnmp --Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ -+Libs.private: @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch new file mode 100644 index 000000000000..1c6a3fd1eaf3 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9-MakeMaker.patch @@ -0,0 +1,10 @@ +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL +@@ -3,6 +3,7 @@ + use ExtUtils::MakeMaker; + use Config; + require 5; ++use lib '.'; + use MakefileSubs; + + # Prevent that MakeMaker complains about unknown parameter names. diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch new file mode 100644 index 000000000000..785f5ee57d1c --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch @@ -0,0 +1,231 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 1151979ecfba1ef10627175549d052cb76ef9d21 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:26:29 +0000 +Subject: [PATCH 1/4] Fix LDFLAGS vs LIBS ordering + +LDFLAGS must come before both LIBS & any listed objects in order +for certain valid LDFLAGS, like '-Wl,--as-needed' to work correctly +(otherwise it'll either take no effect or discard libraries when +they're needed). + +Gentoo has been carrying this patch for a while. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/Makefile.top ++++ b/Makefile.top +@@ -86,11 +86,11 @@ LIBCURRENT = 40 + LIBAGE = 0 + LIBREVISION = 0 + +-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o ++LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o + LIB_EXTENSION = la + LIB_VERSION = + LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir) +-LINK = $(LIBTOOL) --mode=link $(LINKCC) ++LINK = $(LIBTOOL) --mode=link $(LINKCC) $(LDFLAGS) + # RANLIB = @RANLIB@ + RANLIB = : + +--- a/agent/Makefile.in ++++ b/agent/Makefile.in +@@ -288,26 +288,26 @@ all: agentlib subdirs miblib $(INSTALLBINPROGS) $(INSTALLSBINPROGS) + # build stuff targets + # + getkstat: getkstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getkstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETKSTAT_TEST -DDODEBUG -c $? + + getmibstat: getmibstat.o +- $(CC) $(CFLAGS) -o $@ $? $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $? $(LIBS) + + getmibstat.o: mibgroup/kernel_sunos5.c +- $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? ++ $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? + +-snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) +- $(LINK) $(CFLAGS) -o $@ ${LAGENTOBJS} ${LDFLAGS} ${OUR_AGENT_LIBS} ++snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(HELPERLIB) $(MIBLIB) $(LIBTARG) ++ $(LINK) $(CFLAGS) $(LDFLAGS) -o $@ ${LAGENTOBJS} ${OUR_AGENT_LIBS} + + libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) +- $(LIB_LD_CMD) $(AGENTLIB) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(LDFLAGS) $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(AGENTLIB) $(LDFLAGS) ${LLIBAGENTOBJS} $(USELIBS) ${LAGENTLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(AGENTLIB) + + libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS) subdirs +- $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ ++ $(LIB_LD_CMD) $(MIBLIB) $(LDFLAGS) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) @AGENTLIBS@ + $(RANLIB) $(MIBLIB) + + agentlib: $(AGENTLIB) +--- a/agent/helpers/Makefile.in ++++ b/agent/helpers/Makefile.in +@@ -32,5 +32,5 @@ LOBJS = dummy.lo + all: standardall + + libnetsnmphelpers.$(LIB_EXTENSION)$(LIB_VERSION): $(LOBJS) +- $(LIB_LD_CMD) $@ $(LOBJS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(LOBJS) + $(RANLIB) $@ +--- a/apps/Makefile.in ++++ b/apps/Makefile.in +@@ -163,37 +163,37 @@ OTHERUNINSTALL=snmpinformuninstall snmptrapdperluninstall \ + # build rules + # + snmpwalk$(EXEEXT): snmpwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpwalk.$(OSUFFIX) ${LIBS} + + snmpbulkwalk$(EXEEXT): snmpbulkwalk.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkwalk.$(OSUFFIX) ${LIBS} + + snmpbulkget$(EXEEXT): snmpbulkget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpbulkget.$(OSUFFIX) ${LIBS} + + snmptranslate$(EXEEXT): snmptranslate.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptranslate.$(OSUFFIX) ${LIBS} + + snmpstatus$(EXEEXT): snmpstatus.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpstatus.$(OSUFFIX) ${LIBS} + + snmpget$(EXEEXT): snmpget.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpget.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpget.$(OSUFFIX) ${LIBS} + + snmpdelta$(EXEEXT): snmpdelta.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdelta.$(OSUFFIX) ${LIBS} + + snmptable$(EXEEXT): snmptable.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptable.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptable.$(OSUFFIX) ${LIBS} + + snmptest$(EXEEXT): snmptest.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptest.$(OSUFFIX) ${LIBS} + + snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) +- $(LINK) ${CFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${LDFLAGS} ${TRAPLIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ $(TRAPD_OBJECTS) $(INSTALLLIBS) ${TRAPLIBS} + + snmptrap$(EXEEXT): snmptrap.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptrap.$(OSUFFIX) ${LIBS} + + snmpinform$(EXEEXT): snmptrap$(EXEEXT) + rm -f snmpinform +@@ -204,40 +204,40 @@ snmptop$(EXEEXT): snmpps$(EXEEXT) + $(LN_S) snmpps$(EXEEXT) snmptop$(EXEEXT) + + snmpset$(EXEEXT): snmpset.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpset.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpset.$(OSUFFIX) ${LIBS} + + snmpusm$(EXEEXT): snmpusm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpusm.$(OSUFFIX) ${LIBS} + + snmpvacm$(EXEEXT): snmpvacm.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpvacm.$(OSUFFIX) ${LIBS} + + snmptls$(EXEEXT): snmptls.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmptls.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmptls.$(OSUFFIX) ${LIBS} + + agentxtrap$(EXEEXT): agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ agentxtrap.$(OSUFFIX) ${LDFLAGS} $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ agentxtrap.$(OSUFFIX) $(USEAGENTLIBS) $(PERLLDOPTS_FOR_APPS) ${LIBS} + + snmpgetnext$(EXEEXT): snmpgetnext.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpgetnext.$(OSUFFIX) ${LIBS} + + encode_keychange$(EXEEXT): encode_keychange.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ encode_keychange.$(OSUFFIX) ${LIBS} + + snmpdf$(EXEEXT): snmpdf.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LDFLAGS} ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpdf.$(OSUFFIX) ${LIBS} + + snmpps$(EXEEXT): snmpps.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpps.$(OSUFFIX) ${LDFLAGS} @LIBCURSES@ ${LIBS} ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpps.$(OSUFFIX) @LIBCURSES@ ${LIBS} + + snmpping$(EXEEXT): snmpping.$(OSUFFIX) $(USELIBS) +- $(LINK) ${CFLAGS} -o $@ snmpping.$(OSUFFIX) ${LDFLAGS} ${LIBS} -lm ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmpping.$(OSUFFIX) ${LIBS} -lm + + snmppcap$(EXEEXT): snmppcap.$(OSUFFIX) $(USEAGENTLIBS) +- $(LINK) ${CFLAGS} -o $@ snmppcap.$(OSUFFIX) ${LDFLAGS} ${USEAGENTLIBS} ${LIBS} -lpcap ++ $(LINK) ${CFLAGS} ${LDFLAGS} -o $@ snmppcap.$(OSUFFIX) ${USEAGENTLIBS} ${LIBS} -lpcap + + libnetsnmptrapd.$(LIB_EXTENSION)$(LIB_VERSION): $(LLIBTRAPD_OBJS) +- $(LIB_LD_CMD) $@ ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) $(LDFLAGS) ++ $(LIB_LD_CMD) $@ $(LDFLAGS) ${LLIBTRAPD_OBJS} $(MIBLIB) $(MYSQL_LIBS) $(USELIBS) $(PERLLDOPTS_FOR_LIBS) + $(RANLIB) $@ + + snmpinforminstall: +--- a/apps/snmpnetstat/Makefile.in ++++ b/apps/snmpnetstat/Makefile.in +@@ -34,4 +34,4 @@ LIBS= ../../snmplib/libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION) $(VAL_LIBS) @LIBS + all: standardall + + snmpnetstat$(EXEEXT): ${LOBJS} ${USELIBS} +- ${LINK} ${CFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LDFLAGS} ${LIBS} ++ ${LINK} ${CFLAGS} ${LDFLAGS} -o $@ ${LOBJS} ${LOCAL_LIBS} ${LIBS} +--- a/snmplib/Makefile.in ++++ b/snmplib/Makefile.in +@@ -229,11 +229,11 @@ all: standardall + + # how to build the libraries. + libnetsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + libsnmp.$(LIB_EXTENSION)$(LIB_VERSION): $(TOBJS) +- $(LIB_LD_CMD) $@ $(TOBJS) $(LDFLAGS) @LNETSNMPLIBS@ ++ $(LIB_LD_CMD) $@ $(LDFLAGS) $(TOBJS) @LNETSNMPLIBS@ + $(RANLIB) $@ + + # +--- a/testing/Makefile.in ++++ b/testing/Makefile.in +@@ -64,16 +64,16 @@ test-mibs: + cd $(srcdir)/rfc1213 ; ./run + + etest: etimetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ etimetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ etimetest.o $(PARSEOBJS) ${LIBS} + + ktest: keymanagetest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ keymanagetest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ keymanagetest.o $(PARSEOBJS) ${LIBS} + + misctest: misctest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ misctest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ misctest.o $(PARSEOBJS) ${LIBS} + + stest: scapitest.o $(PARSEOBJS) $(USELIBS) +- ${CC} -o $@ scapitest.o $(PARSEOBJS) ${LDFLAGS} ${LIBS} ++ ${CC} ${LDFLAGS} -o $@ scapitest.o $(PARSEOBJS) ${LIBS} + + clean: testclean + rm -f *.o core *.core $(TARG) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch index 4e3001e1e473..83d05a86f0ac 100644 --- a/net-analyzer/net-snmp/files/net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0002-Tidy-up-net-snmp-config-output.patch @@ -1,6 +1,20 @@ +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 -@@ -190,13 +190,13 @@ +@@ -193,13 +193,13 @@ else #################################################### client lib --libs) # use this one == --netsnmp-libs + --external-libs @@ -16,7 +30,7 @@ ;; #################################################### agent lib --base-agent-libs) -@@ -207,13 +207,13 @@ +@@ -210,13 +210,13 @@ else ;; --agent-libs) # use this one == --netsnmp-agent-libs + --external-libs @@ -32,3 +46,6 @@ ;; #################################################### --version|--ver*) +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch new file mode 100644 index 000000000000..8b825ae8cf5d --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch @@ -0,0 +1,30 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 7261ea344004ac42b6099acfba49c0ea731d049c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:29:45 +0000 +Subject: [PATCH 3/4] Prune Libs.private entries in netsnmp*.pc.in + +Gentoo has been carrying this patch for a while, as has Fedora. + +Bug: https://bugs.gentoo.org/693970 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/netsnmp-agent.pc.in ++++ b/netsnmp-agent.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmpmibs -lnetsnmpagent -lnetsnmp +-Libs.private: @LDFLAGS@ @LMIBLIBS@ @LAGENTLIBS@ @PERLLDOPTS_FOR_APPS@ @LNETSNMPLIBS@ @LIBS@ ++Libs.private: @LMIBLIBS@ @LAGENTLIBS@ @LNETSNMPLIBS@ @LIBS@ +--- a/netsnmp.pc.in ++++ b/netsnmp.pc.in +@@ -9,4 +9,4 @@ URL: http://www.net-snmp.org + Version: @PACKAGE_VERSION@ + Cflags: -I${includedir} + Libs: -L${libdir} -lnetsnmp +-Libs.private: @LDFLAGS@ @LNETSNMPLIBS@ @LIBS@ @PERLLDOPTS_FOR_APPS@ ++Libs.private: @LNETSNMPLIBS@ @LIBS@ +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch new file mode 100644 index 000000000000..c92c88cfbb2f --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch @@ -0,0 +1,24 @@ +https://github.com/net-snmp/net-snmp/pull/493 + +From 6b70bd4ffa7a905700807eecd3e07a472e2eda55 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Fri, 2 Dec 2022 02:31:15 +0000 +Subject: [PATCH 4/4] Search for -ltinfo in configure if needed + +Gentoo has been carrying this patch for a while. + +Bug: https://bugs.gentoo.org/883945 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2 +@@ -774,6 +774,7 @@ NETSNMP_SEARCH_LIBS([endwin], [curses ncurses], [ + [HAVE_LIBCURSES=FALSE],, + [LIBCURSES]) + AC_SUBST([HAVE_LIBCURSES]) ++NETSNMP_SEARCH_LIBS([cbreak], [tinfo],[LIBCURSES="$LIBCURSES -ltinfo"],,,) + AC_SUBST([LIBCURSES]) + + # libm for ceil +-- +2.38.1 + diff --git a/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch b/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch new file mode 100644 index 000000000000..1eb880bb9604 --- /dev/null +++ b/net-analyzer/net-snmp/files/net-snmp-5.9.3-configure-clang16.patch @@ -0,0 +1,160 @@ +https://bugs.gentoo.org/879715 +https://github.com/net-snmp/net-snmp/commit/ddec5fa0ed1c76fde5eea9b974442faeec008526 +https://github.com/net-snmp/net-snmp/commit/fec0f9ee59d5d89c28d70bb35fad29a0013d048c +https://github.com/net-snmp/net-snmp/commit/f362b354ce993d7394bf77db41bb27cfe8d1e307 + +From ddec5fa0ed1c76fde5eea9b974442faeec008526 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:10:09 +0000 +Subject: [PATCH] configure.d: fix compatibility with Clang 16 + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int an error by +default. Unfortunately, this can lead to misconfiguration or miscompilation of +software as configure tests may then return the wrong result. + +We also fix -Wstrict-prototypes while here as it's easy to do and it prepares +us for C23. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki +[2], or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Bug: https://bugs.gentoo.org/879715 +Signed-off-by: Sam James <sam@gentoo.org> +[ bvanassche: removed two header file guards ] +--- a/configure ++++ b/configure +@@ -28483,7 +28483,14 @@ else + #ifdef HAVE_SYS_FS_TYPES_H + #include <sys/fs_types.h> + #endif +-int main () ++#ifdef HAVE_SYS_STATFS_H ++#include <sys/statfs.h> ++#endif ++#ifdef HAVE_SYS_STATVFS_H ++#include <sys/statvfs.h> ++#endif ++ ++int main(void) + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, +@@ -31851,8 +31858,10 @@ else + #if HAVE_SYS_SYSCTL_H + # include <sys/sysctl.h> + #endif ++#include <stddef.h> ++#include <stdlib.h> + +-int main(int argc, char **argv) ++int main(void) + { + int mib[2]; + size_t len; +--- a/configure.d/config_os_functions ++++ b/configure.d/config_os_functions +@@ -216,7 +216,14 @@ AC_CACHE_VAL( + #ifdef HAVE_SYS_FS_TYPES_H + #include <sys/fs_types.h> + #endif +-int main () ++#ifdef HAVE_SYS_STATFS_H ++#include <sys/statfs.h> ++#endif ++#ifdef HAVE_SYS_STATVFS_H ++#include <sys/statvfs.h> ++#endif ++ ++int main(void) + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, +--- a/configure.d/config_os_misc4 ++++ b/configure.d/config_os_misc4 +@@ -185,8 +185,10 @@ else + #if HAVE_SYS_SYSCTL_H + # include <sys/sysctl.h> + #endif ++#include <stddef.h> ++#include <stdlib.h> + +-int main(int argc, char **argv) ++int main(void) + { + int mib[2]; + size_t len; + +From fec0f9ee59d5d89c28d70bb35fad29a0013d048c Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:13:55 +0000 +Subject: [PATCH] agent/mibgroup: fix -Wstrict-prototypes + +Clang 16 warns on this. Fix it in preparation for C23. + +Signed-off-by: Sam James <sam@gentoo.org> +[ bvanassche: minor formatting changes ] +--- a/agent/mibgroup/agentx/protocol.c ++++ b/agent/mibgroup/agentx/protocol.c +@@ -1895,7 +1895,7 @@ agentx_parse(netsnmp_session * session, netsnmp_pdu *pdu, u_char * data, + + #ifdef TESTING + +-testit(netsnmp_pdu *pdu1) ++void testit(netsnmp_pdu *pdu1) + { + char packet1[BUFSIZ]; + char packet2[BUFSIZ]; +@@ -1964,7 +1964,7 @@ testit(netsnmp_pdu *pdu1) + + + +-main() ++int main(void) + { + netsnmp_pdu pdu1; + oid oid_buf[] = { 1, 3, 6, 1, 2, 1, 10 }; +--- a/agent/mibgroup/header_complex.c ++++ b/agent/mibgroup/header_complex.c +@@ -569,7 +569,7 @@ header_complex_dump(struct header_complex_index *thestuff) + } + } + +-main() ++int main(void) + { + oid oidsave[MAX_OID_LEN]; + int len = MAX_OID_LEN, len2; + +From f362b354ce993d7394bf77db41bb27cfe8d1e307 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 17 Nov 2022 00:20:04 +0000 +Subject: [PATCH] agent: fix -Wincompatible-function-pointer-types + +Clang 16 makes -Wincompatible-function-pointer-types an error by default. + +Fixes the following error: +``` +mibgroup/if-mib/data_access/interface_linux.c:159:23: error: incompatible function pointer types assigning to 'void (*)(char *, ...) __attribute__((noreturn))' from 'void (char *, ...)' [-Wincompatible-function-pointer-types] + pci_access->error = netsnmp_pci_error; + ^ ~~~~~~~~~~~~~~~~~ +1 error generated. +``` + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/agent/mibgroup/if-mib/data_access/interface_linux.c ++++ b/agent/mibgroup/if-mib/data_access/interface_linux.c +@@ -31,7 +31,7 @@ static struct pci_access *pci_access; + /* Avoid letting libpci call exit(1) when no PCI bus is available. */ + static int do_longjmp =0; + static jmp_buf err_buf; +-static void ++PCI_NONRET static void + netsnmp_pci_error(char *msg, ...) + { + va_list args; + diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml index f3f6819a5361..94bf5790a1bf 100644 --- a/net-analyzer/net-snmp/metadata.xml +++ b/net-analyzer/net-snmp/metadata.xml @@ -1,22 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="elf">Enable the use of elf utils to check uptime on some systems</flag> -<flag name="kmem">Enable usage of /dev/kmem</flag> -<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag> -<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag> -<flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag> -<flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag> -<flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag> -<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag> -<flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag> -</use> -<upstream> -<remote-id type="sourceforge">net-snmp</remote-id> -</upstream> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="elf">Enable the use of elf utils to check uptime on some systems</flag> + <flag name="kmem">Enable usage of /dev/kmem</flag> + <flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag> + <flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to fetch TCP statistics instead of using /proc/net/tcp (Linux only).</flag> + <flag name="pcap">Install snmppcap which reads from PCAP files and writes to the SNMP transport</flag> + <flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag> + <flag name="pcre">Add support for Perl Compatible Regular Expressions in process table filtering.</flag> + <flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag> + <flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag> + <flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag> + </use> + <upstream> + <remote-id type="github">net-snmp/net-snmp</remote-id> + <remote-id type="sourceforge">net-snmp</remote-id> + <remote-id type="cpe">cpe:/a:net-snmp:net-snmp</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild deleted file mode 100644 index 5ffc1455c318..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.8-r3.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils ltprune perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0/35" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86" -IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" - -COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - elf? ( dev-libs/elfutils ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm-sensors? ( sys-apps/lm-sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( dev-db/mysql-connector-c:0= ) - perl? ( dev-lang/perl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" -S=${WORKDIR}/${P/_p*/} - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch - - mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die - mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die - eapply "${WORKDIR}"/patches/*.patch - - eapply_user - - eautoconf -} - -src_configure() { - # keep this in the same line, configure.ac arguments are passed down to config.h - local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" - use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" - use smux && mibs="${mibs} smux" - - # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) - use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab - - econf \ - $(use_enable !ssl internal-md5) \ - $(use_enable ipv6) \ - $(use_enable mfd-rewrites) \ - $(use_enable perl embedded-perl) \ - $(use_enable ucd-compat ucd-snmp-compatibility) \ - $(use_with bzip2) \ - $(use_with elf) \ - $(use_with kmem kmem-usage) \ - $(use_with mysql) \ - $(use_with netlink nl) \ - $(use_with pci) \ - $(use_with perl perl-modules INSTALLDIRS=vendor) \ - $(use_with python python-modules) \ - $(use_with rpm) \ - $(use_with ssl openssl) \ - $(use_with tcpd libwrap) \ - $(use_with zlib) \ - --enable-shared --disable-static \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --with-ldflags="${LDFLAGS}" \ - --with-logfile="/var/log/net-snmpd.log" \ - --with-mib-modules="${mibs}" \ - --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ - --with-sys-location="Unknown" -} - -src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} - done - - use doc && emake docsdox -} - -src_install () { - # bug #317965 - emake -j1 DESTDIR="${D}" install - - if use perl ; then - perl_delete_localpod - if ! use X; then - rm "${D}"/usr/bin/tkmib || die - fi - else - rm -f \ - "${D}"/usr/bin/fixproc \ - "${D}"/usr/bin/ipf-mod.pl \ - "${D}"/usr/bin/mib2c \ - "${D}"/usr/bin/net-snmp-cert \ - "${D}"/usr/bin/snmp-bridge-mib \ - "${D}"/usr/bin/snmpcheck \ - "${D}"/usr/bin/snmpconf \ - "${D}"/usr/bin/tkmib \ - "${D}"/usr/bin/traptoemail \ - "${D}"/usr/share/snmp/mib2c.perl.conf \ - "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ - || die - fi - - dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO - newdoc EXAMPLE.conf.def EXAMPLE.conf - - if use doc; then - docinto html - dodoc -r docs/html/* - fi - - keepdir /var/lib/net-snmp - - newinitd "${FILESDIR}"/snmpd.init.2 snmpd - newconfd "${FILESDIR}"/snmpd.conf snmpd - - newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd - newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd - - systemd_dounit "${FILESDIR}"/snmpd.service - systemd_dounit "${FILESDIR}"/snmptrapd.service - - insinto /etc/snmp - newins "${S}"/EXAMPLE.conf snmpd.conf.example - - # Remove everything not required for an agent. - # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. - if use minimal; then - rm -rf \ - "${D}"/**/*.pl \ - "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ - "${D}"/usr/share/snmp/*.conf \ - "${D}"/usr/share/snmp/snmpconf-data \ - || die - fi - - prune_libtool_files -} diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild b/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild deleted file mode 100644 index af24fa8d5e87..000000000000 --- a/net-analyzer/net-snmp/net-snmp-5.8-r4.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 -GENTOO_DEPEND_ON_PERL=no - -inherit autotools distutils-r1 eutils ltprune perl-module systemd - -DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" - -S=${WORKDIR}/${P/_/.} - -# GPL-2 for the init scripts -LICENSE="HPND BSD GPL-2" -SLOT="0/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql netlink pci perl python rpm selinux smux ssl tcpd ucd-compat zlib" - -COMMON_DEPEND=" - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) - ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - rpm? ( - app-arch/rpm - dev-libs/popt - ) - bzip2? ( app-arch/bzip2 ) - zlib? ( >=sys-libs/zlib-1.1.4 ) - elf? ( dev-libs/elfutils ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) - pci? ( sys-apps/pciutils ) - lm-sensors? ( sys-apps/lm-sensors ) - netlink? ( dev-libs/libnl:3 ) - mysql? ( dev-db/mysql-connector-c:0= ) - perl? ( dev-lang/perl:= ) -" -DEPEND=" - ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) -" -RDEPEND=" - ${COMMON_DEPEND} - perl? ( - X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) - ) - selinux? ( sec-policy/selinux-snmp ) -" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" -S=${WORKDIR}/${P/_p*/} - -RESTRICT=test - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # snmpconf generates config files with proper selinux context - use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - - eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch - eapply "${FILESDIR}"/${PN}-5.8-tinfo.patch - - mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die - mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die - eapply "${WORKDIR}"/patches/*.patch - - eapply_user - - eautoconf -} - -src_configure() { - # keep this in the same line, configure.ac arguments are passed down to config.h - local mibs="host ucd-snmp/dlmod ucd-snmp/diskio ucd-snmp/extensible mibII/mta_sendmail etherlike-mib/dot3StatsTable" - use lm-sensors && mibs="${mibs} ucd-snmp/lmsensorsMib" - use smux && mibs="${mibs} smux" - - # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) - use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab - - econf \ - $(use_enable !ssl internal-md5) \ - $(use_enable ipv6) \ - $(use_enable mfd-rewrites) \ - $(use_enable perl embedded-perl) \ - $(use_enable ucd-compat ucd-snmp-compatibility) \ - $(use_with bzip2) \ - $(use_with elf) \ - $(use_with kmem kmem-usage) \ - $(use_with mysql) \ - $(use_with netlink nl) \ - $(use_with pci) \ - $(use_with perl perl-modules INSTALLDIRS=vendor) \ - $(use_with python python-modules) \ - $(use_with rpm) \ - $(use_with ssl openssl) \ - $(use_with tcpd libwrap) \ - $(use_with zlib) \ - --enable-shared --disable-static \ - --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ - --with-ldflags="${LDFLAGS}" \ - --with-logfile="/var/log/net-snmpd.log" \ - --with-mib-modules="${mibs}" \ - --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ - --with-sys-location="Unknown" -} - -src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} - done - - use doc && emake docsdox -} - -src_install () { - # bug #317965 - emake -j1 DESTDIR="${D}" install - - if use perl ; then - perl_delete_localpod - if ! use X; then - rm "${D}"/usr/bin/tkmib || die - fi - else - rm -f \ - "${D}"/usr/bin/fixproc \ - "${D}"/usr/bin/ipf-mod.pl \ - "${D}"/usr/bin/mib2c \ - "${D}"/usr/bin/net-snmp-cert \ - "${D}"/usr/bin/snmp-bridge-mib \ - "${D}"/usr/bin/snmpcheck \ - "${D}"/usr/bin/snmpconf \ - "${D}"/usr/bin/tkmib \ - "${D}"/usr/bin/traptoemail \ - "${D}"/usr/share/snmp/mib2c.perl.conf \ - "${D}"/usr/share/snmp/snmp_perl_trapd.pl \ - || die - fi - - dodoc AGENT.txt ChangeLog FAQ INSTALL NEWS PORTING README* TODO - newdoc EXAMPLE.conf.def EXAMPLE.conf - - if use doc; then - docinto html - dodoc -r docs/html/* - fi - - keepdir /var/lib/net-snmp - - newinitd "${FILESDIR}"/snmpd.init.2 snmpd - newconfd "${FILESDIR}"/snmpd.conf snmpd - - newinitd "${FILESDIR}"/snmptrapd.init.2 snmptrapd - newconfd "${FILESDIR}"/snmptrapd.conf snmptrapd - - systemd_dounit "${FILESDIR}"/snmpd.service - systemd_dounit "${FILESDIR}"/snmptrapd.service - - insinto /etc/snmp - newins "${S}"/EXAMPLE.conf snmpd.conf.example - - # Remove everything not required for an agent. - # Keep only the snmpd, snmptrapd, MIBs, headers and libraries. - if use minimal; then - rm -rf \ - "${D}"/**/*.pl \ - "${D}"/usr/bin/{encode_keychange,snmp{get,getnext,set,usm,walk,bulkwalk,table,trap,bulkget,translate,status,delta,test,df,vacm,netstat,inform,check,conf},fixproc,traptoemail} \ - "${D}"/usr/share/snmp/*.conf \ - "${D}"/usr/share/snmp/snmpconf-data \ - || die - fi - - prune_libtool_files -} diff --git a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild index 53090888876c..cbf3ea5020b3 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8-r5.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.3-r3.ebuild @@ -1,35 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{10..11} ) +WANT_AUTOMAKE=none -inherit autotools distutils-r1 eutils ltprune perl-module systemd +inherit autotools distutils-r1 libtool perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}/${P/_p*/}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" +HOMEPAGE="https://www.net-snmp.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +fi -S=${WORKDIR}/${P/_/.} +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/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +SLOT="0/40" IUSE=" - X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql - netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib " +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + rpm? ( bzip2 zlib ) +" +RESTRICT="test" COMMON_DEPEND=" + virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) @@ -37,10 +47,11 @@ COMMON_DEPEND=" netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) + pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} ) @@ -49,54 +60,69 @@ COMMON_DEPEND=" dev-libs/popt ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) " +BDEPEND="doc? ( app-text/doxygen )" DEPEND=" ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) + valgrind? ( dev-debug/valgrind ) " RDEPEND=" ${COMMON_DEPEND} perl? ( X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) ) selinux? ( sec-policy/selinux-snmp ) " -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - rpm? ( bzip2 zlib ) -" -S=${WORKDIR}/${P/_p*/} - -RESTRICT=test +PATCHES=( + "${FILESDIR}"/${PN}-5.8-pcap.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch + "${FILESDIR}"/${P}-configure-clang16.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch +) pkg_setup() { use python && python-single-r1_pkg_setup } +src_unpack() { + default + + [[ ${PV} == 9999 ]] && git-r3_src_unpack +} + src_prepare() { # snmpconf generates config files with proper selinux context use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch - eapply "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - eapply "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch - eapply "${FILESDIR}"/${PN}-5.8-my_bool.patch - eapply "${FILESDIR}"/${PN}-5.8-pcap.patch - eapply "${FILESDIR}"/${PN}-5.8-tinfo.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 - eapply_user + default eautoconf + elibtoolize } src_configure() { @@ -108,6 +134,8 @@ src_configure() { # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind) + econf \ $(use_enable !ssl internal-md5) \ $(use_enable ipv6) \ @@ -121,32 +149,35 @@ src_configure() { $(use_with netlink nl) \ $(use_with pcap) \ $(use_with pci) \ + $(use_with pcre) \ $(use_with perl perl-modules INSTALLDIRS=vendor) \ $(use_with python python-modules) \ $(use_with rpm) \ $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --enable-shared --disable-static \ + --enable-shared \ --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ --with-ldflags="${LDFLAGS}" \ --with-logfile="/var/log/net-snmpd.log" \ --with-mib-modules="${mibs}" \ --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ + --with-sys-contact="root@unknown" \ --with-sys-location="Unknown" } src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all done use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install @@ -206,5 +237,5 @@ src_install () { || die fi - prune_libtool_files + find "${ED}" -name '*.la' -delete || die } diff --git a/net-analyzer/net-snmp/net-snmp-99999999.ebuild b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild index 12ca0cc534b3..fe0ff528541d 100644 --- a/net-analyzer/net-snmp/net-snmp-99999999.ebuild +++ b/net-analyzer/net-snmp/net-snmp-5.9.4.ebuild @@ -1,37 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{10..11} ) +WANT_AUTOMAKE=none -inherit autotools distutils-r1 git-r3 perl-module systemd +inherit autotools distutils-r1 libtool perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" +HOMEPAGE="https://www.net-snmp.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +SRC_URI+=" https://dev.gentoo.org/~jsmolic/distfiles/${PN}-5.7.3-patches-3.tar.xz" # GPL-2 for the init scripts LICENSE="HPND BSD GPL-2" -SLOT="0/35" -KEYWORDS="" +SLOT="0/40" IUSE=" - X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql - netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib " REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) rpm? ( bzip2 zlib ) " +RESTRICT="test" COMMON_DEPEND=" + virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) @@ -39,10 +47,11 @@ COMMON_DEPEND=" netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) + pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl:= ) python? ( $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} ) @@ -51,33 +60,42 @@ COMMON_DEPEND=" dev-libs/popt ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) " +BDEPEND="doc? ( app-text/doxygen )" DEPEND=" ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) + valgrind? ( dev-debug/valgrind ) " RDEPEND=" ${COMMON_DEPEND} perl? ( X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) ) selinux? ( sec-policy/selinux-snmp ) " -S=${WORKDIR}/${P/_/.} -S=${WORKDIR}/${P/_p*/} -RESTRICT=test + PATCHES=( - "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch "${FILESDIR}"/${PN}-5.8-pcap.patch - "${FILESDIR}"/${PN}-5.8-tinfo.patch - "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch + # https://github.com/net-snmp/net-snmp/pull/493 + "${FILESDIR}"/${PN}-5.9.3-0001-Fix-LDFLAGS-vs-LIBS-ordering.patch + "${FILESDIR}"/${PN}-5.9.3-0002-Tidy-up-net-snmp-config-output.patch + "${FILESDIR}"/${PN}-5.9.3-0003-Prune-Libs.private-entries-in-netsnmp-.pc.in.patch + "${FILESDIR}"/${PN}-5.9.3-0004-Search-for-ltinfo-in-configure-if-needed.patch ) pkg_setup() { @@ -86,20 +104,24 @@ pkg_setup() { src_unpack() { default - git-r3_src_unpack + + [[ ${PV} == 9999 ]] && git-r3_src_unpack } src_prepare() { # snmpconf generates config files with proper selinux context use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die eapply "${WORKDIR}"/patches/*.patch default eautoconf + elibtoolize } src_configure() { @@ -111,6 +133,8 @@ src_configure() { # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind) + econf \ $(use_enable !ssl internal-md5) \ $(use_enable ipv6) \ @@ -124,32 +148,35 @@ src_configure() { $(use_with netlink nl) \ $(use_with pcap) \ $(use_with pci) \ + $(use_with pcre) \ $(use_with perl perl-modules INSTALLDIRS=vendor) \ $(use_with python python-modules) \ $(use_with rpm) \ $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --enable-shared --disable-static \ + --enable-shared \ --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ --with-ldflags="${LDFLAGS}" \ --with-logfile="/var/log/net-snmpd.log" \ --with-mib-modules="${mibs}" \ --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ + --with-sys-contact="root@unknown" \ --with-sys-location="Unknown" } src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all done use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild b/net-analyzer/net-snmp/net-snmp-9999.ebuild index d853e1f035cd..cb2b73cf9956 100644 --- a/net-analyzer/net-snmp/net-snmp-5.8.1_pre1-r1.ebuild +++ b/net-analyzer/net-snmp/net-snmp-9999.ebuild @@ -1,39 +1,45 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -DISTUTILS_SINGLE_IMPL=yesplz -DISTUTILS_OPTIONAL=yesplz -WANT_AUTOMAKE=none -PATCHSET=3 +EAPI=8 + +DISTUTILS_OPTIONAL=yes +DISTUTILS_SINGLE_IMPL=yes GENTOO_DEPEND_ON_PERL=no +PYTHON_COMPAT=( python3_{10..11} ) +WANT_AUTOMAKE=none inherit autotools distutils-r1 perl-module systemd DESCRIPTION="Software for generating and retrieving SNMP data" -HOMEPAGE="http://www.net-snmp.org/" -SRC_URI=" - mirror://sourceforge/project/${PN}/${PN}/${PV/_p*/}-pre-releases/${P/_pre/.pre}.tar.gz - https://dev.gentoo.org/~jer/${PN}-5.7.3-patches-3.tar.xz -" +HOMEPAGE="https://www.net-snmp.org/" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/net-snmp/net-snmp" + inherit git-r3 +else + # https://github.com/net-snmp/net-snmp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.gz" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi -S=${WORKDIR}/${P/_/.} +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/35" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +SLOT="0/40" IUSE=" - X bzip2 doc elf kmem ipv6 libressl lm-sensors mfd-rewrites minimal mysql - netlink pcap pci perl python rpm selinux smux ssl tcpd ucd-compat zlib + X bzip2 doc elf kmem ipv6 lm-sensors mfd-rewrites minimal mysql + netlink pcap pci pcre perl python rpm selinux smux ssl tcpd ucd-compat valgrind zlib " REQUIRED_USE=" python? ( ${PYTHON_REQUIRED_USE} ) rpm? ( bzip2 zlib ) " +RESTRICT="test" COMMON_DEPEND=" + virtual/libcrypt:= bzip2? ( app-arch/bzip2 ) elf? ( dev-libs/elfutils ) lm-sensors? ( sys-apps/lm-sensors ) @@ -41,10 +47,11 @@ COMMON_DEPEND=" netlink? ( dev-libs/libnl:3 ) pcap? ( net-libs/libpcap ) pci? ( sys-apps/pciutils ) + pcre? ( dev-libs/libpcre2 ) perl? ( dev-lang/perl:= ) python? ( $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_MULTI_USEDEP}] + dev-python/setuptools[${PYTHON_USEDEP}] ') ${PYTHON_DEPS} ) @@ -53,44 +60,57 @@ COMMON_DEPEND=" dev-libs/popt ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6d:0= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-0.9.6d:0= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) zlib? ( >=sys-libs/zlib-1.1.4 ) " +BDEPEND="doc? ( app-text/doxygen )" DEPEND=" ${COMMON_DEPEND} - doc? ( app-doc/doxygen ) + valgrind? ( dev-debug/valgrind ) " RDEPEND=" ${COMMON_DEPEND} perl? ( X? ( dev-perl/Tk ) - !minimal? ( dev-perl/TermReadKey ) + !minimal? ( + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Getopt-Long + dev-perl/JSON + dev-perl/Mail-Sender + dev-perl/TermReadKey + virtual/perl-Term-ReadLine + ) ) selinux? ( sec-policy/selinux-snmp ) " -S=${WORKDIR}/${P/_pre/.pre} -RESTRICT=test + PATCHES=( - "${FILESDIR}"/${PN}-5.7.3-include-limits.patch - "${FILESDIR}"/${PN}-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch "${FILESDIR}"/${PN}-5.8-pcap.patch - "${FILESDIR}"/${PN}-5.8-tinfo.patch - "${FILESDIR}"/${PN}-5.8.1-pkg-config.patch + "${FILESDIR}"/${PN}-5.8.1-mysqlclient.patch + "${FILESDIR}"/${PN}-5.9-MakeMaker.patch ) pkg_setup() { use python && python-single-r1_pkg_setup } +src_unpack() { + default + + [[ ${PV} == 9999 ]] && git-r3_src_unpack +} + src_prepare() { # snmpconf generates config files with proper selinux context use selinux && eapply "${FILESDIR}"/${PN}-5.1.2-snmpconf-selinux.patch + mv "${WORKDIR}"/patches/0001-Fix-toolchain-quadruplet-detection-Gentoo-bug-432004.patch{,.disabled} || die mv "${WORKDIR}"/patches/0002-Respect-DESTDIR-for-pythoninstall.patch{,.disabled} || die mv "${WORKDIR}"/patches/0004-Don-t-report-CFLAGS-and-LDFLAGS-in-net-snmp-config.patch{,.disabled} || die + mv "${WORKDIR}"/patches/0005-Respect-LDFLAGS-properly.patch{,.disabled} || die eapply "${WORKDIR}"/patches/*.patch default @@ -107,6 +127,8 @@ src_configure() { # Assume /etc/mtab is not present with a recent baselayout/openrc (bug #565136) use kernel_linux && export ac_cv_ETC_MNTTAB=/etc/mtab + export ac_cv_header_valgrind_{valgrind,memcheck}_h=$(usex valgrind) + econf \ $(use_enable !ssl internal-md5) \ $(use_enable ipv6) \ @@ -120,32 +142,36 @@ src_configure() { $(use_with netlink nl) \ $(use_with pcap) \ $(use_with pci) \ + $(use_with pcre pcre2-8) \ + --without-pcre \ $(use_with perl perl-modules INSTALLDIRS=vendor) \ $(use_with python python-modules) \ $(use_with rpm) \ $(use_with ssl openssl) \ $(use_with tcpd libwrap) \ $(use_with zlib) \ - --enable-shared --disable-static \ + --enable-shared \ --with-default-snmp-version="3" \ - --with-install-prefix="${D}" \ --with-ldflags="${LDFLAGS}" \ --with-logfile="/var/log/net-snmpd.log" \ --with-mib-modules="${mibs}" \ --with-persistent-directory="/var/lib/net-snmp" \ - --with-sys-contact="root@Unknown" \ + --with-sys-contact="root@unknown" \ --with-sys-location="Unknown" } src_compile() { - for target in snmplib agent sedscript all; do - emake OTHERLDFLAGS="${LDFLAGS}" ${target} + emake sedscript + + local subdir + for subdir in snmplib agent/mibgroup agent apps .; do + emake OTHERLDFLAGS="${LDFLAGS}" -C ${subdir} all done use doc && emake docsdox } -src_install () { +src_install() { # bug #317965 emake -j1 DESTDIR="${D}" install diff --git a/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch new file mode 100644 index 000000000000..36fda8614eef --- /dev/null +++ b/net-analyzer/netcat/files/netcat-110.20180111-variadic-holler.patch @@ -0,0 +1,88 @@ +Subject: [PATCH] Convert holler and bail to variadic function + +Both functions usually consume different types than char * which is +problematic for some compliers like clang-16 where -Werror=implicit-int +is enabled by default. + +The fix is done in such a way that original holler function is converted +to vholer which uses va_list from stdarg.h and holler and bail are +converted to variadic functions that utilize vholler for printing. + +Bug: https://bugs.gentoo.org/871003 + +diff --git a/netcat.c b/netcat.c +index 992c42b..b4d6fd8 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -80,6 +80,7 @@ + #include <signal.h> + #include <fcntl.h> /* O_WRONLY et al */ + #include <unistd.h> ++#include <stdarg.h> + + /* handy stuff: */ + #define SA struct sockaddr /* socket overgeneralization braindeath */ +@@ -215,23 +216,18 @@ int o_quit = -1; /* 0 == quit-now; >0 == quit after o_quit seconds */ + /* support routines -- the bulk of this thing. Placed in such an order that + we don't have to forward-declare anything: */ + +-/* holler : +- fake varargs -- need to do this way because we wind up calling through +- more levels of indirection than vanilla varargs can handle, and not all +- machines have vfprintf/vsyslog/whatever! 6 params oughta be enough. */ +-void holler (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++/* vholler : */ ++void vholler(const char * str, va_list ap) + { + FILE *o_holler_out = (o_holler_stderr ? stderr : stdout); + if (o_verbose) { +- fprintf (o_holler_out, str, p1, p2, p3, p4, p5, p6); ++ vfprintf (o_holler_out, str, ap); + #ifdef HAVE_BIND + if (h_errno) { /* if host-lookup variety of error ... */ + if (h_errno > 4) /* oh no you don't, either */ + fprintf (o_holler_out, "preposterous h_errno: %d", h_errno); + else +- fprintf (o_holler_out, h_errs[h_errno]); /* handle it here */ ++ fputs (h_errs[h_errno], o_holler_out); /* handle it here */ + h_errno = 0; /* and reset for next call */ + } + #endif +@@ -241,16 +237,27 @@ void holler (str, p1, p2, p3, p4, p5, p6) + fprintf (o_holler_out, "\n"); + fflush (o_holler_out); + } +-} /* holler */ ++} /* vholler */ ++ ++void holler(const char * fmt, ...) ++{ ++ va_list ap; ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++} + + /* bail : + error-exit handler, callable from anywhere */ +-void bail (str, p1, p2, p3, p4, p5, p6) +- char * str; +- char * p1, * p2, * p3, * p4, * p5, * p6; ++void bail (const char * fmt, ...) + { + o_verbose = 1; +- holler (str, p1, p2, p3, p4, p5, p6); ++ va_list ap; ++ ++ va_start(ap, fmt); ++ vholler(fmt, ap); ++ va_end(ap); ++ + close (netfd); + exit (1); + } /* bail */ +-- +2.35.1 + diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml index 28817802168b..b2bd15c6d936 100644 --- a/net-analyzer/netcat/metadata.xml +++ b/net-analyzer/netcat/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>the network swiss army knife</longdescription> <upstream> <remote-id type="sourceforge">nc110</remote-id> + <remote-id type="cpe">cpe:/a:netcat_project:netcat</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild index f2efeefc7fb3..a187e5c2af2d 100644 --- a/net-analyzer/netcat/netcat-110-r9.ebuild +++ b/net-analyzer/netcat/netcat-110-r9.ebuild @@ -1,45 +1,67 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs PATCH_VER="1.0" MY_P=nc${PV} -DESCRIPTION="the network swiss army knife" -HOMEPAGE="http://nc110.sourceforge.net/" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz +DESCRIPTION="The network swiss army knife" +HOMEPAGE="https://nc110.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/nc110/${MY_P}.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz - mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2" + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 +" +S="${WORKDIR}" LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="crypt ipv6 static" LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" - -S=${WORKDIR} +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" src_prepare() { - epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch + default + + eapply "${WORKDIR}"/nc-v6-20000918.patch + sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c - sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250 - [[ ${CHOST} == *-solaris* ]] && \ - sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c + # bug 34250 + sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die + fi } src_compile() { export XLIBS="" export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE" - use ipv6 && XFLAGS="${XFLAGS} -DINET6" - use static && export STATIC="-static" - use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix" - [[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket" + + if use ipv6 ; then + XFLAGS+=" -DINET6" + fi + + if use static ; then + export STATIC="-static" + fi + + if use crypt ; then + XFLAGS+=" -DAESCRYPT" + XLIBS+=" -lmix" + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + XLIBS+=" -lnsl -lsocket" + fi + emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc } diff --git a/net-analyzer/netcat/netcat-110.20180111.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild index df0524891b05..5c9f5c13fe21 100644 --- a/net-analyzer/netcat/netcat-110.20180111.ebuild +++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild @@ -1,39 +1,47 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=7 inherit toolchain-funcs flag-o-matic MY_P="nc${PV}" -DESCRIPTION="the network swiss army knife" -HOMEPAGE="http://nc110.sourceforge.net/" -SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz" +DESCRIPTION="The network swiss army knife" +HOMEPAGE="https://nc110.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/nc110/${MY_P}.tar.xz" +S="${WORKDIR}/nc110" LICENSE="netcat" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" IUSE="ipv6 static" -S=${WORKDIR}/nc110 - src_prepare() { + default + sed -i \ -e '/#define HAVE_BIND/s:#define:#undef:' \ -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ netcat.c || die - [[ ${CHOST} == *-solaris* ]] && \ - sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die + fi } src_configure() { - use ipv6 || sed -i '/#define INET6/d' generic.h + 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}" \ @@ -45,8 +53,10 @@ src_compile() { src_install() { dobin nc + dodoc README* netcat.blurb doman nc.1 + docinto scripts dodoc scripts/* } diff --git a/net-analyzer/netcat/netcat-110.20180111-r2.ebuild b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild new file mode 100644 index 000000000000..0137cdf2140a --- /dev/null +++ b/net-analyzer/netcat/netcat-110.20180111-r2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 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="https://downloads.sourceforge.net/nc110/${MY_P}.tar.xz" +S="${WORKDIR}/nc110" + +LICENSE="netcat" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +IUSE="ipv6 static" + +PATCHES=( + "${FILESDIR}/${P}-variadic-holler.patch" +) + +src_prepare() { + default + + sed -i \ + -e '/#define HAVE_BIND/s:#define:#undef:' \ + -e '/#define FD_SETSIZE 16/s:16:1024: #34250' \ + netcat.c || die + + if [[ ${CHOST} == *-solaris* ]] ; then + sed -i 's:gethostbyname2 *(\([^)]\+\)):getipnodebyname (\1, AI_DEFAULT, NULL):' netcat.c || die + fi +} + +src_configure() { + if ! use ipv6 ; then + sed -i '/#define INET6/d' generic.h || die + fi + + append-cppflags -DTELNET -DGAPING_SECURITY_HOLE +} + +src_compile() { + local xlibs + + [[ ${CHOST} == *-solaris* ]] && xlibs+=" -lnsl -lsocket" + + emake \ + LD="$(tc-getCC) ${LDFLAGS}" \ + DFLAGS="${CPPFLAGS}" \ + XFLAGS="${CFLAGS}" \ + STATIC=$(usex static '-static' '') \ + XLIBS="${xlibs}" \ + nc +} + +src_install() { + dobin nc + + dodoc README* netcat.blurb + doman nc.1 + + docinto scripts + dodoc scripts/* +} diff --git a/net-analyzer/netdata-go-plugin/Manifest b/net-analyzer/netdata-go-plugin/Manifest new file mode 100644 index 000000000000..a04419a89f6c --- /dev/null +++ b/net-analyzer/netdata-go-plugin/Manifest @@ -0,0 +1,2 @@ +DIST go.d.plugin-0.58.1-vendor.tar.gz 11165963 BLAKE2B 43b74ae6120806ee02b9d1d9247cd7b5bb752ebbcb21e2bd5427cad186e0facc5f04cc4484c39994d7a5727ca673610ebaa6dd01d9dd8335e7d0ad39721fe2bc SHA512 23134669204c9c68247077ec12f8789db39736158867587fb24006c2cebd9f1752553a786cc91b97f2ba8b73197987b19dbf69e4669a0f821eb1fb04db0f5034 +DIST go.d.plugin-0.58.1.tar.gz 1601702 BLAKE2B d87402542fdac8683dc8a505634f6ce1eb2ebddeedeee6664d250b8774b8d1a76c189020362b1b87477bf21faf9caff28f41e396032d7548d0ec16ad8b5742e0 SHA512 acbfd7ee4a72cee0587936bd2d4e27a2b58894ee72a2218b96643c1fe0866990f9d6bfe1f754cda5f5443bc75e1406a6511300ea265a81e4be89f7f97b17664c diff --git a/net-analyzer/netdata-go-plugin/metadata.xml b/net-analyzer/netdata-go-plugin/metadata.xml new file mode 100644 index 000000000000..282de65d53a2 --- /dev/null +++ b/net-analyzer/netdata-go-plugin/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>arkamar@gentoo.org</email> + <name>Petr VanÄ›k</name> + </maintainer> + <upstream> + <remote-id type="github">netdata/go.d.plugin</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild new file mode 100644 index 000000000000..70f99d0fda15 --- /dev/null +++ b/net-analyzer/netdata-go-plugin/netdata-go-plugin-0.58.1.ebuild @@ -0,0 +1,51 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps go-module + +MY_PN=go.d.plugin +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Netdata plugin for collectors written in Go" +HOMEPAGE="https://github.com/netdata/go.d.plugin" +SRC_URI=" + https://github.com/netdata/go.d.plugin/archive/refs/tags/v${PV}.tar.gz + -> ${MY_P}.tar.gz + https://github.com/netdata/go.d.plugin/releases/download/v${PV}/${MY_PN}-vendor-v${PV}.tar.gz + -> ${MY_P}-vendor.tar.gz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +# Dependent modules licenses +LICENSE+=" + Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 +" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND="net-analyzer/netdata" +BDEPEND=">=dev-lang/go-1.21" + +FILECAPS=( + cap_net_raw /usr/libexec/netdata/plugins.d/go.d.plugin +) + +src_compile() { + LDFLAGS="-w -s -X main.version=${PV}-gentoo" + ego build -ldflags "${LDFLAGS}" "github.com/netdata/go.d.plugin/cmd/godplugin" +} + +src_test() { + ego test ./... -cover -covermode=atomic +} + +src_install() { + einstalldocs + + exeinto "/usr/libexec/netdata/plugins.d" + newexe godplugin go.d.plugin + insinto "/usr/$(get_libdir)/netdata/conf.d" + doins -r config/* +} diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest index 8b9a9b8b17c3..af9ce4a6955d 100644 --- a/net-analyzer/netdata/Manifest +++ b/net-analyzer/netdata/Manifest @@ -1 +1 @@ -DIST netdata-1.19.0.tar.gz 3443251 BLAKE2B 8e18a661367850e712a75c1c11b661a977bf77b48369e0e36763a74f96b3726c523093a82eb6f94257c02e754d900cb675d501fda824ceb94eef31dfa30e5712 SHA512 026ae159d8ed52a30e406c110c2732e54e50f070865ba3e430df73e4df40387105053e750ca6029cfbc7f40a2c05b7fb6ba4e3e4a7070822c7eec4c1a4712aea +DIST netdata-1.45.4.tar.gz 74881136 BLAKE2B e6184458a8b7e4430fb3e11543812f00652712c0c78d3ffb2f040adf649ceb4b01b4984165e489dfbea5c2207b702319fd5f3fb0d6d420e8973a20e54f3555b9 SHA512 44ab814c1dfb8c70880a363abbf29115189da366a49df953665dc2831da389e46ac2e33c288ebdbb10478f66180d0243d1b848a2f94043449198a87d9ad06340 diff --git a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch b/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch deleted file mode 100644 index 1b6d5b75020d..000000000000 --- a/net-analyzer/netdata/files/netdata-1.19.0-fno-common.patch +++ /dev/null @@ -1,126 +0,0 @@ -https://github.com/netdata/netdata/pull/7877 - -From c65f57af0714558294c1ad1b9568077720fb282b Mon Sep 17 00:00:00 2001 -From: Thiago Marques <thiagoftsm@gmail.com> -Date: Tue, 28 Jan 2020 13:59:20 +0000 -Subject: [PATCH 1/2] missing_extern: Fix missing - -Fix few externs that were missing in global variables ---- - daemon/common.h | 2 +- - health/health.h | 2 +- - libnetdata/health/health.h | 2 +- - web/api/web_api_v1.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/daemon/common.h b/daemon/common.h -index 6ac3cb3c87..59dbc41a8d 100644 ---- a/daemon/common.h -+++ b/daemon/common.h -@@ -84,6 +84,6 @@ extern char *netdata_configured_timezone; - extern int netdata_zero_metrics_enabled; - extern int netdata_anonymous_statistics_enabled; - --int netdata_ready; -+extern int netdata_ready; - - #endif /* NETDATA_COMMON_H */ -diff --git a/health/health.h b/health/health.h -index 9da90d70c9..d77318fd78 100644 ---- a/health/health.h -+++ b/health/health.h -@@ -52,7 +52,7 @@ extern unsigned int default_health_enabled; - - #define HEALTH_SILENCERS_MAX_FILE_LEN 10000 - --char *silencers_filename; -+extern char *silencers_filename; - - extern void health_init(void); - extern void *health_main(void *ptr); -diff --git a/libnetdata/health/health.h b/libnetdata/health/health.h -index a3dc0775fc..f7580edab2 100644 ---- a/libnetdata/health/health.h -+++ b/libnetdata/health/health.h -@@ -44,7 +44,7 @@ typedef struct silencers { - SILENCER *silencers; - } SILENCERS; - --SILENCERS *silencers; -+extern SILENCERS *silencers; - - extern SILENCER *create_silencer(void); - extern int health_silencers_json_read_callback(JSON_ENTRY *e); -diff --git a/web/api/web_api_v1.h b/web/api/web_api_v1.h -index 4fe3c8f6be..edeea98bed 100644 ---- a/web/api/web_api_v1.h -+++ b/web/api/web_api_v1.h -@@ -29,6 +29,6 @@ extern void host_labels2json(RRDHOST *host, BUFFER *wb, size_t indentation); - extern void web_client_api_v1_init(void); - extern void web_client_api_v1_management_init(void); - --char *api_secret; -+extern char *api_secret; - - #endif //NETDATA_WEB_API_V1_H - -From c0275ddaad62459a6da1eee0a0c76282a1391590 Mon Sep 17 00:00:00 2001 -From: Thiago Marques <thiagoftsm@gmail.com> -Date: Tue, 28 Jan 2020 14:06:56 +0000 -Subject: [PATCH 2/2] missing_extern: Variables - -This commit declares the variables inside .c files ---- - daemon/common.c | 2 +- - health/health.c | 1 + - libnetdata/health/health.c | 2 ++ - web/api/web_api_v1.c | 2 ++ - 4 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/daemon/common.c b/daemon/common.c -index e28f6cf000..67497a4e93 100644 ---- a/daemon/common.c -+++ b/daemon/common.c -@@ -13,4 +13,4 @@ char *netdata_configured_varlib_dir = VARLIB_DIR; - char *netdata_configured_home_dir = CACHE_DIR; - char *netdata_configured_host_prefix = NULL; - char *netdata_configured_timezone = NULL; -- -+int netdata_ready; -diff --git a/health/health.c b/health/health.c -index 1124cf9107..4a84ef7fca 100644 ---- a/health/health.c -+++ b/health/health.c -@@ -9,6 +9,7 @@ struct health_cmdapi_thread_status { - }; - - unsigned int default_health_enabled = 1; -+char *silencers_filename; - - // ---------------------------------------------------------------------------- - // health initialization -diff --git a/libnetdata/health/health.c b/libnetdata/health/health.c -index e03538db3f..98d26d295f 100644 ---- a/libnetdata/health/health.c -+++ b/libnetdata/health/health.c -@@ -1,5 +1,7 @@ - #include "health.h" - -+SILENCERS *silencers; -+ - /** - * Create Silencer - * -diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c -index aafcbc70be..4ac50524ad 100644 ---- a/web/api/web_api_v1.c -+++ b/web/api/web_api_v1.c -@@ -2,6 +2,8 @@ - - #include "web_api_v1.h" - -+char *api_secret; -+ - static struct { - const char *name; - uint32_t hash; diff --git a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch b/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch deleted file mode 100644 index 25c8dd4051ff..000000000000 --- a/net-analyzer/netdata/files/netdata-1.19.0-prometheus-spelling.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://github.com/netdata/netdata/pull/7674 - -From d19b834d0011485759604ecfa095a898b597d8e0 Mon Sep 17 00:00:00 2001 -From: Craig Andrews <candrews@integralblue.com> -Date: Sun, 5 Jan 2020 16:13:18 -0500 -Subject: [PATCH] Fix spelling of Prometheus (#7673) - -diff --git a/configure.ac b/configure.ac -index 00927ba8b1..8b2facb966 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -999,7 +999,7 @@ test "${enable_backend_prometheus_remote_write}" = "yes" -a "${have_CXX_compiler - AC_MSG_ERROR([C++ compiler required but not found. try installing g++]) - - AC_MSG_CHECKING([if prometheus remote write backend should be enabled]) --if test "${enable_backend_prometeus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \ -+if test "${enable_backend_prometheus_remote_write}" != "no" -a "${have_libprotobuf}" = "yes" -a "${have_libsnappy}" = "yes" \ - -a "${have_protoc}" = "yes" -a "${have_CXX_compiler}" = "yes"; then - enable_backend_prometheus_remote_write="yes" - AC_DEFINE([ENABLE_PROMETHEUS_REMOTE_WRITE], [1], [Prometheus remote write API usability]) diff --git a/net-analyzer/netdata/metadata.xml b/net-analyzer/netdata/metadata.xml index 70b99cd52f39..f8b7fb9f0721 100644 --- a/net-analyzer/netdata/metadata.xml +++ b/net-analyzer/netdata/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>candrews@gentoo.org</email> <name>Craig Andrews</name> </maintainer> <use> - <flag name="compression">Enable compression via zlib</flag> + <flag name="aclk">Enable Agent-Cloud Link (ACLK) for securely connecting a Netdata Agent to your web browser through Netdata Cloud</flag> + <flag name="bpf">Enable the extended Berkeley Packet Filter (eBPF) collector to monitor kernel-level metrics about applications with per-second granularity</flag> + <flag name="cloud">Enable Netdata Cloud support</flag> <flag name="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="mongodb">Enable support for the mongodb backend</flag> <flag name="nfacct">Enable the nfacct plugin</flag> <flag name="nodejs">Enable use of nodejs (which some plugins use)</flag> @@ -20,8 +20,6 @@ </use> <upstream> <remote-id type="github">netdata/netdata</remote-id> + <remote-id type="cpe">cpe:/a:netdata:netdata</remote-id> </upstream> - <longdescription lang="en"> - Linux real time system monitoring web interface - </longdescription> </pkgmetadata> diff --git a/net-analyzer/netdata/netdata-1.19.0-r2.ebuild b/net-analyzer/netdata/netdata-1.19.0-r2.ebuild deleted file mode 100644 index 41c6f9ef672d..000000000000 --- a/net-analyzer/netdata/netdata-1.19.0-r2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) - -inherit autotools fcaps linux-info python-r1 systemd - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/netdata/${PN}.git" - inherit git-r3 -else - SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Linux real time system monitoring, done right!" -HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" - -LICENSE="GPL-3+ MIT BSD" -SLOT="0" -IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis 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-misc/curl - net-misc/wget - sys-apps/util-linux - virtual/awk - caps? ( sys-libs/libcap ) - cups? ( net-print/cups ) - dbengine? ( - dev-libs/libuv - app-arch/lz4 - dev-libs/judy - dev-libs/openssl:= - ) - compression? ( sys-libs/zlib ) - ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c ) - kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) - mongodb? ( dev-libs/mongo-c-driver ) - nfacct? ( - net-firewall/nfacct - net-libs/libmnl - ) - nodejs? ( net-libs/nodejs ) - prometheus? ( - dev-libs/protobuf:= - app-arch/snappy - ) - python? ( - ${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] - mysql? ( - || ( - dev-python/mysqlclient[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] - ) - ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - tor? ( 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' -) - -PATCHES=( - "${FILESDIR}/${P}-prometheus-spelling.patch" - "${FILESDIR}/${P}-fno-common.patch" -) - -pkg_setup() { - linux-info_pkg_setup -} - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --localstatedir="${EPREFIX}"/var \ - --with-user=netdata \ - $(use_enable jsonc) \ - $(use_enable cups plugin-cups) \ - $(use_enable dbengine) \ - $(use_enable nfacct plugin-nfacct) \ - $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis backend-kinesis) \ - $(use_enable mongodb backend-mongodb) \ - $(use_enable prometheus backend-prometheus-remote-write) \ - $(use_enable xen plugin-xenstat) \ - $(use_enable cpu_flags_x86_sse2 x86-sse) \ - $(use_with compression zlib) -} - -src_install() { - default - - rm -rf "${D}/var/cache" || die - - # Remove unneeded .keep files - find "${ED}" -name ".keep" -delete || die - - fowners -Rc netdata:netdata /var/log/netdata - keepdir /var/log/netdata - fowners -Rc netdata:netdata /var/lib/netdata - keepdir /var/lib/netdata - keepdir /var/lib/netdata/registry - - fowners -Rc root:netdata /usr/share/${PN} - - newinitd system/netdata-openrc ${PN} - systemd_dounit system/netdata.service - insinto /etc/netdata - doins system/netdata.conf -} - -pkg_postinst() { - fcaps_pkg_postinst - - if use xen ; then - fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' - fi -} diff --git a/net-analyzer/netdata/netdata-1.45.4.ebuild b/net-analyzer/netdata/netdata-1.45.4.ebuild new file mode 100644 index 000000000000..0d57f53917bc --- /dev/null +++ b/net-analyzer/netdata/netdata-1.45.4.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11} ) + +inherit cmake fcaps flag-o-matic linux-info optfeature python-single-r1 systemd + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/netdata/${PN}.git" + inherit git-r3 +else + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Linux real time system monitoring, done right!" +HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" + +LICENSE="GPL-3+ MIT BSD" +SLOT="0" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" +REQUIRED_USE=" + mysql? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + tor? ( python )" + +# most unconditional dependencies are for plugins.d/charts.d.plugin: +RDEPEND=" + acct-group/netdata + acct-user/netdata + app-misc/jq + >=app-shells/bash-4:0 + || ( + net-analyzer/openbsd-netcat + net-analyzer/netcat + ) + net-libs/libwebsockets + net-misc/curl + net-misc/wget + sys-apps/util-linux + app-alternatives/awk + sys-libs/libcap + cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= + dbengine? ( + dev-libs/judy + dev-libs/openssl:= + ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib + ipmi? ( sys-libs/freeipmi ) + dev-libs/json-c:= + mongodb? ( dev-libs/mongo-c-driver ) + nfacct? ( + net-firewall/nfacct + net-libs/libmnl:= + ) + nodejs? ( net-libs/nodejs ) + prometheus? ( + app-arch/snappy:= + dev-libs/protobuf:= + ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') ) + ) + xen? ( + app-emulation/xen-tools + dev-libs/yajl + ) + systemd? ( sys-apps/systemd )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +FILECAPS=( + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' +) + +pkg_setup() { + use python && python-single-r1_pkg_setup + linux-info_pkg_setup +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927174 + # https://github.com/netdata/netdata/issues/17321 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die + + keepdir /var/log/netdata + fowners -Rc netdata:netdata /var/log/netdata + keepdir /var/lib/netdata + keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d + fowners -Rc netdata:netdata /var/lib/netdata + + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" + insinto /etc/netdata + doins system/netdata.conf +} + +pkg_postinst() { + fcaps_pkg_postinst + + if use nfacct ; then + fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin' + fi + + if use xen ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' + fi + + if use ipmi ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin' + fi + + optfeature "go.d external plugin" net-analyzer/netdata-go-plugin +} diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild index 2e1eb0f4a276..0d57f53917bc 100644 --- a/net-analyzer/netdata/netdata-9999.ebuild +++ b/net-analyzer/netdata/netdata-9999.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python{3_6,3_7} ) +EAPI=8 +PYTHON_COMPAT=( python{3_9,3_10,3_11} ) -inherit autotools fcaps linux-info python-r1 systemd +inherit cmake fcaps flag-o-matic linux-info optfeature python-single-r1 systemd if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://github.com/netdata/${PN}.git" inherit git-r3 else - SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + SRC_URI="https://github.com/netdata/${PN}/releases/download/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Linux real time system monitoring, done right!" @@ -19,7 +20,7 @@ HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/" LICENSE="GPL-3+ MIT BSD" SLOT="0" -IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen" +IUSE="aclk bpf cloud cups +dbengine ipmi mongodb mysql nfacct nodejs postgres prometheus +python systemd tor xen" REQUIRED_USE=" mysql? ( python ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -35,96 +36,110 @@ RDEPEND=" net-analyzer/openbsd-netcat net-analyzer/netcat ) + net-libs/libwebsockets net-misc/curl net-misc/wget sys-apps/util-linux - virtual/awk - caps? ( sys-libs/libcap ) + app-alternatives/awk + sys-libs/libcap cups? ( net-print/cups ) + app-arch/lz4:= + app-arch/zstd:= + app-arch/brotli:= dbengine? ( - dev-libs/libuv - app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) - compression? ( sys-libs/zlib ) + dev-libs/libpcre2:= + dev-libs/libuv:= + dev-libs/libyaml + dev-libs/protobuf:= + bpf? ( virtual/libelf:= ) + sys-libs/zlib ipmi? ( sys-libs/freeipmi ) - jsonc? ( dev-libs/json-c ) - kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) + dev-libs/json-c:= mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct - net-libs/libmnl + net-libs/libmnl:= ) nodejs? ( net-libs/nodejs ) prometheus? ( + app-arch/snappy:= dev-libs/protobuf:= - app-arch/snappy ) python? ( ${PYTHON_DEPS} - dev-python/pyyaml[${PYTHON_USEDEP}] - mysql? ( - || ( - dev-python/mysqlclient[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] - ) - ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - tor? ( net-libs/stem[${PYTHON_USEDEP}] ) + $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') + mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') ) + postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') ) + tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') ) ) xen? ( app-emulation/xen-tools dev-libs/yajl - )" + ) + systemd? ( sys-apps/systemd )" DEPEND="${RDEPEND} virtual/pkgconfig" FILECAPS=( - 'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin' + 'cap_dac_read_search,cap_sys_ptrace+ep' + 'usr/libexec/netdata/plugins.d/apps.plugin' + 'usr/libexec/netdata/plugins.d/debugfs.plugin' ) pkg_setup() { + use python && python-single-r1_pkg_setup linux-info_pkg_setup } -src_prepare() { - default - eautoreconf -} - src_configure() { - econf \ - --localstatedir="${EPREFIX}"/var \ - --with-user=netdata \ - $(use_enable jsonc) \ - $(use_enable cups plugin-cups) \ - $(use_enable dbengine) \ - $(use_enable nfacct plugin-nfacct) \ - $(use_enable ipmi plugin-freeipmi) \ - $(use_enable kinesis backend-kinesis) \ - $(use_enable mongodb backend-mongodb) \ - $(use_enable prometheus backend-prometheus-remote-write) \ - $(use_enable xen plugin-xenstat) \ - $(use_enable cpu_flags_x86_sse2 x86-sse) \ - $(use_with compression zlib) + # -Werror=strict-aliasing + # https://bugs.gentoo.org/927174 + # https://github.com/netdata/netdata/issues/17321 + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE + -DCMAKE_INSTALL_PREFIX=/ + -DENABLE_ACLK=$(usex aclk) + -DENABLE_CLOUD=$(usex cloud) + -DENABLE_DBENGINE=$(usex dbengine) + -DENABLE_PLUGIN_CUPS=$(usex cups) + -DENABLE_PLUGIN_NFACCT=$(usex nfacct) + -DENABLE_PLUGIN_FREEIPMI=$(usex ipmi) + -DENABLE_EXPORTER_MONGODB=$(usex mongodb) + -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=$(usex prometheus) + -DENABLE_PLUGIN_XENSTAT=$(usex xen) + -DENABLE_PLUGIN_EBPF=$(usex bpf) + -DENABLE_PLUGIN_GO=FALSE + -DENABLE_PLUGIN_SYSTEMD_JOURNAL=$(usex systemd) + ) + cmake_src_configure } src_install() { - default + cmake_src_install rm -rf "${D}/var/cache" || die + rm -rf "${D}/var/run" || die keepdir /var/log/netdata fowners -Rc netdata:netdata /var/log/netdata keepdir /var/lib/netdata - fowners -Rc netdata:netdata /var/lib/netdata keepdir /var/lib/netdata/registry + keepdir /var/lib/netdata/cloud.d + fowners -Rc netdata:netdata /var/lib/netdata - fowners -Rc root:netdata /usr/share/${PN} - - newinitd system/netdata-openrc ${PN} - systemd_dounit system/netdata.service + newinitd "${D}/usr/lib/netdata/system/openrc/init.d/netdata" "${PN}" + newconfd "${D}/usr/lib/netdata/system/openrc/conf.d/netdata" "${PN}" + systemd_newunit "${D}/usr/lib/netdata/system/systemd/netdata.service.v235" netdata.service + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.service" + systemd_dounit "${D}/usr/lib/netdata/system/systemd/netdata-updater.timer" insinto /etc/netdata doins system/netdata.conf } @@ -132,7 +147,17 @@ src_install() { pkg_postinst() { fcaps_pkg_postinst + if use nfacct ; then + fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin' + fi + if use xen ; then fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin' fi + + if use ipmi ; then + fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin' + fi + + optfeature "go.d external plugin" net-analyzer/netdata-go-plugin } diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest index 89f75710adb6..a65e20bdc67f 100644 --- a/net-analyzer/netdiscover/Manifest +++ b/net-analyzer/netdiscover/Manifest @@ -1,2 +1 @@ -DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151434 BLAKE2B 14a406b766cc9dd5e3bbf98556077b51c88fe7f4aab46a45291b35a5fa4a38d33d86ee7592c6672d7c3b573893bca285f04ec22cf8735f090d3444e795774838 SHA512 936f030bac30cf54d1b9b6bb23045c2cad201a21529706436ab0732c356dc4ab27e3f2a8472437f9ac76d9b819ebc6d8faa05405be13d3d6beda5e261ebf93da -DIST netdiscover-0.3-beta6.tar.gz 411018 BLAKE2B 319ad0d4589867ded2747794b6c0074a68285b2abdac57a4f569f92e9bf09c71c7e9db64400dcce9aa44804d202d7d2fc2c0d427b92a9f99ff05a632fe5a794c SHA512 b8205322c34684642d52bf58f8fffa12a0dea387da713caf2935ba348c74b2e6cac717bf1626c9de816e45dce7c42b6b9584b5253351040af806f7ba262ce4d2 +DIST netdiscover-0.7.tar.gz 356514 BLAKE2B de880e124d1ee52c5466cf843ad3fc7077c9a673867f117f255791da9fcc8444599bf703515ef04eaa0f3fbc8ed50951bbd6cb147b1eb18020e06d35a90ccee4 SHA512 e526c1560c4054c6a2761d392997629b301c50db2c408719e84a820f9ad206825b9a4620e6721dcdebbb5c7479cd239e85de2d0657f97015b103805e8f9c05b4 diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch deleted file mode 100644 index 8355321085d1..000000000000 --- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-fno-common.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- ./src/ifaces.c -+++ ./src/ifaces.c -@@ -72,6 +72,7 @@ - unsigned char smac[ETH_ALEN]; - struct p_header *temp_header; - -+char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; - - /* Start Sniffing on given iface */ - void *start_sniffer(void *args) ---- ./src/ifaces.h -+++ ./src/ifaces.h -@@ -46,7 +46,7 @@ - - - // Shitty globals -- char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; -+ extern char *ourmac, errbuf[PCAP_ERRBUF_SIZE]; - - // Sniffer Functions - void *start_sniffer(void *); ---- a/src/screen.c -+++ b/src/screen.c -@@ -48,6 +48,7 @@ - struct arp_rep_c *arprep_count; - struct winsize win_sz; - pthread_mutex_t *listm; -+char *current_network; - - int scroll; - int smode, oldmode; ---- ./src/screen.h -+++ ./src/screen.h -@@ -24,7 +24,7 @@ - - - /* Ohh no, more globals */ --char *current_network; -+extern char *current_network; - - - /* Structs for counters */ diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch deleted file mode 100644 index d70fc36de5a5..000000000000 --- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-gentoo.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -5,7 +5,7 @@ - - AC_INIT(configure.in) - AM_INIT_AUTOMAKE(netdiscover, 0.3-beta6) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AM_MAINTAINER_MODE - - dnl get system information -@@ -35,7 +35,6 @@ - - AC_ISC_POSIX - AC_PROG_CC --AM_PROG_CC_STDC - AC_HEADER_STDC - - AM_PROG_LIBTOOL ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,8 +5,8 @@ - - SUBDIRS = src doc - --netdiscoverdocdir = ${prefix}/doc/netdiscover --netdiscoverdoc_DATA = \ -+noinstdir = ${prefix}/doc/netdiscover -+noinst_DATA = \ - README\ - COPYING\ - AUTHORS\ -@@ -15,7 +15,7 @@ - NEWS\ - TODO - --EXTRA_DIST = $(netdiscoverdoc_DATA) -+EXTRA_DIST = $(noinst_DATA) - - - diff --git a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch b/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch deleted file mode 100644 index 2b92bfde8629..000000000000 --- a/net-analyzer/netdiscover/files/netdiscover-0.3_beta6-misc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/src/misc.c -+++ b/src/misc.c -@@ -33,7 +33,7 @@ - - char *search_vendor(unsigned char mac[6]) - { -- char tmac[6]; -+ char tmac[7]; - int i = 0; - - sprintf(tmac, "%02x%02x%02x", mac[0], mac[1], mac[2]); -@@ -42,7 +42,7 @@ - for (i=0; i<6; i++) - tmac[i] = toupper(tmac[i]); - -- for (i=0; i<8436; i++) -+ for (i=0; i<NUM_OUI_RECORDS; i++) - { - if (strcmp(oui_table[i].prefix, tmac) == 0) - return oui_table[i].vendor; diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml index 74c2baebb4ec..f15ddc719661 100644 --- a/net-analyzer/netdiscover/metadata.xml +++ b/net-analyzer/netdiscover/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">netdiscover-scanner/netdiscover</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild deleted file mode 100644 index 77fc58fcf331..000000000000 --- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils autotools - -DESCRIPTION="An active/passive address reconnaissance tool" -HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/" -LICENSE="GPL-2" -SRC_URI=" - http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz - https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2 -" - -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" - -DEPEND=" - net-libs/libnet:1.1 - >=net-libs/libpcap-0.8.3-r1 -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P/_/-} - -DOCS=( AUTHORS ChangeLog README TODO ) - -src_prepare() { - epatch \ - "${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-misc.patch - - eautoreconf -} diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild deleted file mode 100644 index 264eea20d328..000000000000 --- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="An active/passive address reconnaissance tool" -HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/" -LICENSE="GPL-2" -SRC_URI=" - http://nixgeneration.com/~jaime/${PN}/releases/${P/_/-}.tar.gz - https://dev.gentoo.org/~jer/${P/_/-}-oui-db-update-20091010.patch.bz2 -" - -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" - -DEPEND=" - net-libs/libnet:1.1 - >=net-libs/libpcap-0.8.3-r1 -" -RDEPEND="${DEPEND}" -S=${WORKDIR}/${P/_/-} -DOCS=( AUTHORS ChangeLog README TODO ) -PATCHES=( - "${WORKDIR}"/${P/_/-}-oui-db-update-20091010.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-misc.patch - "${FILESDIR}"/${P}-fno-common.patch -) - -src_prepare() { - default - - eautoreconf -} diff --git a/net-analyzer/netdiscover/netdiscover-0.7.ebuild b/net-analyzer/netdiscover/netdiscover-0.7.ebuild new file mode 100644 index 000000000000..b48c92e92656 --- /dev/null +++ b/net-analyzer/netdiscover/netdiscover-0.7.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic + +DESCRIPTION="Active/passive address reconnaissance tool" +HOMEPAGE="https://github.com/netdiscover-scanner/netdiscover" +SRC_URI=" + https://github.com/${PN}-scanner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz +" +S="${WORKDIR}/${P/_/-}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + >=net-libs/libpcap-0.8.3-r1 +" +RDEPEND=" + ${DEPEND} +" +DOCS=( AUTHORS ChangeLog README TODO ) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + append-cflags -fcommon + default +} diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest index bffab0f80521..c56737e97dda 100644 --- a/net-analyzer/nethogs/Manifest +++ b/net-analyzer/nethogs/Manifest @@ -1 +1 @@ -DIST nethogs-0.8.5.tar.gz 112385 BLAKE2B 1d4867447455720a11f3131787b731428550f03d106ad476367ae356954c6c9895d02a8e730488b3deb9638d54bd60765cb63bcf599f4ec73c0bdc8da3d52cae SHA512 a2be81fcebc9925dd8a0fd9f71c6e790206819e0cc5efeeeb0c741baa9fd25ec685a1784b6d331d938cf14381403f9c13d619509d0ffe713ce8786a83a380908 +DIST nethogs-0.8.7.tar.gz 270631 BLAKE2B 179227d4b1fde5328e4885ce72bb28ac20482fa161afee7562546af5b403be1e851533e3861dfa2f514968aebe91a822e6b792520407853dfb1055c6d29ad121 SHA512 d965f3fa439ea9fbba83578b4272d03f396bf3cff9ae73a94936d47a3422d066d885c7f6f2a47fbe2f445a017bffa3fb3a1215976522ef0ad120fae3b95b31a2 diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml index 03dae9d25e4b..ee44ac098c0e 100644 --- a/net-analyzer/nethogs/metadata.xml +++ b/net-analyzer/nethogs/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild b/net-analyzer/nethogs/nethogs-0.8.7.ebuild index ac684149d33f..972b2b07b03b 100644 --- a/net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild +++ b/net-analyzer/nethogs/nethogs-0.8.7.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit toolchain-funcs +inherit fcaps toolchain-funcs DESCRIPTION="A small 'net top' tool, grouping bandwidth by process" HOMEPAGE="https://github.com/raboof/nethogs" @@ -11,23 +11,26 @@ 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 ~arm64 ~ia64 x86" -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses:0= -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +RDEPEND="net-libs/libpcap + sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( DESIGN README.decpcap.txt README.md ) + +FILECAPS=( + cap_net_admin,cap_net_raw usr/sbin/nethogs +) src_compile() { tc-export CC CXX + emake NCURSES_LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )" ${PN} } src_install() { emake DESTDIR="${ED}" PREFIX="/usr" install - dodoc Changelog DESIGN README.decpcap.txt README.md + einstalldocs } diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest deleted file mode 100644 index d29bf75f1503..000000000000 --- a/net-analyzer/neti/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST neti-2.0.tar.gz 383442 BLAKE2B a76977f6eb16b729e67cf4c98c2b1497d76572374b825bd7200b9d8f3b24634b3bcdae5e611dc3fa145f1cc4d5130d5e8501b017c529a72212a865c845cd01c6 SHA512 5a1156195106e8dcb738c5d2efdd88b77803fa16145db182f2d782a21316fac18af6812b264ece3bc49a5d6713b2aa86aca13129edd01753bf5cf0dd33b1aeb5 diff --git a/net-analyzer/neti/files/neti-init2 b/net-analyzer/neti/files/neti-init2 deleted file mode 100644 index 556660cae489..000000000000 --- a/net-analyzer/neti/files/neti-init2 +++ /dev/null @@ -1,19 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting netiathome" - start-stop-daemon --start --quiet --exec /usr/sbin/neti -- -D - eend $? -} - -stop() { - ebegin "Stopping netiathome" - start-stop-daemon --stop --quiet --exec /usr/sbin/neti - eend $? -} diff --git a/net-analyzer/neti/neti-2.0-r1.ebuild b/net-analyzer/neti/neti-2.0-r1.ebuild deleted file mode 100644 index bea83118f9b6..000000000000 --- a/net-analyzer/neti/neti-2.0-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="NETI@Home research project from GATech" -HOMEPAGE="http://www.neti.gatech.edu" -SRC_URI="mirror://sourceforge/neti/${P}.tar.gz" - -KEYWORDS="~ppc x86" -LICENSE="GPL-2" -SLOT="0" -IUSE="zlib java" - -DEPEND=" - java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) ) - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -RESTRICT="test" - -src_configure() { - econf $(use_with zlib) -} - -src_compile() { - emake NETILogParse neti - - use java && emake javadir=/usr/share/${PN} classjava.stamp -} - -src_install() { - emake \ - DESTDIR="${D}" \ - install-sbinPROGRAMS \ - install-sysconfDATA \ - install-man \ - install-info - - if use java; then - emake \ - DESTDIR="${D}" \ - javadir=/usr/share/${PN} \ - install-javaJAVA \ - install-javaDATA - - echo cd /usr/share/${PN}\;java -cp /usr/share/${PN} NETIMap > "${WORKDIR}"/NETIMap - dobin "${WORKDIR}"/NETIMap - fi - - dodoc README AUTHORS - newinitd "${FILESDIR}"/neti-init2 neti -} diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest deleted file mode 100644 index cd3890f6d5e0..000000000000 --- a/net-analyzer/netio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST netio132.zip 162484 BLAKE2B 921b28d25a8042b5567393b088fbede3f8bff2d4bf6c8afcaab03a76487ddc48e6cd640b2cbe7114b022cacef9fcf5ccc3deaa9eed2b648898d7f2dfb40e133c SHA512 3473b6b41c4a1e054fa0eb3316bc16e799034b4b9402c7751f29724d8ec70c674d3de59140fdbdc301c53f2a24b44d58e8cd50a68f107bd892b1d17b6e695232 diff --git a/net-analyzer/netio/files/netio-1.26-linux-include.patch b/net-analyzer/netio/files/netio-1.26-linux-include.patch deleted file mode 100644 index e006c82d71aa..000000000000 --- a/net-analyzer/netio/files/netio-1.26-linux-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -Add missing include (see inet(3)) - JeR - - ---- a/netio.c -+++ b/netio.c -@@ -199,6 +199,7 @@ - #include <sys/time.h> - #include <time.h> - #include <netinet/in.h> -+#include <arpa/inet.h> - #include <netdb.h> - - #define psock_errno(x) perror(x) diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/netio/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/netio/netio-1.32-r1.ebuild b/net-analyzer/netio/netio-1.32-r1.ebuild deleted file mode 100644 index afba5e9baeba..000000000000 --- a/net-analyzer/netio/netio-1.32-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="measures net throughput with NetBIOS and TCP/IP protocols" -HOMEPAGE="https://web.ars.de/netio/" -SRC_URI="http://web.ars.de/wp-content/uploads/2017/04/${PN}${PV/./}.zip" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -RESTRICT="mirror" # bug #391789 comment #1 - -DEPEND=" - app-arch/unzip - >=sys-apps/sed-4 -" - -S="${WORKDIR}" -PATCHES=( - "${FILESDIR}"/${PN}-1.26-linux-include.patch -) - -src_prepare() { - edos2unix *.c *.h *.doc - - default - - sed -i \ - -e "s|LFLAGS=\"\"|LFLAGS?=\"${LDFLAGS}\"|g" \ - -e 's|\(CC\)=|\1?=|g' \ - -e 's|\(CFLAGS\)=|\1+=|g' \ - Makefile || die -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - linux -} - -src_install() { - dobin netio - dodoc netio.doc -} diff --git a/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch new file mode 100644 index 000000000000..0682c76cd89d --- /dev/null +++ b/net-analyzer/netperf/files/netperf-2.7.0-fcommon.patch @@ -0,0 +1,30 @@ +https://github.com/HewlettPackard/netperf/pull/46 +https://bugs.gentoo.org/706694 + +From c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 12 Aug 2020 09:57:23 -0700 +Subject: [PATCH] nettest_omni: Remove duplicate variable definitions + +These defines are already defined in nettest_bsd.c and exported by +nettest_bsd.h this should fix build with -fno-common + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/src/nettest_omni.c ++++ b/src/nettest_omni.c +@@ -458,14 +458,6 @@ static int client_port_max = 65535; + + /* different options for the sockets */ + +-int +- loc_nodelay, /* don't/do use NODELAY locally */ +- rem_nodelay, /* don't/do use NODELAY remotely */ +- loc_sndavoid, /* avoid send copies locally */ +- loc_rcvavoid, /* avoid recv copies locally */ +- rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- + extern int + loc_tcpcork, + rem_tcpcork, + diff --git a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch index eb8c09b84695..eb89d34f3e8b 100644 --- a/net-analyzer/netperf/files/netperf-2.7.0-inline.patch +++ b/net-analyzer/netperf/files/netperf-2.7.0-inline.patch @@ -1,6 +1,6 @@ # Copyright Seblu 2015 ---- a/src/netlib.c 2015-08-04 20:30:43.449468815 +0200 -+++ b/src/netlib.c 2015-08-04 20:31:40.317792002 +0200 +--- a/src/netlib.c ++++ b/src/netlib.c @@ -3997,11 +3997,7 @@ } } diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml index d9e80b8c44f1..3e35e2cbd3a3 100644 --- a/net-analyzer/netperf/metadata.xml +++ b/net-analyzer/netperf/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r5.ebuild index 86849c8d0dd7..c96a45cdd70a 100644 --- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild +++ b/net-analyzer/netperf/netperf-2.7.0-r5.ebuild @@ -1,33 +1,38 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils flag-o-matic user +EAPI=8 + +inherit flag-o-matic DESCRIPTION="Network performance benchmark" +HOMEPAGE="http://www.netperf.org/" SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2" -KEYWORDS="~alpha amd64 arm64 hppa ia64 ppc ppc64 sparc x86" -HOMEPAGE="http://www.netperf.org/" LICENSE="netperf" SLOT="0" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="demo sctp" -DEPEND=">=sys-apps/sed-4" - -pkg_setup() { - enewuser netperf - enewgroup netperf -} +RDEPEND=" + acct-group/netperf + acct-user/netperf +" +BDEPEND=" + ${RDEPEND} + sys-devel/gnuconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-fix-scripts.patch + "${FILESDIR}"/${PN}-2.6.0-log-dir.patch + "${FILESDIR}"/${PN}-2.7.0-includes.patch + "${FILESDIR}"/${PN}-2.7.0-space.patch + "${FILESDIR}"/${PN}-2.7.0-inline.patch + "${FILESDIR}"/${PN}-2.7.0-fcommon.patch +) src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-fix-scripts.patch \ - "${FILESDIR}"/${PN}-2.6.0-log-dir.patch \ - "${FILESDIR}"/${PN}-2.7.0-includes.patch \ - "${FILESDIR}"/${PN}-2.7.0-space.patch \ - "${FILESDIR}"/${PN}-2.7.0-inline.patch - # Fixing paths in scripts sed -i \ -e 's:^\(NETHOME=\).*:\1"/usr/bin":' \ @@ -39,14 +44,13 @@ src_prepare() { doc/examples/udp_stream_script \ || die - eapply_user + default } src_configure() { - append-cflags -fcommon - # netlib.c:2292:5: warning: implicit declaration of function ‘sched_setaffinity’ # nettest_omni.c:2943:5: warning: implicit declaration of function ‘splice’ + # TODO: drop once https://github.com/HewlettPackard/netperf/pull/73 merged append-cppflags -D_GNU_SOURCE econf \ @@ -54,13 +58,13 @@ src_configure() { $(use_enable sctp) } -src_install () { +src_install() { default - # move netserver into sbin as we had it before 2.4 was released with its + # Move netserver into sbin as we had it before 2.4 was released with its # autoconf goodness dodir /usr/sbin - mv "${D}"/usr/{bin,sbin}/netserver || die + mv "${ED}"/usr/{bin,sbin}/netserver || die # init.d / conf.d newinitd "${FILESDIR}"/${PN}-2.7.0-init netperf @@ -73,6 +77,6 @@ src_install () { # documentation and example scripts dodoc AUTHORS ChangeLog NEWS README Release_Notes dodir /usr/share/doc/${PF}/examples - #Scripts no longer get installed by einstall - cp doc/examples/*_script "${D}"/usr/share/doc/${PF}/examples || die + # Scripts no longer get installed by einstall + cp doc/examples/*_script "${ED}"/usr/share/doc/${PF}/examples || die } diff --git a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch index f5c61737f7ae..d1f04a33a2dc 100644 --- a/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch +++ b/net-analyzer/netpipe/files/netpipe-3.7.2-fix-makefile.patch @@ -1,5 +1,3 @@ -diff --git a/makefile b/makefile -index 16f9052..3ada81f 100644 --- a/makefile +++ b/makefile @@ -21,8 +21,6 @@ @@ -11,3 +9,36 @@ index 16f9052..3ada81f 100644 SRC = ./src # For MPI, mpicc will set up the proper include and library paths +@@ -91,26 +89,26 @@ + + + tcp: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp.c -DTCP -o NPtcp -I$(SRC) + + tcp6: $(SRC)/tcp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/tcp6.c -DTCP6 \ + -o NPtcp6 -I$(SRC) + + sctp: $(SRC)/sctp.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp.c -DSCTP \ + -o NPsctp -I$(SRC) + + sctp6: $(SRC)/sctp6.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/sctp6.c -DSCTP6 \ + -o NPsctp6 -I$(SRC) + + ipx: $(SRC)/ipx.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/ipx.c -DIPX \ + -o NPipx -I$(SRC) -lipx + + memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h +- $(CC) $(CFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \ ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(SRC)/netpipe.c $(SRC)/memcpy.c \ + -DMEMCPY -o NPmemcpy -I$(SRC) + + MP_memcpy: $(SRC)/memcpy.c $(SRC)/netpipe.c $(SRC)/netpipe.h $(SRC)/MP_memcpy.c diff --git a/net-analyzer/netpipe/metadata.xml b/net-analyzer/netpipe/metadata.xml index fd15de965046..ff4833a7522e 100644 --- a/net-analyzer/netpipe/metadata.xml +++ b/net-analyzer/netpipe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/netpipe/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2-r1.ebuild index 894cf55c72a7..1cda1d25fa4a 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/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml index 74c2baebb4ec..50ca2de6c5d2 100644 --- a/net-analyzer/netselect/metadata.xml +++ b/net-analyzer/netselect/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">apenwarr/netselect</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/netselect/netselect-0.4-r1.ebuild b/net-analyzer/netselect/netselect-0.4-r1.ebuild deleted file mode 100644 index 5b718ae9995e..000000000000 --- a/net-analyzer/netselect/netselect-0.4-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils toolchain-funcs - -DESCRIPTION="Ultrafast implementation of ping" -HOMEPAGE="http://apenwarr.ca/netselect/" -SRC_URI=" - https://github.com/apenwarr/${PN}/archive/${P}.tar.gz - ipv6? ( https://dev.gentoo.org/~jer/${P}-ipv6.patch.xz ) -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="ipv6" - -PATCHES=( - "${FILESDIR}"/${PN}-0.4-bsd.patch - "${FILESDIR}"/${PN}-0.4-flags.patch -) -S=${WORKDIR}/${PN}-${P} - -src_prepare() { - use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch - - default -} - -src_compile() { - emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" -} - -src_install () { - dobin netselect - - if ! use prefix ; then - fowners root:wheel /usr/bin/netselect - fperms 4711 /usr/bin/netselect - fi - - dodoc HISTORY README - - doman netselect.1 -} diff --git a/net-analyzer/netselect/netselect-0.4-r2.ebuild b/net-analyzer/netselect/netselect-0.4-r2.ebuild new file mode 100644 index 000000000000..acf571f4b070 --- /dev/null +++ b/net-analyzer/netselect/netselect-0.4-r2.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit fcaps toolchain-funcs + +DESCRIPTION="Ultrafast implementation of ping" +HOMEPAGE="http://apenwarr.ca/netselect/" +SRC_URI=" + https://github.com/apenwarr/${PN}/archive/${P}.tar.gz + ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${P}-ipv6.patch.xz ) +" +S="${WORKDIR}/${PN}-${P}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="ipv6" + +PATCHES=( + "${FILESDIR}"/${PN}-0.4-bsd.patch + "${FILESDIR}"/${PN}-0.4-flags.patch +) + +DOCS=( HISTORY README ) + +FILECAPS=( -g wheel cap_net_raw usr/bin/netselect ) + +src_prepare() { + use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch + + default + + # Don't warn about "root privileges required" when running as + # an unprivileged user with filecaps + if ! use prefix && use filecaps; then + sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die + fi +} + +src_compile() { + emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" +} + +src_install() { + dobin netselect + + einstalldocs + + doman netselect.1 +} + +pkg_postinst() { + ! use prefix && fcaps_pkg_postinst +} diff --git a/net-analyzer/netselect/netselect-9999.ebuild b/net-analyzer/netselect/netselect-9999.ebuild index de08fdebbdfa..5ed3fc2fde64 100644 --- a/net-analyzer/netselect/netselect-9999.ebuild +++ b/net-analyzer/netselect/netselect-9999.ebuild @@ -1,21 +1,18 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 toolchain-funcs + +inherit fcaps git-r3 toolchain-funcs DESCRIPTION="Ultrafast implementation of ping" HOMEPAGE="http://apenwarr.ca/netselect/" -EGIT_REPO_URI=" - https://github.com/apenwarr/${PN} -" -SRC_URI=" - ipv6? ( https://dev.gentoo.org/~jer/${PN}-0.4-ipv6.patch.xz ) -" +EGIT_REPO_URI="https://github.com/apenwarr/${PN}" +SRC_URI="ipv6? ( https://dev.gentoo.org/~jsmolic/distfiles/${PN}-0.4-ipv6.patch.xz )" +S="${WORKDIR}/${PN}-${P}" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="ipv6" PATCHES=( @@ -23,30 +20,39 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4-flags.patch ) +DOCS=( HISTORY README ) + +FILECAPS=( -g wheel cap_net_raw usr/bin/netselect ) + src_unpack() { use ipv6 && unpack ${A} git-r3_src_unpack } src_prepare() { - use ipv6 && PATCHES+=( "${WORKDIR}"/${PN}-0.4-ipv6.patch ) + use ipv6 && eapply "${WORKDIR}"/${PN}-0.4-ipv6.patch default + + # Don't warn about "root privileges required" when running as + # an unprivileged user with filecaps + if ! use prefix && use filecaps; then + sed -i -e '/if (geteuid () != 0)/,+2d' "${S}"/netselect.c || die + fi } src_compile() { emake CC="$(tc-getCC)" LDFLAGS="${CFLAGS} ${LDFLAGS}" } -src_install () { +src_install() { dobin netselect - if ! use prefix ; then - fowners root:wheel /usr/bin/netselect - fperms 4711 /usr/bin/netselect - fi - - dodoc HISTORY README + einstalldocs doman netselect.1 } + +pkg_postinst() { + ! use prefix && fcaps_pkg_postinst +} diff --git a/net-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/nettop/metadata.xml +++ b/net-analyzer/nettop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild index 9f5605fa16a6..b77fcdc473e8 100644 --- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild +++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild @@ -1,32 +1,38 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit eutils toolchain-funcs +inherit autotools toolchain-funcs -DESCRIPTION="top like program for network activity" -SRC_URI="mirror://gentoo/${P}.tar.gz" +DESCRIPTION="top-like program for network activity" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.gz" -SLOT="0" LICENSE="BSD" -KEYWORDS="amd64 ~arm ppc x86" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ppc x86" -DEPEND=" +RDEPEND=" sys-libs/slang - net-libs/libpcap -" -RDEPEND="${DEPEND}" + net-libs/libpcap" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gcc411.patch + "${FILESDIR}"/${P}-offbyone.patch +) src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gcc411.patch \ - "${FILESDIR}"/${P}-offbyone.patch + default + + eautoreconf #871408 + sed -i 's/configure.in/configure.ac/' Makefile.in || die + tc-export CC } src_install() { dosbin nettop - dodoc ChangeLog README THANKS + einstalldocs } diff --git a/net-analyzer/netwag/Manifest b/net-analyzer/netwag/Manifest deleted file mode 100644 index 161554360924..000000000000 --- a/net-analyzer/netwag/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netwag-5.39.0-doc_html.tgz 46461 BLAKE2B 13d290f828043018cae6b801eed5853fb6b01b8a5b6a2fac5a132b9fe1475db180e90814c1351a8e248627320305298aba63cfd4414472b752c21529a6dbdec4 SHA512 499d201b510c5175b09c7dbcc8b9bec1d9aa2fbf90613a937f88be5835dd67acfe28e78483ce2124c4fa3b43ea8f409ce6115e48f12ae0ffc4ad684354488030 -DIST netwag-5.39.0-src.tgz 164731 BLAKE2B 861217f023bc35e996f5433657e057ca799859d1453812793941a5dcf1827ddaa827f3ae8b5f2550c85932dea3dbc0cb9b3a6687f6986c6cab09b94fab01813c SHA512 a9f0279d42666eff636bb66258a17a4e10528b7329dfe5e5d8c0ddce15048d847a2a8e892ba82a606b37ceb328b8b31be52d7e8ee7aeb6feb1f3d254aa3a2401 diff --git a/net-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml deleted file mode 100644 index 9d880b0dc867..000000000000 --- a/net-analyzer/netwag/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <longdescription>Toolbox of 222 utilities for testing Ethernet/IP networks</longdescription> - <upstream> - <remote-id type="sourceforge">ntwag</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/netwag/netwag-5.39.0.ebuild b/net-analyzer/netwag/netwag-5.39.0.ebuild deleted file mode 100644 index 620bc9ee48ba..000000000000 --- a/net-analyzer/netwag/netwag-5.39.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=5 - -DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 222 utilities for testing Ethernet/IP networks)" -HOMEPAGE=" - http://ntwag.sourceforge.net/ - http://www.laurentconstantin.com/en/netw/netwag/ -" -SRC_URI="mirror://sourceforge/ntwag/${P}-src.tgz - doc? ( mirror://sourceforge/ntwag/${P}-doc_html.tgz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - ~net-analyzer/netwox-${PV} - >=dev-lang/tk-8 - || ( - x11-terms/xterm - kde-apps/konsole - x11-terms/eterm - x11-terms/gnome-terminal - ) -" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-src/src" - -src_prepare() { - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/usr/local:/usr:" \ - config.dat || die - sed -i \ - -e 's|eterm|Eterm|g' \ - genemake || die -} - -src_configure() { - sh genemake || die "problem creating Makefile" -} - -DOCS=( - "${WORKDIR}"/${P}-src/README.TXT - "${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt} - "${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusage.txt,todo.txt} -) - -src_install() { - default - - use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/* -} diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch new file mode 100644 index 000000000000..e1b0cbd115b2 --- /dev/null +++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-clang16.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/871375 +--- a/dispdata.c ++++ b/dispdata.c +@@ -42,3 +42,3 @@ + +-extern destroy_program; ++extern int destroy_program; + extern Semaphore masterdo; +--- a/netwatch.c ++++ b/netwatch.c +@@ -608,2 +608,4 @@ + void findaddr (u_int32_t searchaddr); ++int doeth (); ++int gh (int opt); + +--- a/netwatch.h ++++ b/netwatch.h +@@ -220,2 +220,4 @@ + char *servicenm( char *s, int port); ++void uthread_wait( long usec); ++int dokeyin (int force); + diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch new file mode 100644 index 000000000000..7a89ce111e9a --- /dev/null +++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-lto-mismatch.patch @@ -0,0 +1,8 @@ +Fix failure with -Werror=lto-type-mismatch +--- a/dispdata.c ++++ b/dispdata.c +@@ -96,3 +96,3 @@ + #define MAXSTATUS 14 +-#define STATUSSIZE 200 ++#define STATUSSIZE 256 + extern char status_lines[MAXSTATUS][STATUSSIZE]; diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml index af0a0fe5e3bb..1ea14397dd8e 100644 --- a/net-analyzer/netwatch/metadata.xml +++ b/net-analyzer/netwatch/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild deleted file mode 100644 index dda5375c225e..000000000000 --- a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils versionator - -MY_PV=$(replace_version_separator 3 '-') - -DESCRIPTION="Ethernet/PPP IP Packet Monitor" -HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html" -SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="doc" - -RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - sys-kernel/linux-headers - virtual/pkgconfig -" - -S=${WORKDIR}/${PN}-$(get_version_component_range 1-3) - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-append_ldflags.patch \ - "${FILESDIR}"/${P}-open.patch \ - "${FILESDIR}"/${P}-fix-fortify.patch \ - "${FILESDIR}"/${P}-do-not-call.patch \ - "${FILESDIR}"/${P}-includes.patch \ - "${FILESDIR}"/${P}-tinfo.patch - - eautoreconf -} - -src_install() { - dosbin netresolv netwatch - - doman netwatch.1 - dodoc BUGS CHANGES README* TODO - - if use doc; then - dohtml NetwatchKeyCommands.html - fi -} 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 df6024cd6534..a7215c4e36d0 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" +KEYWORDS="amd64 ~x86" -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/netwox/Manifest b/net-analyzer/netwox/Manifest deleted file mode 100644 index c24f76be1fd9..000000000000 --- a/net-analyzer/netwox/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST netwox-5.39.0-doc_html.tgz 146301 BLAKE2B 5d65cce6dc36f7fb682a7ab3d51b04366a9e43541837a07ff82e7dba29367adad92fcefcd68eb68a7f30c36adbce7765ee0cbd1d77a6a873a53c0b03ee9f0f1c SHA512 1bb6c87f2aeea8b10e9bec0725ed82b21c41290d2f2626024b13525fd92596e7aa9f91788d966a51900c0e1b346ac9fb30000344fa5b1450fe9ceb724df4be56 -DIST netwox-5.39.0-src.tgz 771942 BLAKE2B f6115e799404f420fdcee4551b78f3aeb5a3db5b5d528425fd4a68f0a5509bcace2f7d66cbbd56ae380d466425791b0a0b74325967dc2248ba25b1b55b70438b SHA512 3781c1c860d1545c269b27a702c59f1cb6b12af2e66fb3cbe776f3e085681a75ed3096d64cfdf92f65eff7213ceaab474b7e15c169c12e2c05220790ce337e37 diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml deleted file mode 100644 index feba708bd35b..000000000000 --- a/net-analyzer/netwox/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <longdescription>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription> - <upstream> - <remote-id type="sourceforge">ntwox</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/netwox/netwox-5.39.0.ebuild b/net-analyzer/netwox/netwox-5.39.0.ebuild deleted file mode 100644 index 962009bd0fde..000000000000 --- a/net-analyzer/netwox/netwox-5.39.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=5 -inherit multilib toolchain-funcs - -DESCRIPTION="Toolbox of 217 utilities for testing Ethernet/IP networks" -HOMEPAGE=" - http://ntwox.sourceforge.net/ - http://www.laurentconstantin.com/en/netw/netwox/ -" -SRC_URI="mirror://sourceforge/ntwox/${P}-src.tgz - doc? ( mirror://sourceforge/ntwox/${P}-doc_html.tgz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap - ~net-libs/netwib-${PV} -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P}-src/src - -src_prepare() { - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/lib:/$(get_libdir):" \ - -e "s:/usr/local:/usr:" \ - -e "s:=ar:=$(tc-getAR):" \ - -e "s:=ranlib:=$(tc-getRANLIB):" \ - -e "s:=gcc:=$(tc-getCC):" \ - -e "s:-O2:${CFLAGS}:" \ - config.dat || die - sed -i \ - -e "s:-o netwox:& \${LDFLAGS}:g" \ - -e 's: ; make: ; \\$(MAKE):g' \ - genemake || die -} - -src_configure() { - sh genemake || die -} - -DOCS=( - "${WORKDIR}"/${P}-src/README.TXT - "${WORKDIR}"/${P}-src/doc/{changelog.txt,credits.txt} - "${WORKDIR}"/${P}-src/doc/{problemreport.txt,problemusageunix.txt,todo.txt} -) - -src_install() { - default - - use doc && dohtml -r "${WORKDIR}"/${P}-doc_html/* -} diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 24d54d76b772..3a86012a4c87 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -1,4 +1 @@ -DIST nfdump-1.6.14-security.patch 31579 BLAKE2B d747526f46837e99193bf761bceb853bb44ea54bc6ca2a9977565742e1485b706f3f33370005ccf5c854429635de01f5cf594fd43122d4a6f8912e2a457d8caf SHA512 ee3b82f1283f3dceb36cf60abcee7f5a8fb6c8fe257e2233c3fbb9a34b3c5608dfa101fd473c8b839356a9d1c294a37b9e65657ff1b2d5c015015ff90b2d2c97 -DIST nfdump-1.6.14.tar.gz 1834355 BLAKE2B be92ec6c6eb60c883863a21e7d203c487f176e862f6227bf21d17ade2a04815095c5c119719a18c106401519d7976a2b82e46a11b7f207494abef3e0f73d2716 SHA512 c5e5540526dfce3798728930576e4c7930c3ff80893a94d7f9e65c7c577d1e78bdc47a99c47cee837327ad202197afc378d2408b1b9b847044d0110146055ffe -DIST nfdump-1.6.15.tar.gz 1834855 BLAKE2B 1892cfbd1d1299c44b14a39b55c766d3dd411d7410a66b8ecbebe590c9da595c79764966ef1c91adb91b936ee3c052ad14bca27c6bcb98472011eb2c67dff60f SHA512 a6bb4f2293ad85d8f16025e7272b889d3814cea2e9255dbd315ee92754675e4ee925c3ebe4e1350f2d5452d69d1d3c13ddeb656324a409c4744da1d4927fe1f2 -DIST nfdump-1.6.16.tar.gz 1814857 BLAKE2B cd50680adbb6023915232bb780daf2bcc4319348444a28c89fc4fdfd19225bdf243bb42179a6bd545c06ab6fafa50091401b7a286527d1863c888a96c0b0a2eb SHA512 c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32 +DIST nfdump-1.7.2.tar.gz 697405 BLAKE2B cf52f2cca5d80070bc00c7a7a87cc4820f04904ddeeebd4fc93cf3a2433bcf5798191daa86f0bfc7ee1f2f92e5d8bb087114d2c17e32b641a224189aeb54f822 SHA512 858d0aaae24f2e38f3708db9fd5cd40e99a6a50d5da5738c8ce4bf898fb153ce439c504d5fe8fb3c296d0069511a6f229ebdfc117f849a482e5ffdf457f06003 diff --git a/net-analyzer/nfdump/files/nfcapd.confd b/net-analyzer/nfdump/files/nfcapd.confd new file mode 100644 index 000000000000..28ea35fd0741 --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.confd @@ -0,0 +1,11 @@ +#shellcheck shell=sh +#shellcheck disable=SC2034 + +#port number to listen on +#PORT="2055" + +#maximum size of collected files +#MAX_SIZE="1G" + +#enable sending of all received packets to specified address +#REPEAT_TO="192.168.1.1/60062" diff --git a/net-analyzer/nfdump/files/nfcapd.initd b/net-analyzer/nfdump/files/nfcapd.initd new file mode 100644 index 000000000000..98d388cb710f --- /dev/null +++ b/net-analyzer/nfdump/files/nfcapd.initd @@ -0,0 +1,60 @@ +#!/sbin/openrc-run +#shellcheck shell=sh + +IDENT="${RC_SVCNAME#*.}" +PIDFILE="/run/nfcapd/${IDENT}.pid" +USER="nfcapd" +GROUP="nfcapd" + +ssd_start(){ + if [ -n "${MAX_SIZE}" ]; then + set -- "$@" -e + fi + if [ -n "${PORT}" ]; then + set -- "$@" -p "${PORT}" + fi + if [ -n "${REPEAT_TO}" ]; then + set -- "$@" -R "${REPEAT_TO}" + fi + start-stop-daemon "$@" +} + +checkconfig() { + if [ "${IDENT}" = "${RC_SVCNAME}" ]; then + eerror "You have to create an init script for each ident:" + eerror " cd /etc/init.d/; ln -s nfcapd nfcapd.ident" + return 1 + fi +} + +depend() { + need net +} + +start() { + checkconfig || return 1 + + checkpath -d -m 0750 -o nfcapd:nfcapd /run/nfcapd + checkpath -d -m 0750 -o nfcapd:nfcapd /var/tmp/nfcapd/"${IDENT}" + + if [ -n "${MAX_SIZE}" ]; then + nfexpire -u /var/tmp/nfcapd/"${IDENT}" -s "${MAX_SIZE}" \ + > /dev/null 2>&1 + chown -R ${USER}:${GROUP} /var/tmp/nfcapd/"${IDENT}" + fi + + ebegin "Starting ${RC_SVCNAME}" + ssd_start --start --quiet --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" -- -D -P "${PIDFILE}" -u ${USER} \ + -g ${GROUP} -I "${IDENT}" -l /var/tmp/nfcapd/"${IDENT}" + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop --exec /usr/bin/nfcapd \ + --pidfile "${PIDFILE}" + eend $? +} diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch deleted file mode 100644 index 38482c4bdb1a..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libnfdump.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -30,7 +30,6 @@ - LDADD = $(DEPS_LIBS) - - #Add extra debug info for gdb --AM_CFLAGS = -ggdb - - # libnfdump sources - common = nf_common.c nf_common.h -@@ -65,30 +64,36 @@ - - nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \ - $(nflowcache) $(nfprof) -+nfdump_DEPENDENCIES = libnfdump.la - nfdump_LDADD = -lnfdump - - nfreplay_SOURCES = nfreplay.c $(nfprof) \ - $(nfnet) $(collector) $(nfv1) $(nfv9) $(nfv5v7) $(ipfix) -+nfreplay_DEPENDENCIES = libnfdump.la - nfreplay_LDADD = -lnfdump - - nfprofile_SOURCES = nfprofile.c profile.c profile.h $(nfstatfile) -+nfprofile_DEPENDENCIES = libnfdump.la - nfprofile_LDADD = -lnfdump -lrrd - - nftrack_SOURCES = ../extra/nftrack/nftrack.c \ - ../extra/nftrack/nftrack_rrd.c ../extra/nftrack/nftrack_rrd.h \ - ../extra/nftrack/nftrack_stat.c ../extra/nftrack/nftrack_stat.h - nftrack_CFLAGS = -I ../extra/nftrack -+nftrack_DEPENDENCIES = libnfdump.la - nftrack_LDADD = -lnfdump -lrrd - - nfcapd_SOURCES = nfcapd.c \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(nfv1) $(nfv5v7) $(nfv9) $(ipfix) $(bookkeeper) $(expire) -+nfcapd_DEPENDENCIES = libnfdump.la - nfcapd_LDADD = -lnfdump - - nfpcapd_SOURCES = nfpcapd.c \ - $(pcaproc) $(netflow_pcap) \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(bookkeeper) $(expire) $(content) -+nfpcapd_DEPENDENCIES = libnfdump.la - nfpcapd_LDADD = -lnfdump - - if READPCAP -@@ -107,6 +112,7 @@ - sfcapd_SOURCES = sfcapd.c sflow.c sflow.h sflow_proto.h \ - $(nfstatfile) $(launch) \ - $(nfnet) $(collector) $(bookkeeper) $(expire) -+sfcapd_DEPENDENCIES = libnfdump.la - sfcapd_LDADD = -lnfdump - - if READPCAP -@@ -116,25 +122,31 @@ - endif - - nfreader_SOURCES = nfreader.c -+nfreader_DEPENDENCIES = libnfdump.la - nfreader_LDADD = -lnfdump - - nfanon_SOURCES = nfanon.c $(anon) -+nfanon_DEPENDENCIES = libnfdump.la - nfanon_LDADD = -lnfdump - - nfgen_SOURCES = nfgen.c -+nfgen_DEPENDENCIES = libnfdump.la - nfgen_LDADD = -lnfdump - - nfexpire_SOURCES = nfexpire.c \ - $(bookkeeper) $(expire) $(nfstatfile) -+nfexpire_DEPENDENCIES = libnfdump.la - nfexpire_LDADD = -lnfdump @FTS_OBJ@ - - nftest_SOURCES = nftest.c -+nftest_DEPENDENCIES = libnfdump.la - nftest_LDADD = -lnfdump - nftest_DEPENDENCIES = nfgen - - if FT2NFDUMP - ft2nfdump_SOURCES = ft2nfdump.c - ft2nfdump_CFLAGS = @FT_INCLUDES@ -+ft2nfdump_DEPENDENCIES = libnfdump.la - ft2nfdump_LDADD = -lnfdump -lft -lz - ft2nfdump_LDADD += @FT_LDFLAGS@ - endif diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch deleted file mode 100644 index 21aeb6f0e343..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-DEVEL.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- a/bin/flowtree.c -+++ b/bin/flowtree.c -@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - NodeList->last = node; - NodeList->length++; - #ifdef DEVEL -- int proto = node->proto; - printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - ListCheck(NodeList); - #endif - if ( NodeList->waiting ) { -@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) { - - struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) { - struct FlowNode *node; --int proto; - - GetTreeLock(NodeList); - while ( NodeList->length == 0 && !*done ) { -@@ -522,12 +520,11 @@ int proto; - - node->left = NULL; - node->right = NULL; -- proto = node->proto; - - NodeList->length--; - #ifdef DEVEL - printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", -- (unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); -+ (unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last); - - ListCheck(NodeList); - #endif ---- a/bin/nfexpire.c -+++ b/bin/nfexpire.c -@@ -212,12 +212,12 @@ int main( int argc, char **argv ) { - struct stat fstat; - int c, err, maxsize_set, maxlife_set; - int do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format; --char *maxsize_string, *lifetime_string, *datadir; -+char *lifetime_string, *datadir; - uint64_t maxsize, lifetime, low_water; - uint32_t runtime; - channel_t *channel, *current_channel; - -- maxsize_string = lifetime_string = NULL; -+ lifetime_string = NULL; - datadir = NULL; - maxsize = lifetime = 0; - do_rescan = 0; ---- a/bin/nfstat.c -+++ b/bin/nfstat.c -@@ -1670,7 +1670,7 @@ uint32_t maxindex, c; - else - printf("Top flows ordered by %s:\n", order_mode[order_index].string); - } -- if ( !record_header ) -+ if ( record_header ) - printf("%s\n", record_header); - } - PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list); ---- a/bin/sflow.c -+++ b/bin/sflow.c -@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs); - - static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs); - -+extern int verbose; -+ - #ifdef DEVEL - static inline char *printTag(uint32_t tag, char *buf, int bufLen); --#endif - --extern int verbose; -+static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -+ snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ return buf; -+} // End of printTag -+ -+#endif - - - /*_________________---------------------------__________________ -@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) { - static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) { - - #ifdef DEVEL --static inline char *printTag(uint32_t tag, char *buf, int bufLen) { -- snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -- return buf; --} // End of printTag -- --char buf[51]; -+ char buf[51]; -+ snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF)); -+ printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len); - #endif - -- dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len); - skipBytes(sample, len); - } // End of skipTLVRecord - diff --git a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch b/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch deleted file mode 100644 index a748969da2e7..000000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.16-libnfdump.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -30,7 +30,6 @@ - LDADD = $(DEPS_LIBS) - - #Add extra debug info for gdb --AM_CFLAGS = -ggdb - - # libnfdump sources - common = nf_common.c nf_common.h diff --git a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch index 3699fa2a5d01..47953c772172 100644 --- a/net-analyzer/nfdump/files/nfdump-1.6.14-libft.patch +++ b/net-analyzer/nfdump/files/nfdump-1.6.19-libft.patch @@ -1,14 +1,17 @@ --- a/configure.ac +++ b/configure.ac -@@ -125,9 +125,8 @@ +@@ -115,12 +115,8 @@ if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH) fi -- if test ! -f "$WHERE_FTPATH/lib/libft.a" -a -f "$WHERE_FTPATH/lib64/libft.a" ! -f "$WHERE_FTPATH/lib/libft.so" -a -f "$WHERE_FTPATH/lib64/libft.so"; then +- if test -f "$WHERE_FTPATH/lib/libft.a" -o -f "$WHERE_FTPATH/lib64/libft.a" -o -f "$WHERE_FTPATH/lib/libft.so" -o -f "$WHERE_FTPATH/lib64/libft.so"; then +- FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" +- FT_LDFLAGS="-L$WHERE_FTPATH/lib" +- else - AC_MSG_ERROR(libft.a not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first) - fi + AC_CHECK_LIB([ft], [main],, + AC_MSG_ERROR(libft not found in flow-tools directory '$WHERE_FTPATH'. Build flow tools first)) - FT_INCLUDES="-I$WHERE_FTPATH/include -I$WHERE_FTPATH/lib" - FT_LDFLAGS="-L$WHERE_FTPATH/lib" else + AC_MSG_ERROR(flow-tools directory '$WHERE_FTPATH' does not exists. Use --with-ftpath=PATH) + fi diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml index f6dc8af136ae..932e8bc7cc69 100644 --- a/net-analyzer/nfdump/metadata.xml +++ b/net-analyzer/nfdump/metadata.xml @@ -1,19 +1,23 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> <use> - <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> - <flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag> <flag name="ftconv">Build the flow-tools to nfdump converter</flag> + <flag name="jnat">Build nfudmp to support JunOS NAT event logging</flag> + <flag name="nfpcapd">Build nfpcapd collector to create netflow data from precollected pcap traffic</flag> <flag name="nfprofile">Build nfprofile used by NfSen</flag> <flag name="nftrack">Build nfprofile used by PortTracker</flag> + <flag name="nsel">Build nfudmp to support NSEL/NEL event data</flag> + <flag name="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag> <flag name="sflow">Build sflow collector sfcpad</flag> </use> - <longdescription>The nfdump tools collect and process netflow data on the command line</longdescription> + <longdescription>nfdump is a toolset to collect and process netflow and sflow + data, sent from netflow/sflow compatible devices. The toolset supports + netflow v1, v5/v7,v9,IPFIX and SFLOW.</longdescription> <upstream> <remote-id type="sourceforge">nfdump</remote-id> <remote-id type="github">phaag/nfdump</remote-id> diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild deleted file mode 100644 index 64b2478d5f8f..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI=" - https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/phaag/nfdump/commit/ff0e855bd1f51bed9fc5d8559c64d3cfb475a5d8.patch -> ${P}-security.patch -" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="amd64 x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" - -DOCS=( AUTHORS ChangeLog NEWS README ) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.6.14-libft.patch \ - "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch \ - "${DISTDIR}"/${P}-security.patch - - eautoreconf -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) -} diff --git a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild deleted file mode 100644 index 1bc02e2ad824..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.15-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils ltprune - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" - -DOCS=( AUTHORS ChangeLog README.md ) - -src_prepare() { - eapply \ - "${FILESDIR}"/${PN}-1.6.14-libft.patch \ - "${FILESDIR}"/${PN}-1.6.14-libnfdump.patch - - eapply_user - - eautoreconf -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files -} diff --git a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild deleted file mode 100644 index 1c1536dcf588..000000000000 --- a/net-analyzer/nfdump/nfdump-1.6.16-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils ltprune - -DESCRIPTION="A set of tools to collect and process netflow data" -HOMEPAGE="https://github.com/phaag/nfdump" -SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/1.6.15" -KEYWORDS="~amd64 ~x86" -IUSE="compat15 debug ftconv nfprofile nftrack readpcap sflow static-libs" - -COMMON_DEPEND=" - app-arch/bzip2 - sys-libs/zlib - ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) - nfprofile? ( net-analyzer/rrdtool ) - nftrack? ( net-analyzer/rrdtool ) - readpcap? ( net-libs/libpcap ) -" -DEPEND=" - ${COMMON_DEPEND} - sys-devel/flex - virtual/yacc -" -RDEPEND=" - ${COMMON_DEPEND} - dev-lang/perl -" -DOCS=( AUTHORS ChangeLog README.md ) -PATCHES=( - "${FILESDIR}"/${PN}-1.6.14-libft.patch - "${FILESDIR}"/${PN}-1.6.16-libnfdump.patch - "${FILESDIR}"/${PN}-1.6.16-DEVEL.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - # --without-ftconf is not handled well #322201 - econf \ - $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ - $(use nfprofile && echo --enable-nfprofile) \ - $(use nftrack && echo --enable-nftrack) \ - $(use_enable compat15) \ - $(use_enable debug devel) \ - $(use_enable readpcap) \ - $(use_enable sflow) \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files -} diff --git a/net-analyzer/nfdump/nfdump-1.7.2.ebuild b/net-analyzer/nfdump/nfdump-1.7.2.ebuild new file mode 100644 index 000000000000..140aa13598bb --- /dev/null +++ b/net-analyzer/nfdump/nfdump-1.7.2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="A set of tools to collect and process netflow data" +HOMEPAGE="https://github.com/phaag/nfdump" +SRC_URI="https://github.com/phaag/nfdump/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="debug doc jnat ftconv nfpcapd nfprofile nftrack nsel readpcap sflow" + +REQUIRED_USE="?? ( jnat nsel )" + +RDEPEND=" + app-arch/bzip2 + sys-libs/zlib + elibc_musl? ( sys-libs/fts-standalone ) + ftconv? ( net-analyzer/flow-tools ) + nfpcapd? ( net-libs/libpcap ) + nfprofile? ( net-analyzer/rrdtool ) + nftrack? ( net-analyzer/rrdtool ) + readpcap? ( net-libs/libpcap ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex + app-alternatives/yacc + doc? ( + app-text/doxygen + media-gfx/graphviz + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.19-libft.patch +) + +DOCS=( AUTHORS ChangeLog README.md ) + +src_prepare() { + default + + eautoreconf + + if use doc; then + doxygen -u doc/Doxyfile.in || die + fi +} + +src_configure() { + tc-export CC + + # bug #853763 + use elibc_musl && append-libs "-lfts" + + # --without-ftconf is not handled well, bug #322201 + econf \ + $(use ftconv && echo "--enable-ftconv --with-ftpath=/usr") \ + $(use nfpcapd && echo --enable-nfpcapd) \ + $(use nfprofile && echo --enable-nfprofile) \ + $(use nftrack && echo --enable-nftrack) \ + $(use_enable debug devel) \ + $(use_enable jnat) \ + $(use_enable nsel) \ + $(use_enable readpcap) \ + $(use_enable sflow) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die + + newinitd "${FILESDIR}"/nfcapd.initd nfcapd + newconfd "${FILESDIR}"/nfcapd.confd nfcapd + + if use doc; then + dodoc -r doc/html + fi +} diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest index 2e78bb727035..91890d8138fb 100644 --- a/net-analyzer/ngrep/Manifest +++ b/net-analyzer/ngrep/Manifest @@ -1,2 +1 @@ -DIST ngrep-1.45.tar.bz2 463361 BLAKE2B 31f7828fb28197f06a583cd6d250b5d70bfbd2bc5dae657daaed3f7ea286aec4dff9cca449c72a3c27d8e8b30d861304872eaaaa11abc9eb71f2acc94d9fc9f2 SHA512 0feb4080f834449d57ae99897c573d2b8148711cfb550fa4ff415169dedb1f0d23f4b03f625660162ca72f8ad06e19874c1af46da6afd8f8fe8dd553558c14f7 DIST ngrep-1.47.tar.gz 187067 BLAKE2B 4fa47ed343b88e84fb5a3ab6e4dc8139cb008ffcbea901a67664335ad76d36e975e037620cebb1b204ba22e5b139e822c7cfbc74a061fc6cacae631be3f87a52 SHA512 47ba65878df6b555701c866721a8a935eabdcce636d398284cbfe5f63baf68c62d994a2f373ea4fc8f44fbed3eecee149f2ee48d39c71c04d34e5a088db8c657 diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch deleted file mode 100644 index 9cde0f81926d..000000000000 --- a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch +++ /dev/null @@ -1,186 +0,0 @@ -This patch fixes a number of problems with have with build: - - * more clean cut off pcre library; we'll never use bundled pcre library, so - some autoconf added REGEX_LIBS to pass correct system libs and header change. - - * We use AC_CONFIG_SUBDIRS to pass make autoconf reconfigure gnuregex library - - this way ./configure will be called correctly and correct comipler will be - selected automatically. - - * With the previous change some modifications were required to make gnuregex - buildable: a) we should not overide CFLAGS in Makefile.in (as they together - with -DHAVE_CONFIG_H will be passed to gnuregex and it'll fail to build, - since no config.h exist) b) obvious way to remove warning "_GNU_SOURCE" - redefined - - * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug - #178684) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -7,7 +7,8 @@ - - CC=@CC@ - --CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ -+# Never redefine CFLAGS, as it pollutes env and gnuregex build failes -+EXTRA_CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ - INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@ - - LDFLAGS=@LDFLAGS@ @PCAP_LINK@ -@@ -34,25 +35,25 @@ - - REGEX_DIR=@REGEX_DIR@ - REGEX_OBJS=@REGEX_OBJS@ -- -+REGEX_LIBS=@REGEX_LIBS@ - - all: $(TARGET) - - $(TARGET): $(REGEX_OBJS) $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) -+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) - - debug: $(REGEX_OBJS) $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) -+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) - - static: $(REGEX_OBJS) $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS) -+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) - - install: $(TARGET) - $(INSTALL) -c -m 0755 $(TARGET) $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET) - $(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR_INSTALL)/$(MANPAGE) - - .c.o: -- $(CC) $(CFLAGS) $(INCLUDES) -g -c $< -+ $(CC) $(EXTRA_CFLAGS) $(INCLUDES) -g -c $< - - clean: - make -C $(REGEX_DIR) clean -@@ -63,7 +64,7 @@ - rm -f config.status config.cache config.log config.h Makefile - - $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h -- $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) -+ $(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) - - $(OBJS): Makefile ngrep.c ngrep.h - - ---- a/configure.in -+++ b/configure.in -@@ -124,14 +124,16 @@ - use_pcre="no" - ]) - -+REGEX_DIR="" -+REGEX_OBJS="" -+REGEX_LIBS="" - if test $use_pcre = yes; then - - echo -- echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' -+ echo 'Using System Perl-Compatible Regular Expression (PCRE) library ...' - echo - -- REGEX_DIR='pcre-5.0' -- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" -+ REGEX_LIBS="`pcre-config --libs`" - USE_PCRE="1" - - else -@@ -144,12 +146,19 @@ - REGEX_OBJS="$REGEX_DIR/regex.o" - USE_PCRE="0" - -+ AC_CONFIG_SUBDIRS([regex-0.12]) -+ -+ echo -+ echo 'GNU Regular Expression library is configured...' -+ echo -+ - fi - --( cd $REGEX_DIR && ./configure ) - - AC_SUBST(REGEX_DIR) - AC_SUBST(REGEX_OBJS) -+AC_SUBST(REGEX_LIBS) -+ - - - echo - ---- a/ngrep.c -+++ b/ngrep.c -@@ -92,7 +92,7 @@ - #endif - - #if USE_PCRE --#include "pcre-5.0/pcre.h" -+#include <pcre.h> - #else - #include "regex-0.12/regex.h" - #endif - ---- a/regex-0.12/Makefile.in -+++ b/regex-0.12/Makefile.in -@@ -18,23 +18,6 @@ - - version = 0.12 - --# You can define CPPFLAGS on the command line. Aside from system-specific --# flags, you can define: --# -DREGEX_MALLOC to use malloc/realloc/free instead of alloca. --# -DDEBUG to enable the compiled pattern disassembler and execution --# tracing; code runs substantially slower. --# -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to --# the corresponding C procedures). If not -DDEBUG, the macros --# are used. --CPPFLAGS = -- --# Likewise, you can override CFLAGS to optimize, use -Wall, etc. --CFLAGS = -g -- --# Ditto for LDFLAGS and LOADLIBES. --LDFLAGS = --LOADLIBES = -- - srcdir = @srcdir@ - VPATH = @srcdir@ - -@@ -43,7 +26,7 @@ - - SHELL = /bin/sh - --subdirs = doc test -+subdirs = - - default all:: regex.o - .PHONY: default all - ---- a/regex-0.12/configure.in -+++ b/regex-0.12/configure.in -@@ -34,4 +34,4 @@ - - esac - --AC_OUTPUT(Makefile doc/Makefile test/Makefile) -+AC_OUTPUT(Makefile) - -=== modified file 'regex-0.12/regex.c' ---- a/regex-0.12/regex.c -+++ b/regex-0.12/regex.c -@@ -34,7 +34,9 @@ - #pragma alloca - #endif - -+#ifndef _GNU_SOURCE - #define _GNU_SOURCE -+#endif - - /* We need this for `regex.h', and perhaps for the Emacs include files. */ - #include <sys/types.h> - diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch deleted file mode 100644 index 8618f5daae31..000000000000 --- a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch +++ /dev/null @@ -1,17 +0,0 @@ -* refrain from doing an absolutely insane check (to see if pcap is - installed in more than one place) - ---- a/configure.in -+++ b/configure.in -@@ -268,10 +268,7 @@ - - AC_MSG_CHECKING(for a complete set of pcap headers) - --possible_dirs="`eval echo -n ${includedir}` \ -- /usr/include /usr/include/pcap \ -- /usr/local/include /usr/local/include/pcap \ -- /usr/share/include /usr/share/include/pcap" -+possible_dirs="`eval echo -n ${includedir}`" - - AC_ARG_WITH(pcap-includes, - [ --with-pcap-includes specify the pcap include directory], diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch deleted file mode 100644 index 8789e5b8c76b..000000000000 --- a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch +++ /dev/null @@ -1,23 +0,0 @@ -Call setlocale to make isprint() decide what's printable depending -on the current locale. See bugs.debian.org/307496 . - ---- a/ngrep.c -+++ b/ngrep.c -@@ -97,6 +97,8 @@ - #include "regex-0.12/regex.h" - #endif - -+#include <locale.h> -+ - #include "ngrep.h" - - -@@ -195,6 +197,8 @@ - signal(SIGWINCH, update_windowsize); - #endif - -+ setlocale(LC_ALL, ""); -+ - while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) { - switch (c) { - case 'W': { diff --git a/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch b/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch new file mode 100644 index 000000000000..eb3758e8db2b --- /dev/null +++ b/net-analyzer/ngrep/files/ngrep-1.47-clang16.patch @@ -0,0 +1,30 @@ +https://github.com/jpr5/ngrep/pull/28 + +From 52515bae377f221b5473d9040f5f43ab1c672672 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 19 Dec 2022 11:49:06 +0100 +Subject: [PATCH] Include <err.h> and "tcpkill.h" to avoid implicit function + declarations + +Implicit function declarations are a historic language feature that +were removed from C in 1999. +--- a/ngrep.c ++++ b/ngrep.c +@@ -98,6 +98,7 @@ + #endif + + #include "ngrep.h" ++#include "tcpkill.h" + + + /* +--- a/tcpkill.c ++++ b/tcpkill.c +@@ -14,6 +14,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <string.h> ++#include <err.h> + #include <libnet.h> + #include <pcap.h> + diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml index a8fcd8f42981..51aab562d737 100644 --- a/net-analyzer/ngrep/metadata.xml +++ b/net-analyzer/ngrep/metadata.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>jpr5+gentoo@darkridge.com</email> <name>Jordan Ritter</name> <description>Program author who would like to be notified of bugs</description> @@ -10,11 +10,12 @@ <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="sourceforge">ngrep</remote-id> + <remote-id type="github">jpr5/ngrep</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild deleted file mode 100644 index b55f3909d222..000000000000 --- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils user - -DESCRIPTION="A grep for network layers" -HOMEPAGE="http://ngrep.sourceforge.net/" -SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2" - -LICENSE="ngrep" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ipv6" - -DEPEND=" - dev-libs/libpcre - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -DOCS=( - doc/CHANGES.txt - doc/CREDITS.txt - doc/README.txt - doc/REGEX.txt -) - -src_prepare() { - # Remove bundled libpcre to avoid occasional linking with them - rm -r pcre-5.0 || die - - epatch \ - "${FILESDIR}"/${P}-build-fixes.patch \ - "${FILESDIR}"/${P}-setlocale.patch \ - "${FILESDIR}"/${P}-prefix.patch - - eautoreconf -} - -src_configure() { - econf \ - $(use_enable ipv6) \ - --disable-pcap-restart \ - --enable-pcre \ - --with-dropprivs-user=ngrep \ - --with-pcap-includes="${EPREFIX}"/usr/include/pcap -} - -pkg_preinst() { - enewgroup ngrep - enewuser ngrep -1 -1 -1 ngrep -} diff --git a/net-analyzer/ngrep/ngrep-1.47.ebuild b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild index 0372332adb1f..ccfd27b71f07 100644 --- a/net-analyzer/ngrep/ngrep-1.47.ebuild +++ b/net-analyzer/ngrep/ngrep-1.47-r2.ebuild @@ -1,55 +1,57 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools user +EAPI=8 + +inherit autotools DESCRIPTION="A grep for network layers" HOMEPAGE="https://github.com/jpr5/ngrep" SRC_URI="https://github.com/jpr5/ngrep/archive/V${PV/./_}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P/./_}" LICENSE="ngrep" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ipv6" DEPEND=" dev-libs/libpcre net-libs/libpcap " + RDEPEND=" ${DEPEND} + acct-group/ngrep + acct-user/ngrep " -DOCS=( - CHANGES - CREDITS - README.md -) -S=${WORKDIR}/${P/./_} + PATCHES=( "${FILESDIR}"/${PN}-1.47-regex.patch + "${FILESDIR}"/${PN}-1.47-clang16.patch ) src_prepare() { default + + sed -i -e "s:configure.in:configure.ac:" regex*/{configure.in,Makefile.in} || die + eautoreconf } src_configure() { - econf \ - $(use_enable ipv6) \ - --disable-pcap-restart \ - --enable-pcre \ - --with-dropprivs-user=ngrep \ + local myeconfargs=( + $(use_enable ipv6) + --disable-pcap-restart + --enable-pcre + --with-dropprivs-user=ngrep --with-pcap-includes="${EPREFIX}"/usr/include/pcap + ) + + econf "${myeconfargs[@]}" } src_compile() { emake -C regex-0.12 emake STRIPFLAG="${CFLAGS}" } - -pkg_preinst() { - enewgroup ngrep - enewuser ngrep -1 -1 -1 ngrep -} diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest index 1e4c1165f805..c0a859172b2f 100644 --- a/net-analyzer/nikto/Manifest +++ b/net-analyzer/nikto/Manifest @@ -1 +1,2 @@ -DIST nikto-2.1.6_p20180122.tar.gz 511615 BLAKE2B 0937a5a52ae79e00da5bc53b089166cb2fc5cdf8311c4db55e421ddb44c22e31a9a964b02d75995c74b144d8fe05046895c4e54cfa7500aecd5d36787105a417 SHA512 4b9cae08146cefcfe4e929385631062f27cd13f5e516ec50fa9f9804a677a4a8846bc0f5de99bc1a25ec58ea8e2889bfa5953f8ca9cd7152e7b95b05861cac91 +DIST nikto-2.1.6_p20220602.tar.gz 455528 BLAKE2B 71094c786b274069eb17aac7d367bdc8535c7730afde7c7bf36d40719e2799561eb31ad9cc09ee39c47101880795eee0f1c46ca51c00644cdc23916033cc5f7e SHA512 5c8ce194951c10b8a5f4299e088928022193aa8ae7ed4fb6b9be76bcf03a405d776d6e30274f997ad9eeb95c012c7e09b6dec7cbecbe0ab4049e5d15529ae814 +DIST nikto-2.5.0.tar.gz 435886 BLAKE2B 66e3aaab87f031daeade1a46afce5f02b296a75a542c1f781140fa9e2a2b98c7a0051f0920cd109e35684c14e4137a59ac7f26a10d98dcaf663424ee1f5e10af SHA512 8561c048b2db9b91a53f389097f6f47b06b51d0bbb06d945a26463067a1b2192ae6ad086e8f14e8775827fa8075dabfff66df8c3f79915b7a2d4eaefb09894de diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml index 6f49eba8f496..80c4aed49624 100644 --- a/net-analyzer/nikto/metadata.xml +++ b/net-analyzer/nikto/metadata.xml @@ -1,5 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>gentoo@retornaz.com</email> + <name>Quentin Retornaz</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">sullo/nikto</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild index b6f46c92bf2e..c5fef7c17092 100644 --- a/net-analyzer/nikto/nikto-2.1.6_p20180122.ebuild +++ b/net-analyzer/nikto/nikto-2.1.6_p20220602.ebuild @@ -1,53 +1,47 @@ -# 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 DESCRIPTION="Web server vulnerability scanner" -HOMEPAGE="http://www.cirt.net/Nikto2" -COMMIT="b8454661c4dc9249cb515311cb2a80906a0a4b7a" +HOMEPAGE="https://www.cirt.net/Nikto2" +COMMIT="dc98b86d3860ea18d82b5a427ab7abcd57e01552" MY_P="${PN}-${COMMIT}" SRC_URI="https://github.com/sullo/nikto/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ssl" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" -# nikto provie its own libwhisker, do no use net-libs/libwhisker[ssl] +# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl] # https://bugs.gentoo.org/533900 RDEPEND=" dev-lang/perl - virtual/perl-JSON-PP + dev-perl/Net-SSLeay net-analyzer/nmap - ssl? ( - dev-libs/openssl:0= - dev-perl/Net-SSLeay - ) + virtual/perl-JSON-PP " -DEPEND="" S="${WORKDIR}/${MY_P}/program" src_prepare() { - sed -i -e 's:config.txt:nikto.conf:g' plugins/* || die sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die - sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf || die + sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die default } src_install() { insinto /etc/nikto - doins nikto.conf + newins nikto.conf.default nikto.conf dobin nikto.pl replay.pl dosym nikto.pl /usr/bin/nikto - dodir /usr/share/nikto insinto /usr/share/nikto doins -r plugins templates databases - dodoc docs/*.txt dodoc docs/nikto_manual.html + dodoc docs/nikto_schema.sql + doman docs/nikto.1 } diff --git a/net-analyzer/nikto/nikto-2.5.0.ebuild b/net-analyzer/nikto/nikto-2.5.0.ebuild new file mode 100644 index 000000000000..e7bb2ea3e968 --- /dev/null +++ b/net-analyzer/nikto/nikto-2.5.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Web server vulnerability scanner" +HOMEPAGE="https://www.cirt.net/Nikto2" +SRC_URI="https://github.com/sullo/nikto/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" + +# nikto provides its own libwhisker, do no use net-libs/libwhisker[ssl] +# https://bugs.gentoo.org/533900 +RDEPEND=" + dev-lang/perl + dev-perl/Net-SSLeay + net-analyzer/nmap + virtual/perl-JSON-PP +" + +S="${WORKDIR}/${P}/program" + +src_prepare() { + sed -i -e 's:/etc/nikto.conf:/etc/nikto/nikto.conf:' nikto.pl || die + sed -i -e 's:# EXECDIR=/opt/nikto:EXECDIR=/usr/share/nikto:' nikto.conf.default || die + + default +} + +src_install() { + insinto /etc/nikto + newins nikto.conf.default nikto.conf + + dobin nikto.pl replay.pl + dosym nikto.pl /usr/bin/nikto + + insinto /usr/share/nikto + doins -r plugins templates databases + + doman docs/nikto.1 + dodoc docs/nikto.dtd + dodoc docs/nikto_schema.sql +} diff --git a/net-analyzer/nipper/metadata.xml b/net-analyzer/nipper/metadata.xml index cb9bfb3173de..5750c1f52ca0 100644 --- a/net-analyzer/nipper/metadata.xml +++ b/net-analyzer/nipper/metadata.xml @@ -1,11 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ikelos@gentoo.org</email> - <name>Mike Auty</name> - </maintainer> - <longdescription>A security tool for auditing cisco and other firewall device configurations.</longdescription> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">nipper</remote-id> </upstream> diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild index 534146bbe3d1..0c4fd721931c 100644 --- a/net-analyzer/nipper/nipper-0.12.0.ebuild +++ b/net-analyzer/nipper/nipper-0.12.0.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +inherit cmake MY_P="${PN}-cli-${PV}" -inherit cmake-utils DESCRIPTION="Router configuration security analysis tool" HOMEPAGE="http://nipper.titania.co.uk/" -SRC_URI="mirror://sourceforge/nipper/${MY_P}.tgz" +SRC_URI="https://downloads.sourceforge.net/nipper/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND=">=net-libs/libnipper-0.12" RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest index ccef984f664b..492a7ee2de73 100644 --- a/net-analyzer/nload/Manifest +++ b/net-analyzer/nload/Manifest @@ -1 +1 @@ -DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af +DIST nload-0.7.5_pre20180309.tar.gz 43405 BLAKE2B b5d8aeffc5de52c8574a8d11f133b2c5a38d09fd5a1abb75e2a9ea99551b018947844348ab73a26d806c575a387f1d4a5354144612ac7ea0f45bab5bd7d05115 SHA512 5942d706ac1f8acf57c832ee832a6b96add3c3d80fb45d3a5f6eb2397d20d49c4cc52e754328259bb52b06bd4e4b15e92d86103a531ae4ac546fcb87e3e5131b diff --git a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch b/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch deleted file mode 100644 index 8d13545c786c..000000000000 --- a/net-analyzer/nload/files/nload-0.7.4-Eliminate-flicker-on-some-terminals.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8a93886e0fb33a81b8fe32e88ee106a581fedd34 Mon Sep 17 00:00:00 2001 -From: Roland Riegel <roland@roland-riegel.de> -Date: Sun, 28 Jan 2018 16:59:39 +0100 -Subject: [PATCH 1/1] Eliminate flicker on some terminals like rxvt (thanks to - Alex Wilson) - ---- - src/window.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/window.cpp b/src/window.cpp -index bfa7701..2083fd0 100644 ---- a/src/window.cpp -+++ b/src/window.cpp -@@ -108,7 +108,7 @@ void Window::refresh() - void Window::clear() - { - if(m_window) -- wclear(m_window); -+ werase(m_window); - } - - // move and resize window --- -2.16.4 - diff --git a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch index 705f92ea0e81..ff97f7004f94 100644 --- a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch +++ b/net-analyzer/nload/files/nload-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch @@ -1,4 +1,6 @@ -From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001 +Upstream: https://github.com/rolandriegel/nload/pull/4 + +From 096df0d1282a8c8c535e730d28fe281ea290b58d Mon Sep 17 00:00:00 2001 From: Andrey Mazo <ahippo@yandex.com> Date: Sun, 26 Aug 2018 00:00:35 +0300 Subject: [PATCH 1/1] Makefile,spec: don't compress the man-page @@ -21,17 +23,13 @@ It's also smart enough to package `nload.1.in` automatically. Don't specify an explicit man-page extension in .spec file as recommended by Fedora. [1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844 - -(cherry picked from commit 096df0d1282a8c8c535e730d28fe281ea290b58d) - -Upstream: https://github.com/rolandriegel/nload/pull/4 --- docs/Makefile.am | 10 +--------- nload.spec.in | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am -index 646d438..9032a02 100644 +index 706636e..9032a02 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,11 +1,3 @@ @@ -41,19 +39,19 @@ index 646d438..9032a02 100644 - -install: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 -- $(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1 +- $(INSTALL_DATA) $(top_builddir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1 - gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1 - -uninstall: - rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz +man1_MANS = nload.1 diff --git a/nload.spec.in b/nload.spec.in -index 36496fd..53f6f19 100644 +index 794e5e7..29ab486 100644 --- a/nload.spec.in +++ b/nload.spec.in @@ -41,7 +41,7 @@ rm -rf %{buildroot} %defattr(-,root,root) - %doc AUTHORS COPYING ChangeLog NEWS README + %doc AUTHORS COPYING ChangeLog README.md %attr(0755,root,root) %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1* @@ -61,5 +59,5 @@ index 36496fd..53f6f19 100644 %changelog -- -2.16.4 +2.43.0 diff --git a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch index dcab6ec324f4..caf67cc76b8e 100644 --- a/net-analyzer/nload/files/nload-0.7.4-tinfo.patch +++ b/net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch @@ -1,5 +1,5 @@ ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -70,6 +70,7 @@ esac diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml index 8e9e21d02085..501eefa5b6cf 100644 --- a/net-analyzer/nload/metadata.xml +++ b/net-analyzer/nload/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>ahippo@yandex.ru</email> + <maintainer type="person" proxied="yes"> + <email>ahipp0@pm.me</email> <name>Andrey Mazo</name> </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="github">rolandriegel/nload</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild deleted file mode 100644 index 70abf3184dd5..000000000000 --- a/net-analyzer/nload/nload-0.7.4-r1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Real time network traffic monitor for the command line interface" -HOMEPAGE="http://www.roland-riegel.de/nload/index.html" -SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86" - -RDEPEND=">=sys-libs/ncurses-5.2:0=" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-tinfo.patch - "${FILESDIR}"/${P}-Eliminate-flicker-on-some-terminals.patch - "${FILESDIR}"/${P}-Makefile-spec-don-t-compress-man-page.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # --enable-debug means do not strip debugging symbols (default no) - econf --enable-debug -} diff --git a/net-analyzer/nload/nload-0.7.4.ebuild b/net-analyzer/nload/nload-0.7.4.ebuild deleted file mode 100644 index b8bc8eed7b25..000000000000 --- a/net-analyzer/nload/nload-0.7.4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time" -HOMEPAGE="http://www.roland-riegel.de/nload/index.html" -SRC_URI="http://www.roland-riegel.de/nload/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" - -RDEPEND=">=sys-libs/ncurses-5.2:0=" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - eautoreconf -} - -src_configure() { - # --enable-debug means do not strip debugging symbols (default no) - econf --enable-debug -} diff --git a/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild new file mode 100644 index 000000000000..0764502dec28 --- /dev/null +++ b/net-analyzer/nload/nload-0.7.5_pre20180309.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +GIT_REV="8f92dc04fad283abdd2a4538cd4c2093d957d9da" + +DESCRIPTION="Real time network traffic monitor for the command line interface" +HOMEPAGE="http://www.roland-riegel.de/nload/index.html https://github.com/rolandriegel/nload" +SRC_URI="https://github.com/rolandriegel/nload/archive/${GIT_REV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 arm ~mips ppc x86" + +RDEPEND=">=sys-libs/ncurses-5.2:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.7.5_pre-tinfo.patch + "${FILESDIR}"/${PN}-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch +) + +S="${WORKDIR}/${PN}-${GIT_REV}" + +src_prepare() { + default + sed -i \ + -e "/AC_INIT/ s/0\.7\.4/${PV} (Gentoo)/" \ + configure.ac \ + || die "Failed to patch configure.ac" + eautoreconf +} diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 753fcf719ae1..633b02eaf585 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -1,3 +1,6 @@ -DIST nmap-7.70.tar.bz2 10467371 BLAKE2B 53d751773851e45fcfa7604f8b325297f429f525bafdef91e7f693b9a9876ddb23e978c50821776b64764adb5bf36e759042cac3254bdbf36bff7048dfb6f58d SHA512 084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 -DIST nmap-7.80.tar.bz2 10550327 BLAKE2B 513a5589f4dd72660d290cc03b8130da2c41e4620c5a82e125e4345259b8d0f6efa8bceef47d3c0d2b5b588888b716070e05105a09b0185622aed9268715ae2c SHA512 d4384d3ebf4f3abf3588eed5433f733874ecdceb9342a718dc36db19634b0cc819d73399974eb0a9a9c9dd9e5c88473e07644ec91db28b0c072552b54430be6b -DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 +DIST nmap-7.94-patches.tar.xz 4112 BLAKE2B 0720242bf507f2a1502cf854592d94a57a33d5ac1e520c752e548092f91bbffeb0f6f762f4da27ff445419ff3845060242aa43aba53d0161ae2bebccf728cc97 SHA512 d47e2215e1923af65e3a392c3d990d650e68135f139013c311a26d12cfd0b27d9d5c3cbc27bb8583251a353a6284fb9d518373f17624db242be7060b8bfa0ba5 +DIST nmap-7.94.tar.bz2 11102195 BLAKE2B 5819b458b50e33f6a507ad3c32a731c13e730c40d31a61731c3cfcd41fad8e3fdfcbb721ef46b05a80e406d0a646d0966d4b645551711144822551ef374a443a SHA512 a55cddf9c1d9272243d01251eb3315b26f232d0596818857083222a385398618b428dc2bd8282c3e832527e135a74aeb020ca8609d83d8337342f5d8a04d7f2c +DIST nmap-7.94.tar.bz2.asc 198 BLAKE2B 38a363499fe236f675238ecf015a7e597d66cdd84eef13bed4986b4081c4f1f7a288121e3666e0f31a9282fd84f30cbceb65341f1c173086c7421a8ea719afe9 SHA512 dcbaf88e9ead21f303a7ee5390de0d2bd67477c2628858dc3380b0ac7d73d4d1b330f3b303ff32b0cb9a22eaa37af535bd7aa622531451e404a8c9a256a98eec +DIST nmap-7.95-patches-2.tar.xz 5740 BLAKE2B 860e7702e2ae1211c4eeeb8f869730de2279a305389f54317f883d2094bfbb1efb9031a761af93bfa8ab56e06bea774dea5807d134dd64f94c2191340a21113b SHA512 e4fb7350ea7e7f2e62f089129c0962652e556fb3bdf272d78c834db299f7f92c3238344c8bd50fea7d1360460ca4768ddad7367ecfcaefdb51125c66cd6981dd +DIST nmap-7.95.tar.bz2 11717069 BLAKE2B 4ab4912468f6c1cf7517090bc94b1bb34e665fe1b3db973e1c7bb2d05cb885545cdf3ca5c7fb548ff0012b800f5dd60ed2f2010fc9fb62ba7d6a28537287193c SHA512 fd95a8bc627a2b8b507353f761dc9fdc8e880a0dd2d75a51b9cb3ec664318796af9bb16a6ff9a1358bd77ad669c2a54e333be630f201f69287692a7d2d41c17e +DIST nmap-7.95.tar.bz2.asc 181 BLAKE2B 31db32cb5ad42be25d4b87d8619e0865d7089618839311ada9a2c1e0c9bc89f82ca6253e8151930f152c3fac7ad820ca747ed8427d008f9b04ad2b9e0a0e2b71 SHA512 ce56893796def1b7e8ae96cce90dda073ad84d657cd15d980ee14562a07f7522d438a40ac58422b6f6de7201a9f2678413018633529cb8dcc4e580cfe678c092 diff --git a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch b/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch deleted file mode 100644 index df29db3782d5..000000000000 --- a/net-analyzer/nmap/files/nmap-5.10_beta1-string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nmap-5.10BETA1/Target.h.org 2009-12-08 08:21:59.000000000 +0100 -+++ nmap-5.10BETA1/Target.h 2009-12-08 08:22:02.000000000 +0100 -@@ -99,6 +99,8 @@ - - #ifndef NOLUA - #include "nse_main.h" -+#else -+#include <string> - #endif - - #include "portreasons.h" diff --git a/net-analyzer/nmap/files/nmap-5.21-python.patch b/net-analyzer/nmap/files/nmap-5.21-python.patch deleted file mode 100644 index aa0d4f9db953..000000000000 --- a/net-analyzer/nmap/files/nmap-5.21-python.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in ---- nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.000000000 +0100 -+++ nmap-5.21/Makefile.in 2010-01-31 09:54:48.000000000 +0100 -@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE - - install-zenmap: $(ZENMAPDIR)/setup.py - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 -- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile - $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ - # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is - # already a link. -@@ -267,7 +267,7 @@ build-ndiff: - cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") - - install-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile - - NSE_FILES = scripts/script.db scripts/*.nse - NSE_LIB_LUA_FILES = nselib/*.lua diff --git a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch b/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch deleted file mode 100644 index 5aa9fa7f631c..000000000000 --- a/net-analyzer/nmap/files/nmap-6.25-liblua-ar.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/liblua/Makefile -+++ b/liblua/Makefile -@@ -11,7 +11,7 @@ - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - --AR= ar rcu -+AR= ar - RANLIB= ranlib - RM= rm -f - -@@ -56,7 +56,7 @@ - a: $(ALL_A) - - $(LUA_A): $(BASE_O) -- $(AR) $@ $(BASE_O) -+ $(AR) rcu $@ $(BASE_O) - $(RANLIB) $@ - - $(LUA_T): $(LUA_O) $(LUA_A) diff --git a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch b/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch deleted file mode 100644 index 6b43f8f5a069..000000000000 --- a/net-analyzer/nmap/files/nmap-6.46-uninstaller.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/zenmap/setup.py -+++ b/zenmap/setup.py -@@ -245,7 +245,6 @@ - self.set_perms() - self.set_modules_path() - self.fix_paths() -- self.create_uninstaller() - self.write_installed_files() - - def get_installed_files(self): -@@ -263,8 +262,6 @@ - os.path.join(self.install_data, data_dir)): - for dir in dirs: - installed_files.append(os.path.join(dirpath, dir)) -- installed_files.append( -- os.path.join(self.install_scripts, "uninstall_" + APP_NAME)) - return installed_files - - def create_uninstaller(self): diff --git a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch b/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch deleted file mode 100644 index 91caad1a6734..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-CXXFLAGS.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -477,7 +477,7 @@ - ./docs/style/lua-format -i scripts/*.nse - - makefile.dep: -- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@ -+ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@ - -include makefile.dep - - # These the old names of scripts that have been renamed or deleted. Any diff --git a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch b/net-analyzer/nmap/files/nmap-7.25-libpcre.patch deleted file mode 100644 index 9296dab7da7b..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-libpcre.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -522,7 +522,6 @@ - - # If we still don't have it, we use our own - if test $have_pcre != yes ; then -- AC_CONFIG_SUBDIRS( libpcre ) - CPPFLAGS="-I\$(top_srcdir)/$LIBPCREDIR $CPPFLAGS" - LIBPCRE_LIBS="$LIBPCREDIR/libpcre.a" - PCRE_BUILD="build-pcre" diff --git a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch b/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch deleted file mode 100644 index 85594038bf6f..000000000000 --- a/net-analyzer/nmap/files/nmap-7.25-no-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- a/nbase/Makefile.in -+++ b/nbase/Makefile.in -@@ -12,7 +12,7 @@ - CCOPT = - DEFS = @DEFS@ - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - CPPFLAGS = @CPPFLAGS@ - CFLAGS = @CFLAGS@ $(CCOPT) $(GLIB_CFLAGS) $(DEFS) $(INCLS) - STATIC = ---- a/ncat/Makefile.in -+++ b/ncat/Makefile.in -@@ -53,7 +53,7 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ -DNCAT_DATADIR="\"$(pkgdatadir)\"" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I. -I.. -I../nsock/include/ -I$(NBASEDIR) - RM = rm -f - STRIP = @STRIP@ ---- a/nsock/src/Makefile.in -+++ b/nsock/src/Makefile.in -@@ -13,7 +13,7 @@ - CCOPT = - DEFS = @DEFS@ -DNSOCK_VERSION=\"$(NSOCK_VERSION)\" - # With GCC, add extra security checks to source code. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - INCLS = -I../include - CFLAGS = @CFLAGS@ $(CCOPT) - # CFLAGS = -g -Wall $(DEFS) $(INCLS) ---- a/libnetutil/Makefile.in -+++ b/libnetutil/Makefile.in -@@ -5,7 +5,7 @@ - CXXFLAGS = @CXXFLAGS@ - CPPFLAGS = @CPPFLAGS@ $(DEFS) - DEFS = @DEFS@ --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - AR = ar - RANLIB = @RANLIB@ - ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,7 +41,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nping/Makefile.in -+++ b/nping/Makefile.in -@@ -38,7 +38,7 @@ - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html - # Level 1 only makes changes that don't affect "conforming" programs, - # while level 2 enforces additional restrictions. --DEFS += -D_FORTIFY_SOURCE=2 -+DEFS += - # For mtrace debugging -- see MTRACE define in main.cc for instructions - # Should only be enabled during debugging and not in any real release. - # DEFS += -DMTRACE=1 ---- a/nmap-update/Makefile.in -+++ b/nmap-update/Makefile.in -@@ -12,7 +12,7 @@ - LDFLAGS = @LDFLAGS@ - MAC_FLAGS = - LIBS = @LIBS@ $(NBASELIB) $(MAC_FLAGS) --DEFS = @DEFS@ -D_FORTIFY_SOURCE=2 -+DEFS = @DEFS@ - APR_LIBS = @APR_LIBS@ - SVN_LIBS = @SVN_LIBS@ - diff --git a/net-analyzer/nmap/files/nmap-7.31-libnl.patch b/net-analyzer/nmap/files/nmap-7.31-libnl.patch deleted file mode 100644 index c16d8291ea3b..000000000000 --- a/net-analyzer/nmap/files/nmap-7.31-libnl.patch +++ /dev/null @@ -1,15 +0,0 @@ -nping does not call anything nl_* related so it should not link against libnl (bug #529244) -Patching configure.ac would be best but eautoreconf does not handle the subdirs very well. - ---- a/nping/configure.ac -+++ b/nping/configure.ac -@@ -114,9 +114,6 @@ - # OpenSSL and NSE C modules can require dlopen - AC_SEARCH_LIBS(dlopen, dl) - --# libpcap can require libnl --AC_SEARCH_LIBS(nl_handle_alloc, nl) -- - # We test whether they specified openssl desires explicitly - use_openssl="yes" - specialssldir="" diff --git a/net-analyzer/nmap/files/nmap-7.70-time.patch b/net-analyzer/nmap/files/nmap-7.70-time.patch deleted file mode 100644 index 4b97bdf49049..000000000000 --- a/net-analyzer/nmap/files/nmap-7.70-time.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/nmap_error.cc -+++ b/nmap_error.cc -@@ -135,6 +135,7 @@ - #include "xml.h" - - #include <errno.h> -+#include <time.h> - - extern NmapOps o; - ---- a/nmap.cc -+++ b/nmap.cc -@@ -161,6 +161,7 @@ - #endif - - #include <fcntl.h> -+#include <time.h> - - #ifdef HAVE_PWD_H - #include <pwd.h> ---- a/osscan2.cc -+++ b/osscan2.cc -@@ -147,6 +147,7 @@ - - #include <list> - #include <math.h> -+#include <time.h> - - extern NmapOps o; - #ifdef WIN32 ---- a/output.cc -+++ b/output.cc -@@ -153,6 +153,7 @@ - #include "libnetutil/netutil.h" - - #include <math.h> -+#include <time.h> - - #include <set> - #include <vector> diff --git a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch b/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch deleted file mode 100644 index 583f7f1d1aa3..000000000000 --- a/net-analyzer/nmap/files/nmap-7.80-ac-config-subdirs.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -468,7 +468,6 @@ - fi - - if test $have_libpcap != yes; then -- AC_CONFIG_SUBDIRS(libpcap) - if test "${LIBPCAP_INC+set}" = "set"; then - CPPFLAGS="$CPPFLAGS -I$LIBPCAP_INC" - else -@@ -611,7 +610,6 @@ - fi - - if test $have_libz != yes; then -- AC_CONFIG_SUBDIRS(libz) - # TODO: This doesn't work because libssh2's configure script is looking for - # already-built libs. Giving up for now: build libz first or install - # headers/libs on your own if you want compression support for SSH. -@@ -697,7 +695,6 @@ - # If we still don't have it, we use our own - if test $have_libssh2 != yes; then - have_libssh2=yes -- AC_CONFIG_SUBDIRS(libssh2) - CPPFLAGS="-I\$(top_srcdir)/$LIBSSH2DIR/include $CPPFLAGS" - LIBSSH2_LIBS="$LIBSSH2DIR/lib/libssh2.a" - LIBSSH2_BUILD="build-libssh2" diff --git a/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch new file mode 100644 index 000000000000..bf6affb516d0 --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.94-autoconf-2.72.patch @@ -0,0 +1,33 @@ +https://github.com/nmap/nmap/pull/2763 +https://bugs.gentoo.org/920712 +--- a/libdnet-stripped/config/acinclude.m4 ++++ b/libdnet-stripped/config/acinclude.m4 +@@ -201,6 +201,8 @@ + dnl + AC_DEFUN(AC_DNET_IOCTL_ARP, + [AC_MSG_CHECKING(for arp(7) ioctls) ++ AC_PROG_EGREP ++ AC_PROG_CPP + AC_CACHE_VAL(ac_cv_dnet_ioctl_arp, + AC_EGREP_CPP(werd, [ + # include <sys/types.h> +--- a/libdnet-stripped/configure.in ++++ b/libdnet-stripped/configure.in +@@ -211,7 +211,7 @@ + AC_REPLACE_FUNCS(err strlcpy strsep) + + dnl Checks for other system-specific jonks. +-if test "$CYGWIN" != yes ; then ++AS_IF([test "$CYGWIN" != yes], [ + AC_DNET_BSD_BPF + AC_DNET_LINUX_PROCFS + AC_DNET_LINUX_PF_PACKET +@@ -221,7 +221,7 @@ + AC_DNET_RAWIP_HOST_OFFLEN + AC_DNET_RAWIP_COOKED + AC_DNET_GETKERNINFO +-fi ++]) + + dnl Check for arp interface. + if test "$ac_cv_header_Iphlpapi_h" = yes ; then diff --git a/net-analyzer/nmap/files/nmap-7.94-topport.patch b/net-analyzer/nmap/files/nmap-7.94-topport.patch new file mode 100644 index 000000000000..0ba568d317e3 --- /dev/null +++ b/net-analyzer/nmap/files/nmap-7.94-topport.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/918874 +https://github.com/nmap/nmap/issues/2655 +https://github.com/nmap/nmap/issues/2679 +https://github.com/nmap/nmap/commit/edad9c059ca45bccab8c0f41fe6fc6546c60153a + +From edad9c059ca45bccab8c0f41fe6fc6546c60153a Mon Sep 17 00:00:00 2001 +From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419> +Date: Thu, 20 Jul 2023 16:21:23 +0000 +Subject: [PATCH] Add missing braces. Fixes #2679 + +--- + services.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/services.cc b/services.cc +index a0899c7509..2a709dca97 100644 +--- a/services.cc ++++ b/services.cc +@@ -496,9 +496,10 @@ void gettoppts(double level, const char *portlist, struct scan_lists * ports, co + if (sctpmax && strcmp(current->s_proto, "sctp") == 0 + && (!ptsdata_initialized || + is_port_member(ptsdata.sctp_ports, ptsdata.sctp_count, current)) +- ) ++ ) { + ports->sctp_ports[ports->sctp_count++] = current->s_port; +- sctpmax--; ++ sctpmax--; ++ } + break; + default: + break; diff --git a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch b/net-analyzer/nmap/files/nmap-9999-netutil-else.patch deleted file mode 100644 index c9b3350d9865..000000000000 --- a/net-analyzer/nmap/files/nmap-9999-netutil-else.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libnetutil/netutil.cc -+++ b/libnetutil/netutil.cc -@@ -2571,7 +2571,7 @@ const char *ippackethdrinfo(const u8 *packet, u32 len, int detail) { - - /* CASE 4: where we (finally!) have a full 20 byte TCP header so we can - * safely print all fields */ -- else { /* if (datalen >= 20) */ -+ else if (datalen >= 20) { - - /* TCP Flags */ - p = tflags; diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index 37088b5933c3..c93c9fdc4493 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -1,18 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> + <name>Andreas K. Hüttel</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="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag> <flag name="nping">Install the nping utility</flag> <flag name="nse">Include support for the Nmap Scripting Engine (NSE)</flag> - <flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag> + <flag name="symlink">Install symlink to nc</flag> <flag name="zenmap">Install the GTK+ based nmap GUI, zenmap</flag> </use> + <upstream> + <remote-id type="github">nmap/nmap</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/nmap/nmap-7.70-r1.ebuild b/net-analyzer/nmap/nmap-7.70-r1.ebuild deleted file mode 100644 index f6b7e054ca37..000000000000 --- a/net-analyzer/nmap/nmap-7.70-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,xml" -inherit autotools flag-o-matic python-single-r1 toolchain-funcs - -MY_P=${P/_beta/BETA} - -DESCRIPTION="A utility for network discovery and security auditing" -HOMEPAGE="https://nmap.org/" -SRC_URI=" - https://nmap.org/dist/${MY_P}.tar.bz2 - https://dev.gentoo.org/~jer/nmap-logo-64.png -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -IUSE=" - ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua - zenmap -" -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -REQUIRED_USE=" - system-lua? ( nse ) - ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap? ( ${PYTHON_REQUIRED_USE} ) -" -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( net-libs/libssh2[zlib] ) - ndiff? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion - ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) - zenmap? ( - $(python_gen_cond_dep ' - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.70-time.patch -) -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use ndiff || use zenmap; then - python-single-r1_pkg_setup - fi -} - -src_unpack() { - # prevent unpacking the logo - unpack ${MY_P}.tar.bz2 -} - -src_prepare() { - rm -r libpcap/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - local lingua - if use nls; then - for lingua in ${NMAP_LINGUAS[@]}; do - if ! has ${lingua} ${LINGUAS-${lingua}}; then - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - fi - done - else - # configure/make ignores --disable-nls - for lingua in ${NMAP_LINGUAS[@]}; do - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - done - fi - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - - sed -i \ - -e '/rm -f $@/d' \ - $(find . -name Makefile.in) \ - || die - - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die - - sed -i \ - -e '/AC_CONFIG_SUBDIRS(libz)/d' \ - -e '/AC_CONFIG_SUBDIRS(libssh2)/d' \ - configure.ac - - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 - mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die - fi -} - -src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with ndiff) \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(use_with zenmap) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt - - if use zenmap; then - doicon "${DISTDIR}/nmap-logo-64.png" - python_optimize - fi -} diff --git a/net-analyzer/nmap/nmap-7.80-r1.ebuild b/net-analyzer/nmap/nmap-7.80-r1.ebuild deleted file mode 100644 index a742c24a2323..000000000000 --- a/net-analyzer/nmap/nmap-7.80-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,xml" -inherit autotools desktop flag-o-matic python-single-r1 toolchain-funcs user - -MY_P=${P/_beta/BETA} - -DESCRIPTION="A utility for network discovery and security auditing" -HOMEPAGE="https://nmap.org/" -SRC_URI=" - https://nmap.org/dist/${MY_P}.tar.bz2 - https://dev.gentoo.org/~jer/nmap-logo-64.png -" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -LICENSE="GPL-2" -SLOT="0" - -IUSE=" - ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua - zenmap -" -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -REQUIRED_USE=" - system-lua? ( nse ) - ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap? ( ${PYTHON_REQUIRED_USE} ) -" -RDEPEND=" - dev-libs/liblinear:= - dev-libs/libpcre - net-libs/libpcap - libssh2? ( - net-libs/libssh2[zlib] - sys-libs/zlib - ) - ndiff? ( ${PYTHON_DEPS} ) - nls? ( virtual/libintl ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion - ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) - zenmap? ( - $(python_gen_cond_dep ' - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] - ') - ${PYTHON_DEPS} - ) -" -DEPEND=" - ${RDEPEND} - nls? ( sys-devel/gettext ) -" -PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch -) -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use ndiff || use zenmap; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die - - cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - - default - - local lingua - if use nls; then - for lingua in ${NMAP_LINGUAS[@]}; do - if ! has ${lingua} ${LINGUAS-${lingua}}; then - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - fi - done - else - # configure/make ignores --disable-nls - for lingua in ${NMAP_LINGUAS[@]}; do - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - done - fi - - sed -i \ - -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ - Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die - - cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die - - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 - mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die - fi -} - -src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with ndiff) \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(use_with zenmap) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ -} - -src_compile() { - local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do - emake -C "${directory}" makefile.dep - done - - emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) -} - -src_install() { - LC_ALL=C emake -j1 \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi - - dodoc CHANGELOG HACKING docs/README docs/*.txt - - if use zenmap; then - doicon "${DISTDIR}/nmap-logo-64.png" - python_optimize - fi -} diff --git a/net-analyzer/nmap/nmap-7.94-r1.ebuild b/net-analyzer/nmap/nmap-7.94-r1.ebuild new file mode 100644 index 000000000000..b7291c14554c --- /dev/null +++ b/net-analyzer/nmap/nmap-7.94-r1.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{10..11} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools lua-single plocale python-single-r1 toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.94-patches + "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch + "${FILESDIR}"/${PN}-7.94-topport.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # We need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + if use ndiff || use zenmap ; then + python_optimize + fi + + use symlink && dosym /usr/bin/ncat /usr/bin/nc +} diff --git a/net-analyzer/nmap/nmap-7.94.ebuild b/net-analyzer/nmap/nmap-7.94.ebuild new file mode 100644 index 000000000000..ffeeafdf2411 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.94.ebuild @@ -0,0 +1,188 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +PYTHON_COMPAT=( python3_{10..11} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools lua-single plocale python-single-r1 toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.94-patches.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.94-patches + "${FILESDIR}"/${PN}-7.94-autoconf-2.72.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # We need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + if use ndiff || use zenmap ; then + python_optimize + fi + + use symlink && dosym /usr/bin/ncat /usr/bin/nc +} diff --git a/net-analyzer/nmap/nmap-7.95.ebuild b/net-analyzer/nmap/nmap-7.95.ebuild new file mode 100644 index 000000000000..82218df92303 --- /dev/null +++ b/net-analyzer/nmap/nmap-7.95.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools distutils-r1 lua-single plocale toolchain-funcs + +DESCRIPTION="Network exploration tool and security / port scanner" +HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/nmap/nmap" + +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig + + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) +" + +RDEPEND=" + dev-libs/liblinear:= + dev-libs/libpcre2 + net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) + libssh2? ( + net-libs/libssh2[zlib] + sys-libs/zlib + ) + nls? ( virtual/libintl ) + nse? ( + ${LUA_DEPS} + sys-libs/zlib + ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) + ) + zenmap? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + +PATCHES=( + "${WORKDIR}"/${PN}-7.95-patches-2 +) + +pkg_setup() { + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} + fi + + default +} + +src_prepare() { + default + + # Drop bundled libraries + rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die + + cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die + + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale + + sed -i \ + -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ + Makefile.in || die + + cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die + + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # We need the original for a Darwin-specific fix, bug #604432 + mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die + fi +} + +src_configure() { + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + python_setup + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + local directory + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do + emake -C "${directory}" makefile.dep + done + + emake \ + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default +} + +src_install() { + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ + DESTDIR="${D}" \ + STRIP=: \ + nmapdatadir="${EPREFIX}"/usr/share/nmap \ + install + + dodoc CHANGELOG HACKING docs/README docs/*.txt + + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then + python_optimize + fi + + if use zenmap ; then + distutils-r1_src_install + fi +} diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index 7f9ceb695c1b..0fa4d25ff5fa 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.ebuild @@ -1,182 +1,206 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite,xml" -inherit autotools desktop flag-o-matic git-r3 python-single-r1 toolchain-funcs user +EAPI=8 -MY_P=${P/_beta/BETA} +LUA_COMPAT=( lua5-4 ) +LUA_REQ_USE="deprecated" +DISTUTILS_OPTIONAL=1 +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +PLOCALES="de es fr hi hr hu id it ja pl pt_BR pt_PR ro ru sk zh" +PLOCALE_BACKUP="en" +inherit autotools distutils-r1 lua-single plocale toolchain-funcs -DESCRIPTION="A utility for network discovery and security auditing" +DESCRIPTION="Network exploration tool and security / port scanner" HOMEPAGE="https://nmap.org/" +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 -EGIT_REPO_URI="https://github.com/nmap/nmap" -SRC_URI="https://dev.gentoo.org/~jer/nmap-logo-64.png" + EGIT_REPO_URI="https://github.com/nmap/nmap" -LICENSE="GPL-2" -SLOT="0" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/nmap.asc + inherit verify-sig -IUSE=" - ipv6 libressl libssh2 ncat ndiff nls nmap-update nping +nse ssl system-lua - zenmap -" -NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) + SRC_URI="https://nmap.org/dist/${P}.tar.bz2" + SRC_URI+=" verify-sig? ( https://nmap.org/dist/sigs/${P}.tar.bz2.asc )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-7.95-patches-2.tar.xz" + +# https://github.com/nmap/nmap/issues/2199 +LICENSE="NPSL-0.95" +SLOT="0" +IUSE="ipv6 libssh2 ncat ndiff nping nls +nse ssl symlink zenmap" REQUIRED_USE=" - system-lua? ( nse ) - ndiff? ( ${PYTHON_REQUIRED_USE} ) - zenmap? ( ${PYTHON_REQUIRED_USE} ) + ${PYTHON_REQUIRED_USE} + nse? ( ${LUA_REQUIRED_USE} ) + symlink? ( ncat ) " + RDEPEND=" dev-libs/liblinear:= - dev-libs/libpcre + dev-libs/libpcre2 net-libs/libpcap + ndiff? ( ${PYTHON_DEPS} ) libssh2? ( net-libs/libssh2[zlib] sys-libs/zlib ) - ndiff? ( ${PYTHON_DEPS} ) nls? ( virtual/libintl ) - nmap-update? ( - dev-libs/apr - dev-vcs/subversion + nse? ( + ${LUA_DEPS} + sys-libs/zlib ) - nse? ( sys-libs/zlib ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) + ssl? ( dev-libs/openssl:= ) + symlink? ( + ncat? ( + !net-analyzer/netcat + !net-analyzer/openbsd-netcat + ) ) - system-lua? ( >=dev-lang/lua-5.2:*[deprecated] ) zenmap? ( + ${PYTHON_DEPS} $(python_gen_cond_dep ' - dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] ') - ${PYTHON_DEPS} ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +# Python is always needed at build time for some scripts +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig nls? ( sys-devel/gettext ) + zenmap? ( ${DISTUTILS_DEPS} ) " + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-nmap )" +fi + PATCHES=( - "${FILESDIR}"/${PN}-5.10_beta1-string.patch - "${FILESDIR}"/${PN}-5.21-python.patch - "${FILESDIR}"/${PN}-6.46-uninstaller.patch - "${FILESDIR}"/${PN}-6.25-liblua-ar.patch - "${FILESDIR}"/${PN}-7.25-no-FORTIFY_SOURCE.patch - "${FILESDIR}"/${PN}-7.25-CXXFLAGS.patch - "${FILESDIR}"/${PN}-7.25-libpcre.patch - "${FILESDIR}"/${PN}-7.31-libnl.patch - "${FILESDIR}"/${PN}-7.80-ac-config-subdirs.patch - "${FILESDIR}"/${PN}-9999-netutil-else.patch + "${WORKDIR}"/${PN}-7.95-patches-2 ) -S="${WORKDIR}/${MY_P}" pkg_setup() { - if use ndiff || use zenmap; then - python-single-r1_pkg_setup + use nse && lua-single_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc} fi + + default } src_prepare() { + default + + # Drop bundled libraries rm -r liblinear/ libpcap/ libpcre/ libssh2/ libz/ || die cat "${FILESDIR}"/nls.m4 >> "${S}"/acinclude.m4 || die - default - - local lingua - if use nls; then - for lingua in ${NMAP_LINGUAS[@]}; do - if ! has ${lingua} ${LINGUAS-${lingua}}; then - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - fi - done - else - # configure/make ignores --disable-nls - for lingua in ${NMAP_LINGUAS[@]}; do - rm -r zenmap/share/zenmap/locale/${lingua} || die - rm zenmap/share/zenmap/locale/${lingua}.po || die - done - fi + delete_disabled_locale() { + # Force here as PLOCALES contains supported locales for man + # pages and zenmap doesn't have all of those + rm -rf zenmap/share/zenmap/locale/${1} || die + rm -f zenmap/share/zenmap/locale/${1}.po || die + } + plocale_for_each_disabled_locale delete_disabled_locale sed -i \ -e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \ Makefile.in || die - # Fix desktop files wrt bug #432714 - sed -i \ - -e 's|^Categories=.*|Categories=Network;System;Security;|g' \ - zenmap/install_scripts/unix/zenmap-root.desktop \ - zenmap/install_scripts/unix/zenmap.desktop || die cp libdnet-stripped/include/config.h.in{,.nmap-orig} || die eautoreconf if [[ ${CHOST} == *-darwin* ]] ; then - # we need the original for a Darwin-specific fix, bug #604432 + # We need the original for a Darwin-specific fix, bug #604432 mv libdnet-stripped/include/config.h.in{.nmap-orig,} || die fi } src_configure() { - # The bundled libdnet is incompatible with the version available in the - # tree, so we cannot use the system library here. - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - $(use_with libssh2) \ - $(use_with ncat) \ - $(use_with ndiff) \ - $(use_with nmap-update) \ - $(use_with nping) \ - $(use_with ssl openssl) \ - $(use_with zenmap) \ - $(usex libssh2 --with-zlib) \ - $(usex nse --with-zlib) \ - $(usex nse --with-liblua=$(usex system-lua /usr included '' '') --without-liblua) \ - --cache-file="${S}"/config.cache \ - --with-libdnet=included \ - --with-pcre=/usr - # Commented out because configure does weird things - # --with-liblinear=/usr \ + export ac_cv_path_PYTHON="${PYTHON}" + export am_cv_pathless_PYTHON="${EPYTHON}" + + python_setup + + local myeconfargs=( + $(use_enable ipv6) + $(use_enable nls) + $(use_with libssh2) + $(use_with ncat) + $(use_with ndiff) + $(use_with nping) + $(use_with nse liblua) + $(use_with ssl openssl) + $(use_with zenmap) + $(usex libssh2 --with-zlib) + $(usex nse --with-zlib) + --cache-file="${S}"/config.cache + # The bundled libdnet is incompatible with the version available in the + # tree, so we cannot use the system library here. + --with-libdnet=included + --with-pcre="${ESYSROOT}"/usr + --without-dpdk + ) + + econf "${myeconfargs[@]}" } src_compile() { local directory - for directory in . libnetutil nsock/src \ - $(usex ncat ncat '') \ - $(usex nmap-update nmap-update '') \ - $(usex nping nping '') - do + for directory in . libnetutil nsock/src $(usev ncat) $(usev nping) ; do emake -C "${directory}" makefile.dep done emake \ - AR=$(tc-getAR) \ - RANLIB=$(tc-getRANLIB) + AR="$(tc-getAR)" \ + RANLIB="$(tc-getRANLIB)" + + if use zenmap ; then + cd zenmap || die + distutils-r1_src_compile + fi +} + +src_test() { + local -x PATH="${S}:${PATH}" + + default } src_install() { - LC_ALL=C emake -j1 \ + # See bug #831713 for return of -j1 + LC_ALL=C emake \ + -j1 \ DESTDIR="${D}" \ STRIP=: \ nmapdatadir="${EPREFIX}"/usr/share/nmap \ install - if use nmap-update;then - LC_ALL=C emake -j1 \ - -C nmap-update \ - DESTDIR="${D}" \ - STRIP=: \ - nmapdatadir="${EPREFIX}"/usr/share/nmap \ - install - fi dodoc CHANGELOG HACKING docs/README docs/*.txt - if use zenmap; then - doicon "${DISTDIR}/nmap-logo-64.png" + use symlink && dosym /usr/bin/ncat /usr/bin/nc + + if use ndiff ; then python_optimize fi + + if use zenmap ; then + distutils-r1_src_install + fi } diff --git a/net-analyzer/nmapsi/Manifest b/net-analyzer/nmapsi/Manifest index 043ba6ae22be..75384d6b253d 100644 --- a/net-analyzer/nmapsi/Manifest +++ b/net-analyzer/nmapsi/Manifest @@ -1 +1 @@ -DIST nmapsi4-0.5-alpha1.tar.xz 3163140 BLAKE2B 3ad390057c0d0c465c8b361a4c64f7682a596201a3e26f5b8c873e76cf5cdfeb327f961a72cfa921d666bce3dc5dd8feb44e67e277c6d982b930054e6620d97e SHA512 fa4e604aeb6b342dec7e3fc85d83eda04385bd49a8d53b88e1eec2878c2c3410575a3ae59c59e6cd8e2b9f83de204f895a128d1cf3e7cccbd6bd7b78abd7dcfb +DIST nmapsi-0.5_alpha2.tar.gz 3547174 BLAKE2B a02d60c9be2d99e46104a81502bc98a0be9892a1cd1efbb5768b420a4275ea235e89c0e331797ec4ce733631cb763f6299a7d6079055bbaec17674107c4cf768 SHA512 29f6dd383808b253fa50fe0ca25c5189e106e79a0c6aac9351b8969eec2fd0aca7a329c49acf07c04ccd079a2ae66ad0b218a066762abe21165f1c25622a50f2 diff --git a/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch b/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch new file mode 100644 index 000000000000..38c73b68cbb7 --- /dev/null +++ b/net-analyzer/nmapsi/files/nmapsi-0.5_alpha2-no-qtscript.patch @@ -0,0 +1,18 @@ +--- a/CMakeLists.txt 2020-05-10 15:37:19.000000000 +0200 ++++ b/CMakeLists.txt 2023-10-24 21:28:56.198123618 +0200 +@@ -18,7 +18,6 @@ + Network + WebEngineWidgets + DBus +- Script + LinguistTools + Quick + Qml +@@ -31,7 +30,6 @@ + Widgets + Network + WebEngineWidgets +- Script + LinguistTools + Quick + Qml diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml index 3b15d70c8fe0..381cc3b5fbd8 100644 --- a/net-analyzer/nmapsi/metadata.xml +++ b/net-analyzer/nmapsi/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>qt@gentoo.org</email> - <name>Gentoo Qt Project</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">nmapsi4/nmapsi4</remote-id> <remote-id type="sourceforge">nmapsi</remote-id> diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild deleted file mode 100644 index 0da2c99b83b4..000000000000 --- a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PLOCALES="ca cs de es fr it ru" - -inherit cmake-utils l10n - -MY_P=${PN}4-${PV/_/-} - -DESCRIPTION="A Qt frontend to nmap" -HOMEPAGE="http://www.nmapsi4.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtscript:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 -" -DEPEND="${CDEPEND} - dev-qt/linguist-tools:5 -" -RDEPEND="${CDEPEND} - net-analyzer/nmap - net-dns/bind-tools -" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS HACKING README.md TODO Translation ) - -nmapsi_disable_locale() { - sed -i -e "/ts\/${PN}4_${1}\.ts/d" src/CMakeLists.txt || die -} - -src_prepare() { - l10n_for_each_disabled_locale_do nmapsi_disable_locale - cmake-utils_src_prepare -} diff --git a/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild new file mode 100644 index 000000000000..6cf6b4ca36cc --- /dev/null +++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha2-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt frontend to nmap" +HOMEPAGE="https://github.com/nmapsi4/nmapsi4" +SRC_URI="https://github.com/nmapsi4/nmapsi4/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}4-${PV/_/-}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 +" +RDEPEND="${DEPEND} + net-analyzer/nmap + net-dns/bind-tools +" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( AUTHORS HACKING README.md TODO Translation ) + +PATCHES=( "${FILESDIR}/${P}-no-qtscript.patch" ) diff --git a/net-analyzer/nmbscan/metadata.xml b/net-analyzer/nmbscan/metadata.xml index 6d85f89a0e7e..6f655e109486 100644 --- a/net-analyzer/nmbscan/metadata.xml +++ b/net-analyzer/nmbscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription> diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild index 349320409573..763b105c51e1 100644 --- a/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild +++ b/net-analyzer/nmbscan/nmbscan-1.2.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,13 +9,13 @@ SRC_URI="http://nmbscan.g76r.eu/down/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86" RDEPEND="net-dns/bind-tools net-fs/samba net-misc/iputils sys-apps/net-tools - virtual/awk" + app-alternatives/awk" S=${WORKDIR} PATCHES=( "${FILESDIR}"/${P}-head.diff ) diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest new file mode 100644 index 000000000000..79d92d27ff5d --- /dev/null +++ b/net-analyzer/notus-scanner/Manifest @@ -0,0 +1 @@ +DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522 diff --git a/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch new file mode 100644 index 000000000000..e2d3192ed295 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch @@ -0,0 +1,75 @@ +Remove tests that use files not allowed by Sandbox. +Patch by Giuseppe Foti + +--- a/tests/cli/test_cli_parser.py ++++ b/tests/cli/test_cli_parser.py +@@ -28,69 +28,6 @@ class CliParserTestCase(unittest.TestCase): + def parse_args(self, args: List[str]) -> Arguments: + return self.parser.parse_arguments(args) + +- def test_mqtt_broker(self): +- args = self.parse_args(["--mqtt-broker-address=localhost"]) +- self.assertEqual("localhost", args.mqtt_broker_address) +- +- args = self.parse_args(["-b", "localhost"]) +- self.assertEqual("localhost", args.mqtt_broker_address) +- +- def test_mqtt_broker_port(self): +- args = self.parse_args(["--mqtt-broker-port=12345"]) +- self.assertEqual(args.mqtt_broker_port, 12345) +- +- args = self.parse_args(["-p", "12345"]) +- self.assertEqual(args.mqtt_broker_port, 12345) +- +- def test_correct_upper_case_log_level(self): +- args = self.parse_args(["--log-level=ERROR"]) +- self.assertEqual("ERROR", args.log_level) +- +- def test_correct_lower_case_log_level(self): +- args = self.parse_args(["-L", "info"]) +- self.assertEqual("INFO", args.log_level) +- +- def test_advisories_directory(self): +- args = self.parse_args(["--products-directory=/tmp"]) +- self.assertEqual(Path("/tmp"), args.products_directory) +- +- def test_pid_file(self): +- args = self.parse_args(["--pid-file=/foo/bar"]) +- self.assertEqual(args.pid_file, "/foo/bar") +- +- def test_log_file(self): +- args = self.parse_args(["--log-file=/foo/bar"]) +- self.assertEqual(args.log_file, "/foo/bar") +- +- args = self.parse_args(["-l", "/foo/bar"]) +- self.assertEqual(args.log_file, "/foo/bar") +- +- def test_foreground(self): +- args = self.parse_args(["--foreground"]) +- self.assertTrue(args.foreground) +- +- args = self.parse_args(["-f"]) +- self.assertTrue(args.foreground) +- +- def test_disable_hashsum_verification(self): +- args = self.parse_args(["--disable-hashsum-verification=true"]) +- self.assertTrue(args.disable_hashsum_verification) +- +- def test_defaults(self): +- args = self.parse_args([]) +- +- self.assertEqual( +- args.products_directory, Path(DEFAULT_PRODUCTS_DIRECTORY) +- ) +- self.assertIsNone(args.config) +- self.assertIsNone(args.log_file) +- self.assertEqual(args.log_level, DEFAULT_LOG_LEVEL) +- self.assertEqual(args.mqtt_broker_port, DEFAULT_MQTT_BROKER_PORT) +- self.assertEqual(args.mqtt_broker_address, DEFAULT_MQTT_BROKER_ADDRESS) +- self.assertEqual(args.pid_file, DEFAULT_PID_FILE) +- self.assertEqual(args.disable_hashsum_verification, False) +- self.assertFalse(args.foreground) +- + def test_config_file_provide_mqtt_broker_address(self): + with tempfile.NamedTemporaryFile() as fp: + fp.write(b"[notus-scanner]\nmqtt-broker-address='1.2.3.4'") diff --git a/net-analyzer/notus-scanner/files/notus-scanner.initd b/net-analyzer/notus-scanner/files/notus-scanner.initd new file mode 100644 index 000000000000..8af378b20fd6 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.initd @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${NOTUS_TIMEOUT:=30} + +name="Greenbone Notus Scanner" +command=/usr/bin/notus-scanner +command_user="${GVM_USER}:${GVM_GROUP}" +pidfile="/run/notus-scanner/${RC_SVCNAME}.pid" +configfile="/etc/gvm/notus-scanner.toml" +command_args="--pid-file ${pidfile} \ + --config ${configfile}" +retry="${NOTUS_TIMEOUT}" + +depend() { + after bootmisc + need localmount mosquitto +} + +start_pre() { + checkpath -d --owner ${GVM_USER} /run/notus-scanner +} + +start_post() { + ewaitfile 10 ${pidfile} + checkpath -d --owner root:root /run/notus-scanner + checkpath -f --owner root:root ${pidfile} +} diff --git a/net-analyzer/notus-scanner/files/notus-scanner.service.conf b/net-analyzer/notus-scanner/files/notus-scanner.service.conf new file mode 100644 index 000000000000..aea5c10e8fad --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.service.conf @@ -0,0 +1,7 @@ +[Unit] +PartOf=gvm.target + +[Service] +Type=forking +ExecStart= +ExecStart=/usr/bin/notus-scanner diff --git a/net-analyzer/notus-scanner/files/notus-scanner.toml b/net-analyzer/notus-scanner/files/notus-scanner.toml new file mode 100644 index 000000000000..a266784ed163 --- /dev/null +++ b/net-analyzer/notus-scanner/files/notus-scanner.toml @@ -0,0 +1,8 @@ +[notus-scanner] +mqtt-broker-address = "localhost" +mqtt-broker-port = "1883" +products-directory = "/var/lib/notus/products" +pid-file = "/run/notus-scanner/notus-scanner.pid" +log-file = "/var/log/gvm/notus-scanner.log" +log-level = "INFO" +disable-hashsum-verification = true diff --git a/net-analyzer/notus-scanner/metadata.xml b/net-analyzer/notus-scanner/metadata.xml new file mode 100644 index 000000000000..06038ba8d06e --- /dev/null +++ b/net-analyzer/notus-scanner/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + This is a new scanner that scans after every regular scan, so no user interaction is necessary. + It offers better performance due to less system resource consumption and thus, faster scanning. + </longdescription> + <upstream> + <remote-id type="github">greenbone/notus-scanner</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild new file mode 100644 index 000000000000..f62ecf25aaa3 --- /dev/null +++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 readme.gentoo-r1 systemd + +DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks" +HOMEPAGE="https://github.com/greenbone/notus-scanner" +SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="AGPL-3 AGPL-3+" +KEYWORDS="amd64 ~x86" + +DEPEND=" + acct-user/gvm + net-libs/paho-mqtt-c + >=dev-python/psutil-5.9[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}] + <dev-python/packaging-24.1[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + <dev-python/tomli-3[${PYTHON_USEDEP}] +" + +RDEPEND=" + ${DEPEND} + app-misc/mosquitto +" + +PATCHES=( + "${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch +) + +DOC_CONTENTS=" +For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created. +Please, read here on how to create it: +https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation +https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner + +To enable feed validation, edit /etc/gvm/${PN}.toml +and set +disable-hashsum-verification = false" +DISABLE_AUTOFORMATTING=true + +distutils_enable_tests unittest + +python_compile() { + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + use prefix || fowners -R gvm:gvm /etc/gvm + newins "${FILESDIR}/${PN}.toml" "${PN}.toml" + use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml" + + # Set proper permissions on required files/directories + keepdir /var/lib/notus + keepdir /var/lib/notus/products + keepdir /var/lib/notus/advisories + if ! use prefix; then + fowners -R gvm:gvm /var/lib/notus + fi + + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + + systemd_dounit config/${PN}.service + + systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \ + ${PN}.service + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/net-analyzer/nrpe/Manifest b/net-analyzer/nrpe/Manifest index e036a22c560b..f81d01f00913 100644 --- a/net-analyzer/nrpe/Manifest +++ b/net-analyzer/nrpe/Manifest @@ -1,2 +1,4 @@ -DIST nrpe-3.2.1.tar.gz 518015 BLAKE2B c9be2bf24e3d9977a7ff5c2f0e08bfe841729289af836bb7ac6ccb2c173a519958b12cc3e90ece612ac6c2527ad472ef1464be648a66b11ff8ad483d5ad78cc1 SHA512 ec6ff42a00bd97ed80010a82e26dc35fd419f2feda65820cda0108068173c1ae44eee698833a50fd2079429a6f5eb1321c4f06b09c6708bc5fbe48f176389856 DIST nrpe-4.0.0.tar.gz 523846 BLAKE2B 850a420f0550e1dfe6b0ea98a9d9cafec0ec583c115be89b3ba8e88a309c40226c87f6ae880d12c582822e492c5991e3d2444b68f5644750fc74ad75596c96fd SHA512 8773102f28f3e7e96f3637e77489eb12ffe88fe839abfe3f150d2eb3d2efe05f7f812ab4d52a64cbd8d0a5e491aed93d5300b7ce9a8dd072b3a00d885b91276b +DIST nrpe-4.0.2.tar.gz 524146 BLAKE2B dc100579420eeccaaa2a913f56c76b86b6ebdce8d1afdddcc428bfd4a8c12ad19050ab0395e7a109d4e8b43ca7d6a11e13ec4a4250a91483e37725c184382ca2 SHA512 4d7cf6abc974bc79df54afc42644418e3f086a279c8c17d0fd104f19e3c21c0f3dae4fb4268dd134446ff9fe505159b0446372c5cac71cfe03a97479ed41c09b +DIST nrpe-4.0.3.tar.gz 524160 BLAKE2B d2c99cadf718e7049c911388b105fb4f5248307c733d94a73fd02ac69c49be230dad58be0a182af9c8d7e0d1f34e8dba6b8fc46a7c01eb15d845f2b3a54499ed SHA512 31d932c481c8a53bd0f8865fb3cfeeb1466b9b05fa89382aa056aa9343a09843b51fe5398fd0388e6bba99e9c3d8093f6033799fd83afd43012bfe8fdc5a33e3 +DIST nrpe-4.1.0.tar.gz 528228 BLAKE2B a8890eef9f32e43417270eb80dcb9eedf1272d70d2dad73fecd855565358fbe9cb1d716fe0b79270310c2c5097eba3ffc7f786c89eecae9f6b84d2fbb43d3e0f SHA512 a47935eecc65d646737166f98f5f160e3d1d5bbd245e006e8cd0758af75db083f870db6c02c1edd0d44cf9a91909ba26df8eee1620a7ac4d9f98032f2cce8981 diff --git a/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch b/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch new file mode 100644 index 000000000000..7140c43d7e8c --- /dev/null +++ b/net-analyzer/nrpe/files/nrpe-4.0.2-disable-tcpd.patch @@ -0,0 +1,62 @@ +Stripped ./configure portion for Gentoo, instead relying on eautoreconf. + +From 8bce40cff68c0a7d88b465eb345267ad5176461a Mon Sep 17 00:00:00 2001 +From: Jaco Kroon <jaco@iewc.co.za> +Date: Mon, 8 Feb 2021 17:07:30 +0200 +Subject: [PATCH] Patch to allow passing --enable-tcpd or --disable-tcpd. + +If passing --enable-tcpd and libwrap is not available, ./configure will +fail. + +If passing --disable-tcpd, libwrap will be completely ignore. + +If not passed, current behaviour still applies. + +Signed-off-by: Jaco Kroon <jaco@iewc.co.za> +--- + configure.ac | 28 +++++++++++++++++++++++----- + 2 files changed, 52 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 3981bb0..e3c1a15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -237,12 +237,30 @@ AC_CHECK_FUNCS([getopt_long],,AC_CHECK_LIB([iberty],[getopt_long],OTHERLIBS="$OT + dnl Checks for library functions. + AC_CHECK_LIB(nsl,main,SOCKETLIBS="$SOCKETLIBS -lnsl") + AC_CHECK_LIB(socket,socket,SOCKETLIBS="$SOCKETLIBS -lsocket") +-AC_CHECK_LIB(wrap,main,[ +- LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" +- AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) +- AC_TRY_LINK([#include <tcpd.h> +- ],[int a = rfc931_timeout;],AC_DEFINE(HAVE_RFC931_TIMEOUT)) ++ ++AC_ARG_ENABLE([tcpd], ++ AS_HELP_STRING([--disable-tcpd],[disables support for tcpd even if present]),[ ++ if test x$enableval = xyes; then ++ check_for_tcpd=yes ++ else ++ check_for_tcpd=no ++ fi ++ ],check_for_tcpd=optional) ++ ++AC_MSG_CHECKING(check_for_tcpd=$check_for_tcpd) ++if test x$check_for_tcpd != xno; then ++ AC_CHECK_LIB(wrap,main,[ ++ LIBWRAPLIBS="$LIBWRAPLIBS -lwrap" ++ AC_DEFINE(HAVE_LIBWRAP,[1],[Have the TCP wrappers library]) ++ AC_TRY_LINK([#include <tcpd.h> ++ ],[int a = rfc931_timeout;],AC_DEFINE(HAVE_RFC931_TIMEOUT)) ++ ],[ ++ if test x$check_for_tcpd = xyes; then ++ AC_MSG_ERROR(--enable-tcpd specified but unable to locate libwrap.) ++ fi + ]) ++fi ++ + AC_CHECK_FUNCS(strdup strstr strtoul strtok_r initgroups closesocket sigaction scandir) + + dnl socklen_t check - from curl +-- +2.26.2 + diff --git a/net-analyzer/nrpe/files/nrpe.init b/net-analyzer/nrpe/files/nrpe.init deleted file mode 100644 index bb7e34ef22e7..000000000000 --- a/net-analyzer/nrpe/files/nrpe.init +++ /dev/null @@ -1,49 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${CFGFILE:=/etc/nagios/nrpe.cfg} - -get_config() { - [ -f ${CFGFILE} ] || return 1 - - sed -n -e 's:^[ \t]*'$1'=\([^#]\+\).*:\1:p' \ - ${CFGFILE} -} - -extra_started_commands="reload" - -command=/usr/libexec/${SVCNAME} -command_args="-c ${CFGFILE} --daemon" -pidfile=$(get_config pid_file) - -depend() { - config ${CFGFILE} -} - -reload() { - ebegin "Reloading ${SVCNAME}" - kill -1 `cat ${pidfile}` - eend $? -} - -start() -{ - mkdir -p $(dirname $pidfile) - local _background= - ebegin "Starting ${name:-$RC_SVCNAME}" - eval start-stop-daemon --start \ - --exec $command \ - ${procname:+--name} $procname \ - ${pidfile:+--pidfile} $pidfile \ - $_background $start_stop_daemon_args \ - -- $command_args - if eend $? "Failed to start $RC_SVCNAME"; then - service_set_value "command" "${command}" - [ -n "${pidfile}" ] && service_set_value "pidfile" "${pidfile}" - [ -n "${procname}" ] && service_set_value "procname" "${procname}" - return 0 - fi - return 1 -} - diff --git a/net-analyzer/nrpe/files/nrpe.service b/net-analyzer/nrpe/files/nrpe.service deleted file mode 100644 index f6546d703cd4..000000000000 --- a/net-analyzer/nrpe/files/nrpe.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Daemon to answer plugin requests from Nagios on remote hosts -After=network.target -Requires=network.target - -[Service] -Type=forking -ExecStart=/usr/libexec/nrpe -c /etc/nagios/nrpe.cfg -d - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml index 6d48b12e1abf..1876e4216dde 100644 --- a/net-analyzer/nrpe/metadata.xml +++ b/net-analyzer/nrpe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -17,6 +17,7 @@ </flag> </use> <upstream> + <remote-id type="github">NagiosEnterprises/nrpe</remote-id> <remote-id type="sourceforge">nagios</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/nrpe/nrpe-4.0.0.ebuild b/net-analyzer/nrpe/nrpe-4.0.0.ebuild index 0dad49acfdf5..1012fda39070 100644 --- a/net-analyzer/nrpe/nrpe-4.0.0.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,16 +10,13 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="command-args libressl selinux ssl" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl" DEPEND="acct-group/nagios acct-user/nagios sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND} || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )" @@ -78,7 +75,7 @@ src_install() { rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' } -pkg_postinst(){ +pkg_postinst() { elog 'Some users have reported incompatibilities between nrpe-2.x and' elog 'nrpe-3.x. We recommend that you use the same major version for' elog 'both your server and clients.' diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild b/net-analyzer/nrpe/nrpe-4.0.2.ebuild index 0dad49acfdf5..750ad02c972e 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r3.ebuild +++ b/net-analyzer/nrpe/nrpe-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,15 +11,12 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="command-args libressl selinux ssl" +IUSE="command-args selinux ssl" DEPEND="acct-group/nagios acct-user/nagios sys-apps/tcp-wrappers - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - )" + ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND} || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) selinux? ( sec-policy/selinux-nagios )" @@ -75,10 +72,11 @@ src_install() { insinto /etc/xinetd.d/ newins "${FILESDIR}/nrpe.xinetd.2" nrpe - rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' } -pkg_postinst(){ +pkg_postinst() { elog 'Some users have reported incompatibilities between nrpe-2.x and' elog 'nrpe-3.x. We recommend that you use the same major version for' elog 'both your server and clients.' diff --git a/net-analyzer/nrpe/nrpe-4.0.3.ebuild b/net-analyzer/nrpe/nrpe-4.0.3.ebuild new file mode 100644 index 000000000000..27d333e85049 --- /dev/null +++ b/net-analyzer/nrpe/nrpe-4.0.3.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools systemd + +DESCRIPTION="Nagios Remote Plugin Executor" +HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" +SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl tcpd" + +DEPEND="acct-group/nagios + acct-user/nagios + tcpd? ( + sys-apps/tcp-wrappers + ) + ssl? ( + dev-libs/openssl:= + )" +RDEPEND="${DEPEND} + || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins ) + selinux? ( sec-policy/selinux-nagios )" + +PATCHES=( + "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" + "${FILESDIR}/nrpe-4.0.2-disable-tcpd.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # The configure script tries to detect what OS, distribution, and + # init system you're running and changes the build/install process + # depending on what it comes up with. We specify fixed values + # because we don't want it guessing, for example, whether or not + # to install the tmpfiles.d entry based on whether or not systemd + # is currently running (OpenRC uses them too). + # + # Note: upstream defaults to using "nagios" as the default NRPE + # user and group. I have a feeling that this isn't quite correct + # on a system where "nagios" is also the user running the nagios + # server daemon. In the future, it would be nice if someone who + # actually uses NRPE could test with an unprivileged "nrpe" as + # the user and group. + econf \ + --libexecdir=/usr/$(get_libdir)/nagios/plugins \ + --localstatedir=/var/lib/nagios \ + --sysconfdir=/etc/nagios \ + --with-nrpe-user=nagios \ + --with-nrpe-group=nagios \ + --with-piddir=/run \ + --with-opsys=unknown \ + --with-dist-type=unknown \ + --with-init-type=unknown \ + --with-inetd-type=unknown \ + $(use_enable command-args) \ + $(use_enable ssl) \ + $(use_enable tcpd) +} + +src_compile() { + emake all +} + +src_install() { + default + + dodoc CHANGELOG.md SECURITY.md + insinto /etc/nagios + newins sample-config/nrpe.cfg nrpe.cfg + fowners root:nagios /etc/nagios/nrpe.cfg + fperms 0640 /etc/nagios/nrpe.cfg + + newinitd "startup/openrc-init" nrpe + newconfd "startup/openrc-conf" nrpe + systemd_newunit "startup/default-service" "${PN}.service" + + insinto /etc/xinetd.d/ + newins "${FILESDIR}/nrpe.xinetd.2" nrpe + + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' +} + +pkg_postinst() { + if use command-args ; then + ewarn '' + ewarn 'You have enabled command-args for NRPE. That lets clients' + ewarn 'supply arguments to the commands that are run, and IS A' + ewarn 'SECURITY RISK!' + ewarn '' + fi +} diff --git a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild b/net-analyzer/nrpe/nrpe-4.1.0.ebuild index a40bedffbd07..8d9091865841 100644 --- a/net-analyzer/nrpe/nrpe-3.2.1-r1.ebuild +++ b/net-analyzer/nrpe/nrpe-4.1.0.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit systemd user +EAPI=8 + +inherit autotools systemd DESCRIPTION="Nagios Remote Plugin Executor" HOMEPAGE="https://github.com/NagiosEnterprises/nrpe" @@ -10,23 +11,28 @@ SRC_URI="https://github.com/NagiosEnterprises/nrpe/releases/download/${P}/${P}.t LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="command-args libressl selinux ssl" +KEYWORDS="~alpha amd64 ~hppa ~ppc ppc64 sparc x86" +IUSE="command-args selinux ssl tcpd" -DEPEND="sys-apps/tcp-wrappers +DEPEND="acct-group/nagios + acct-user/nagios + tcpd? ( + sys-apps/tcp-wrappers + ) ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) + 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" ) +PATCHES=( + "${FILESDIR}/nrpe-3.2.1-eliminate-systemd-pid.patch" +) -pkg_setup() { - enewgroup nagios - enewuser nagios -1 /bin/bash /var/nagios/home nagios +src_prepare() { + default + eautoreconf } src_configure() { @@ -36,9 +42,16 @@ src_configure() { # 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/nagios \ + --localstatedir=/var/lib/nagios \ --sysconfdir=/etc/nagios \ --with-nrpe-user=nagios \ --with-nrpe-group=nagios \ @@ -48,7 +61,8 @@ src_configure() { --with-init-type=unknown \ --with-inetd-type=unknown \ $(use_enable command-args) \ - $(use_enable ssl) + $(use_enable ssl) \ + $(use_enable tcpd) } src_compile() { @@ -71,19 +85,16 @@ src_install() { insinto /etc/xinetd.d/ newins "${FILESDIR}/nrpe.xinetd.2" nrpe - rm "${D}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm "${ED}/usr/bin/nrpe-uninstall" || die 'failed to remove uninstall tool' + rm -r "${ED}/run" || die 'failed to remove /run' } -pkg_postinst(){ - elog 'Some users have reported incompatibilities between nrpe-2.x and' - elog 'nrpe-3.x. We recommend that you use the same major version for' - elog 'both your server and clients.' - +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'' + ewarn '' fi } diff --git a/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch new file mode 100644 index 000000000000..af19ba293ddb --- /dev/null +++ b/net-analyzer/nsat/files/nsat-1.5-configure-dash.patch @@ -0,0 +1,79 @@ +From eda78d802b11dd7c920cd8e0396ca064f34e2a8b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 5 Aug 2021 00:27:23 +0100 +Subject: [PATCH] Fix configure with non-bash (dash) + +--- + configure.in | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.in b/configure.in +index 95c59da..b549092 100644 +--- a/configure.in ++++ b/configure.in +@@ -10,7 +10,7 @@ AC_CONFIG_HEADER(src/libmix++/mix/lmconfig.h) + + AC_PROG_CC + AC_MSG_CHECKING(accepted compiler flags) +-if test $ac_cv_prog_gcc = yes; then ++if test x$ac_cv_prog_gcc = xyes; then + AC_MSG_RESULT(GNU CC/ANSI (good)) + else + AC_MSG_RESULT(crappy :P) +@@ -41,7 +41,7 @@ case "`${UNAME}`" in + AC_MSG_RESULT(found Linux. Ph33r.) + AC_DEFINE(HAVE_LINUX) + AC_DEFINE(MY_HDRINCL,3) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX' + else + CCOPTS="${CFLAGS} -DLINUX" +@@ -54,7 +54,7 @@ fi + AC_MSG_RESULT(found MAC OS X) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O -funroll-loops -ansi -fPIC -DBSD44 -DDARWIN' + else + CCOPTS='-DBSD44 -DOBSD' +@@ -67,7 +67,7 @@ fi + AC_MSG_RESULT(found OpenBSD. Yay.) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44 -DOBSD' + else + CCOPTS='-DBSD44 -DOBSD' +@@ -80,7 +80,7 @@ fi + AC_MSG_RESULT(found BSD. Yay.) + AC_DEFINE(HAVE_BSD) + AC_DEFINE(MY_HDRINCL,2) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DBSD44' + else + CCOPTS='-DBSD44' +@@ -95,7 +95,7 @@ fi + AC_DEFINE(MY_HDRINCL,2) + AC_CHECK_LIB(socket, socket, [ CLIB="$CLIB -lsocket " ], AC_MSG_ERROR(libsocket not found.)) + AC_CHECK_LIB(nsl, gethostbyname, [ CLIB="$CLIB -lnsl " ], AC_MSG_ERROR(libnsl not found.)) +-if test $LEETCC = yes; then ++if test x$LEETCC = xyes; then + CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DSOLARIS' + else + CCOPTS='-DSOLARIS' +@@ -169,7 +169,7 @@ AC_HEADER_STDC + AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h sys/time.h sys/types.h sys/socket.h stdarg.h std_args.h strings.h netdb.h netinet/in.h arpa/inet.h signal.h stdlib.h errno.h ctype.h sys/file.h sys/ioctl.h sys/signal.h sys/stream.h sys/dlpi.h sys/bufmod.h sys/stropts.h sys/param.h sys/termios.h sys/filio.h net/if.h netinet/in_systm.h netinet/ip.h netinet/ip_var.h netinet/ip_icmp.h sys/resource.h X11/Xlib.h) + + AC_C_BIGENDIAN +- if test $ac_cv_c_bigendian = yes; then ++ if test x$ac_cv_c_bigendian = xyes; then + ENDIANESS1="#ifndef WORDS_BIGENDIAN" + ENDIANESS2="#define WORDS_BIGENDIAN /* this is a big endian machine */" + else +-- +2.32.0 + diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml index 0b7d0914b40c..96061d9d2f13 100644 --- a/net-analyzer/nsat/metadata.xml +++ b/net-analyzer/nsat/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>Network Security Analysis Tool, an application-level network security scanner</longdescription> <upstream> <remote-id type="sourceforge">nsat</remote-id> </upstream> diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r6.ebuild index c2decc6abfc8..47f0c0c1f494 100644 --- a/net-analyzer/nsat/nsat-1.5-r5.ebuild +++ b/net-analyzer/nsat/nsat-1.5-r6.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit autotools toolchain-funcs DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner" -HOMEPAGE="http://nsat.sourceforge.net/" -SRC_URI="mirror://sourceforge/nsat/${P}.tgz" +HOMEPAGE="https://nsat.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/nsat/${P}.tgz" +S="${WORKDIR}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~ppc x86" IUSE="X" @@ -17,15 +19,15 @@ RDEPEND=" dev-libs/libmix net-libs/libnsl:0= net-libs/libpcap - net-libs/libtirpc + net-libs/libtirpc:= net-libs/rpcsvc-proto X? ( dev-lang/tk:* x11-libs/libX11 ) " -DEPEND="$RDEPEND" -S="${WORKDIR}/${PN}" +DEPEND="${RDEPEND}" + PATCHES=( "${FILESDIR}"/${P}-configure.patch "${FILESDIR}"/${P}-lvalue-gcc4.patch @@ -34,6 +36,7 @@ PATCHES=( "${FILESDIR}"/${P}-va_list.patch "${FILESDIR}"/${P}-libtirpc.patch "${FILESDIR}"/${P}-amd64-compat.patch + "${FILESDIR}"/${P}-configure-dash.patch ) src_prepare() { @@ -48,6 +51,8 @@ src_prepare() { -e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \ src/lang.h || die + mv configure.{in,ac} || die + eautoreconf } @@ -60,7 +65,7 @@ src_compile() { emake MIXOBJ=-lmix++ } -src_install () { +src_install() { dobin nsat smb-ns use X && dobin tools/xnsat diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml index 6d5b1ccd3d20..11c0f82cef42 100644 --- a/net-analyzer/nsca/metadata.xml +++ b/net-analyzer/nsca/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild index fb8d8498ef6d..2f5ddddd240f 100644 --- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild +++ b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild @@ -1,42 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 - -inherit multilib user eutils +EAPI=7 DESCRIPTION="Nagios Service Check Acceptor" -HOMEPAGE="http://www.nagios.org/" -SRC_URI="mirror://sourceforge/nagios/${P}.tar.gz" +HOMEPAGE="https://www.nagios.org/" +SRC_URI="https://downloads.sourceforge.net/nagios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 sparc x86" IUSE="tcpd +crypt minimal" DEPEND="crypt? ( >=dev-libs/libmcrypt-2.5.1-r4 ) - !minimal? ( tcpd? ( sys-apps/tcp-wrappers ) )" - + !minimal? ( + tcpd? ( sys-apps/tcp-wrappers ) + acct-group/icinga + acct-group/nagios + acct-user/icinga + acct-user/nagios + )" RDEPEND="${DEPEND} - !minimal? ( || ( net-analyzer/icinga net-analyzer/nagios ) ) + !minimal? ( + || ( + net-analyzer/icinga + net-analyzer/nagios + ) + ) sys-apps/openrc" -pkg_setup() { - if ! use minimal; then - enewgroup nagios - enewgroup icinga - enewuser nagios -1 /bin/bash /var/nagios/home nagios - enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios" - fi -} - src_configure() { use tcpd || export ac_cv_lib_wrap_main=no use crypt || export ac_cv_path_LIBMCRYPT_CONFIG=/bin/false econf \ - --localstatedir=/var/nagios \ - --sysconfdir=/etc/nagios \ + --localstatedir="${EPREFIX}"/var/nagios \ + --sysconfdir="${EPREFIX}"/etc/nagios \ --with-nsca-user=nagios \ --with-nsca-grp=nagios } @@ -49,7 +48,7 @@ src_compile() { -e '/nsca_\(user\|group\)/s:nagios:icinga:' \ -e '/nsca_chroot/s:=.*:=/var/lib/icinga/rw:' \ -e '/\(command\|alternate_dump\)_file/s:/var/nagios:/var/lib/icinga:' \ - "${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg + "${S}"/sample-config/nsca.cfg > "${T}"/nsca.icinga.cfg || die } src_install() { @@ -58,7 +57,7 @@ src_install() { dobin src/send_nsca insinto /etc/nagios - doins "${S}"/sample-config/send_nsca.cfg + doins sample-config/send_nsca.cfg if ! use minimal; then exeinto /usr/libexec @@ -68,7 +67,7 @@ src_install() { newconfd "${FILESDIR}"/nsca.conf nsca insinto /etc/nagios - doins "${S}"/sample-config/nsca.cfg + doins sample-config/nsca.cfg insinto /etc/icinga newins "${T}"/nsca.icinga.cfg nsca.cfg @@ -79,7 +78,7 @@ pkg_postinst() { if ! use minimal; then elog "If you are using the nsca daemon, remember to edit" elog "the config file /etc/nagios/nsca.cfg" - elog "" + elog elog "If you intend to use nsca with Icinga, change the" elog "configuration file path in /etc/conf.d/nsca so that" elog "it will default to the correct paths and users." diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/nstats/metadata.xml +++ b/net-analyzer/nstats/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild deleted file mode 100644 index 7da846ede8c9..000000000000 --- a/net-analyzer/nstats/nstats-0.4-r2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils - -DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" -SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" -HOMEPAGE="http://trash.net/~reeler/nstats/" -LICENSE="Artistic" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86" - -RDEPEND=" - net-libs/libpcap - sys-libs/ncurses -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( BUGS doc/TODO doc/ChangeLog ) - -src_prepare(){ - epatch \ - "${FILESDIR}"/${P}-glibc24.patch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-tinfo.patch - - eautoreconf -} diff --git a/net-analyzer/nstats/nstats-0.4-r3.ebuild b/net-analyzer/nstats/nstats-0.4-r4.ebuild index 8a5efdfe1627..29ee8957fee9 100644 --- a/net-analyzer/nstats/nstats-0.4-r3.ebuild +++ b/net-analyzer/nstats/nstats-0.4-r4.ebuild @@ -1,38 +1,41 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown" -SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" HOMEPAGE="http://trash.net/~reeler/nstats/" -LICENSE="Artistic" +SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz" +LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" RDEPEND=" net-libs/libpcap sys-libs/ncurses " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + PATCHES=( "${FILESDIR}"/${P}-glibc24.patch "${FILESDIR}"/${P}-makefile.patch "${FILESDIR}"/${P}-tinfo.patch ) + DOCS=( BUGS doc/TODO doc/ChangeLog ) -src_prepare(){ +src_prepare() { default eautoreconf } src_configure() { append-cflags -fcommon + # Conflicting definitions of quit() (bug #861227) + filter-lto default } diff --git a/net-analyzer/ntopng/Manifest b/net-analyzer/ntopng/Manifest index a4dd46d47f4c..88d1b021acfd 100644 --- a/net-analyzer/ntopng/Manifest +++ b/net-analyzer/ntopng/Manifest @@ -1,2 +1,3 @@ -DIST ntopng-3.8.1.tar.gz 33914341 BLAKE2B 3b0df382e938af78d10e71282e863ccb7ba1da3dc7e2bf90b45f1e6e4670052a8c61a16cb8547f119f0dc753a2e31273b41f40aa26919480cbaecf43b6d59742 SHA512 4cb613881e36b435f97dcc25dfaa505d9c552f63ad8334d5c9d47ec06376d47124c65e6d782546d36f6d27b34b037cc73df7129f459f290ac51e270bb7453970 -DIST ntopng-3.8.tar.gz 33910329 BLAKE2B a5aaed2244516b92e4b8c7364817ea66eb2f446fe814a96622cbbf5d851d79e8049b75da009d0f80f07c1fae90f8dc294794b76ed14450d8e0e6685a1b1ce8f2 SHA512 2236f9931fc606e4d0a6da379c480a48bacd441cf199a310ea690a03d74d08f369825ea02e3c13828a10f716a5531d4e6774876f253ab348a52bcf8bd8d5107f +DIST ntopng-5.2.1.tar.gz 60280025 BLAKE2B e7885a1ec9e5d37ee06def83a83c62f41acf87d939d18c33c8d114fe0bed0c973a6146f26fd92343aa7c7e7484970c3e95c33fe76468fe382809daddeed6541b SHA512 01cdf21deac61a3b11e7d0e6b662c911123241332e812bb676cb8c5c003fe1d50a4c61231f9c327d467e89dd1345fc1bdbab5d2599fe04b04a8fe12654c01bdd +DIST ntopng-5.6-web-90d81ad0281eb6eb582a683ac321a3959abb1269.tar.gz 2525957 BLAKE2B 5ae068ab4c0bae7c6cde7071dd056d3d717d0ae50ce0fe0f9e71fcbf8ab8ee51cdb2d3b05f095ce96921378361ff013d893a40496f1ce50da8ba4c65dc166fc0 SHA512 cd3f8c660b632bffb2baac4d163b055a64b05f510a0744c8d27689cabb3959d15d5cfa763fcf583e57d23dbcd73857360bae7d25bd9aa66682858e7ca985c21e +DIST ntopng-5.6.tar.gz 46318113 BLAKE2B 48702b55c239edca46d6cdecb846ac358c9a829a261eee128444bd994b967c962577a419466f139a2aefdd3a51485d2bb17bf39b8f35a9a31322c40c07203a5d SHA512 c4ab79f98b2dc99218cd0c7ac0ed7275d23e7a161de742632f3ec7a538ea4948ba906d40e7fd2ba36fb4bd9be86ecc69f5df65e7f81607e6da489863947b2da5 diff --git a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch b/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch deleted file mode 100644 index 303826a918df..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-missing-min.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/third-party/zeromq-4.1.3/src/tcp_connecter.cpp -+++ b/third-party/zeromq-4.1.3/src/tcp_connecter.cpp -@@ -31,6 +31,7 @@ - - #include <new> - #include <string> -+#include <algorithm> - - #include "tcp_connecter.hpp" - #include "stream_engine.hpp" -@@ -207,7 +208,7 @@ - options.reconnect_ivl_max > options.reconnect_ivl) - // Calculate the next interval - current_reconnect_ivl = -- min (current_reconnect_ivl * 2, options.reconnect_ivl_max); -+ std::min(current_reconnect_ivl * 2, options.reconnect_ivl_max); - return interval; - } - diff --git a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch deleted file mode 100644 index 62c328a3505e..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-mysqltool.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -355,13 +355,7 @@ - if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then - MYSQLTOOL="mariadb_config" - else -- PATH=$PATH:/usr/local/mysql/bin -- AC_CHECK_TOOL(MYSQL, mysql_config) -- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then -- MYSQLTOOL="mysql_config" -- else -- MYSQLTOOL="" -- fi -+ MYSQLTOOL="mysql_config" - fi - - if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch b/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch deleted file mode 100644 index 1308a5c2c03f..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-call.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/NetworkInterface.cpp -+++ b/src/NetworkInterface.cpp -@@ -1604,7 +1604,8 @@ - ndpi_protocol icmp_proto = flow->get_detected_protocol(); - - if(icmp_proto.category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED) { -- ndpi_fill_ip_protocol_category(ndpi_struct, (struct ndpi_iphdr *)ip, &icmp_proto); -+ ndpi_fill_ip_protocol_category(ndpi_struct, ((struct ndpi_iphdr *)ip)->saddr, -+ ((struct ndpi_iphdr*)ip)->daddr, &icmp_proto); - flow->setDetectedProtocol(icmp_proto, false); - } - } diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch deleted file mode 100644 index 12117d791bcd..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-PKG_CONFIG.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -6,6 +6,8 @@ - - AC_PROG_CXX - -+PKG_PROG_PKG_CONFIG -+ - dnl> Add /usr/local/ /opt/local - CFLAGS="-I${PWD} -I${PWD}/include" - CPPFLAGS="${CPPFLAGS} -I${PWD} -I${PWD}/include" -@@ -179,10 +179,10 @@ - fi - dnl finish: nDPI handling - --if test -z `pkg-config --exists libssl`; then -+if ${PKG_CONFIG} --exists libssl; then - AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl]) -- SSL_INC="`pkg-config --cflags libssl` -I/usr/include/openssl" -- SSL_LIB="`pkg-config --libs libssl` -lssl -lcrypto" -+ SSL_INC="`${PKG_CONFIG} --cflags libssl` -I/usr/include/openssl" -+ SSL_LIB="`${PKG_CONFIG} --libs libssl` -lssl -lcrypto" - fi - - AC_MSG_CHECKING(for ntopng professional edition) ---- a/Makefile.in -+++ b/Makefile.in -@@ -44,10 +44,10 @@ - - ###### - LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 --HAS_LIBRRDTOOL=$(shell pkg-config --atleast-version=1.4.8 librrd; echo $$?) -+HAS_LIBRRDTOOL=$(shell $(PKG_CONFIG) --atleast-version=1.4.8 librrd; echo $$?) - ifeq ($(HAS_LIBRRDTOOL), 0) -- LIBRRDTOOL_INC = $(shell pkg-config --cflags librrd) -- LIBRRDTOOL_LIB = $(shell pkg-config --libs librrd) # -lrrd_th -+ LIBRRDTOOL_INC = $(shell $(PKG_CONFIG) --cflags librrd) -+ LIBRRDTOOL_LIB = $(shell $(PKG_CONFIG) --libs librrd) # -lrrd_th - else - LIBRRDTOOL_INC=-I$(LIBRRDTOOL_HOME)/src/ - ifeq ($(OS), $(filter $(OS), OpenBSD FreeBSD)) -@@ -70,10 +70,10 @@ - - ###### - --HAS_JSON=$(shell pkg-config --exists json-c; echo $$?) -+HAS_JSON=$(shell $(PKG_CONFIG) --exists json-c; echo $$?) - ifeq ($(HAS_JSON), 0) -- JSON_INC = $(shell pkg-config --cflags json-c) -- JSON_LIB = $(shell pkg-config --libs json-c) -+ JSON_INC = $(shell $(PKG_CONFIG) --cflags json-c) -+ JSON_LIB = $(shell $(PKG_CONFIG) --libs json-c) - else - JSON_HOME=${PWD}/third-party/json-c - JSON_INC=-I$(JSON_HOME) -@@ -83,21 +83,21 @@ - ###### - - ifeq (@NEDGE@, 0) -- HAS_SODIUM=$(shell pkg-config --exists libsodium; echo $$?) -+ HAS_SODIUM=$(shell $(PKG_CONFIG) --exists libsodium; echo $$?) - ifeq ($(HAS_SODIUM), 0) -- SODIUM_INC = $(shell pkg-config --cflags libsodium) -- SODIUM_LIB = $(shell pkg-config --libs libsodium) -+ SODIUM_INC = $(shell $(PKG_CONFIG) --cflags libsodium) -+ SODIUM_LIB = $(shell $(PKG_CONFIG) --libs libsodium) - else - SODIUM_INC= - SODIUM_LIB= - endif - -- HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) -+ HAS_ZEROMQ=$(shell $(PKG_CONFIG) --exists libzmq; echo $$?) - ifeq ($(HAS_ZEROMQ), 0) -- ZEROMQ_INC = $(shell pkg-config --cflags libzmq) -+ ZEROMQ_INC = $(shell $(PKG_CONFIG) --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a - ifeq ($(wildcard $(ZMQ_STATIC)),) -- ZEROMQ_LIB = $(shell pkg-config --libs libzmq) -+ ZEROMQ_LIB = $(shell $(PKG_CONFIG) --libs libzmq) - else - ZEROMQ_LIB = $(ZMQ_STATIC) - endif -@@ -106,11 +106,6 @@ - ZEROMQ_INC=-I$(ZEROMQ_HOME)/include - ZEROMQ_LIB=$(ZEROMQ_HOME)/.libs/libzmq.a - endif -- -- HAS_ZSTD=$(shell pkg-config --exists libzstd; echo $$?) -- ifeq ($(HAS_ZSTD), 0) -- ZSTD_LIB = $(shell pkg-config --libs libzstd) -- endif - endif - - ###### diff --git a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch b/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch deleted file mode 100644 index 9089c0a9b04d..000000000000 --- a/net-analyzer/ntopng/files/ntopng-3.8.1-parallel-make.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -526,11 +520,7 @@ - - AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) - --GMAKE=`which gmake` --if test x$GMAKE = x --then -- GMAKE="make" --fi -+GMAKE='$(MAKE)' - - GIT=`which git` - if test x$GIT = x diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch new file mode 100644 index 000000000000..ff05d103f22a --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-build-system.patch @@ -0,0 +1,89 @@ +https://github.com/ntop/ntopng/pull/6288 + +From 93b62eb0b48f9914fed5511dc2a4289a83a1ed34 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:07:21 +0000 +Subject: [PATCH 1/3] build: fail configure if ZMQ can't be found + +We already "fail" (makefile won't be generated) when ZMQ can't be found but +the exit code doesn't represent this until now. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac.in b/configure.ac.in +index b032d7faa34..0b30e9480c7 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -132,7 +132,7 @@ if test "x$ac_cv_lib_zmq_zmq_socket_monitor" = xyes; then : + AC_DEFINE_UNQUOTED(HAVE_ZMQ, 1, [ZMQ is present]) + else + echo "ZMQ not present or too old (< v. 3.x)" +- exit ++ exit 1 + fi + + AC_CHECK_LIB([sodium], [sodium_init], LIBS="${LIBS} -lsodium") + +From 75206e5a3fdc289a2229770595fbf588de79402b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:08:02 +0000 +Subject: [PATCH 2/3] build: avoid bashism in configure + +[[ ]] and == are both Bashisms and /bin/sh may be a POSIX compliant +shell (Debian notably uses dash for /bin/sh which wouldn't be +happy with this). + +This will continue to work on Bash. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 0b30e9480c7..3dc6ef4a539 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -187,7 +187,7 @@ fi + + if [ test -f /usr/bin/lsb_release ]; then + CODENAME=`/usr/bin/lsb_release -c|cut -f 2` +- if [[ $CODENAME == "wheezy" ]]; then : ++ if test $CODENAME = "wheezy" ; then + CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1" + fi + fi + +From 6e355cb98078dbfc379ba178ec99b7e351afdfe9 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 8 Feb 2022 06:09:44 +0000 +Subject: [PATCH 3/3] build: use $(MAKE) + +This allows parallel builds to work properly as we'll be calling 'make ...' +with any additional arguments it internally passes down rather than literally +just make. + +Signed-off-by: Sam James <sam@gentoo.org> +--- + configure.ac.in | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/configure.ac.in b/configure.ac.in +index 3dc6ef4a539..3ff06c4efd4 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -720,10 +720,7 @@ fi + + AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disable warning on windows]) + +-GMAKE=`which gmake` +-if test x$GMAKE = x; then +- GMAKE="make" +-fi ++GMAKE='$(MAKE)' + + GIT=`which git` + if test x$GIT = x; then diff --git a/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch new file mode 100644 index 000000000000..48551589f022 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-mysqltool.patch @@ -0,0 +1,17 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -596,13 +596,7 @@ if test "${with_nedge+set}" != set; then + if test "x$ac_cv_prog_ac_ct_MARIADB" = "xmariadb_config"; then + MYSQLTOOL="mariadb_config" + else +- PATH=$PATH:/usr/local/mysql/bin +- AC_CHECK_TOOL(MYSQL, mysql_config) +- if test "x$ac_cv_prog_ac_ct_MYSQL" = "xmysql_config"; then +- MYSQLTOOL="mysql_config" +- else +- MYSQLTOOL="" +- fi ++ MYSQLTOOL="mysql_config" + fi + + if test -n "$MYSQLTOOL"; then diff --git a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch index cdd5e827147c..4940cb44b733 100644 --- a/net-analyzer/ntopng/files/ntopng-3.8-ndpi-includes.patch +++ b/net-analyzer/ntopng/files/ntopng-5.2.1-ndpi-linking.patch @@ -1,13 +1,12 @@ ---- a/configure.seed -+++ b/configure.seed -@@ -129,9 +129,9 @@ - fi - +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -236,8 +236,8 @@ fi PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ -- NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"`/libndpi -+ NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` # Use static libndpi library as building against the dynamic library fails - NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" +- #NDPI_LIB="$NDPI_LIBS" ++ #NDPI_LIB="-Wl,-Bstatic $NDPI_LIBS -Wl,-Bdynamic" + NDPI_LIB="$NDPI_LIBS" NDPI_LIB_DEP= ], [ diff --git a/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch new file mode 100644 index 000000000000..8a50b7cb1a10 --- /dev/null +++ b/net-analyzer/ntopng/files/ntopng-5.4-ndpi-linking.patch @@ -0,0 +1,49 @@ +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -231,31 +231,8 @@ NDPI_LIB= + NDPI_LIB_DEP= + + AC_MSG_CHECKING(for nDPI source) +- if test -d "./nDPI" ; then : +- NDPI_HOME=./nDPI +- elif test -d "../nDPI" ; then : +- NDPI_HOME=../nDPI +- elif test -d "$HOME/nDPI" ; then : +- NDPI_HOME=$HOME/nDPI +- fi +- +- if test ! -z "$NDPI_HOME" ; then : +- AC_MSG_RESULT(found in $NDPI_HOME) +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- AC_MSG_CHECKING(for $NDPI_LIB) +- if test -r $NDPI_LIB ; then : +- AC_MSG_RESULT(found $NDPI_LIB) +- else +- AC_MSG_RESULT(not found $NDPI_LIB: compiling) +- cd $NDPI_HOME; ./autogen.sh; ${MAKE}; cd - +- fi +- NDPI_INC="-I$NDPI_HOME/src/include -I$NDPI_HOME/src/lib/third_party/include" +- NDPI_LIB=$NDPI_HOME/src/lib/libndpi.a +- NDPI_LIB_DEP=$NDPI_LIB +- else +- AC_MSG_RESULT(not found) +- fi +- ++ NDPI_LIB="-lndpi" ++ NDPI_LIB_DEP=$NDPI_LIB + + if test ! -z "$NDPI_CUST_INC" ; then : + NDPI_INC=$NDPI_CUST_INC +diff --git a/configure.ac.in b/configure.ac.in +index ed906b1..3e70bec 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -242,7 +242,7 @@ if test ! -z "$NDPI_CUST_LIB" ; then : + NDPI_LIB=$NDPI_CUST_LIB + fi + +-if test -z "$NDPI_INC" || test -z "$NDPI_LIB" ; then : ++if test -z "$NDPI_LIB" ; then : + echo "Could not find nDPI" + echo "Please do cd ..; git clone https://github.com/ntop/nDPI.git; cd nDPI; ./autogen.sh; ${MAKE}; cd ../ntopng" + echo "and try again" diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml index f31113c67cca..907723bdb488 100644 --- a/net-analyzer/ntopng/metadata.xml +++ b/net-analyzer/ntopng/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> -<email>netmon@gentoo.org</email> -</maintainer> - <upstream> - <remote-id type="github">ntop/ntopng</remote-id> - </upstream> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">ntop/ntopng</remote-id> + <remote-id type="github">ntop/ntopng-dist</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild b/net-analyzer/ntopng/ntopng-3.8-r1.ebuild deleted file mode 100644 index 37e007de41ea..000000000000 --- a/net-analyzer/ntopng/ntopng-3.8-r1.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools user toolchain-funcs - -DESCRIPTION="Network traffic analyzer with web interface" -HOMEPAGE="https://www.ntop.org/" -SRC_URI="https://github.com/ntop/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-db/sqlite:3 - dev-python/pyzmq - dev-lang/luajit:2 - dev-libs/json-c:= - dev-libs/geoip - dev-libs/glib:2 - dev-libs/hiredis - dev-libs/libsodium:= - dev-libs/libxml2 - dev-libs/libmaxminddb - net-analyzer/rrdtool - net-libs/libpcap - >=net-libs/nDPI-2.4:= - net-misc/curl - sys-libs/binutils-libs - dev-db/mysql-connector-c:=" -RDEPEND="${DEPEND} - dev-db/redis" -PATCHES=( - "${FILESDIR}"/${P}-mysqltool.patch - "${FILESDIR}"/${P}-ndpi-includes.patch - "${FILESDIR}"/${P}-missing-min.patch - "${FILESDIR}"/${P}-ndpi-call.patch -) - -src_prepare() { - default - sed -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" -e "s/@SHORT_VERSION@/${PV}/g" < "${S}/configure.seed" > "${S}/configure.ac" > configure.ac - eapply_user - eautoreconf -} - -src_install() { - SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} - doins -r httpdocs - doins -r scripts - - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party - doins -r third-party/i18n.lua-master - doins -r third-party/lua-resty-template-master - - exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 - - newinitd "${FILESDIR}/ntopng.init.d" ntopng - newconfd "${FILESDIR}/ntopng.conf.d" ntopng - - dodir "/var/lib/ntopng" - fowners ntopng "/var/lib/ntopng" -} - -pkg_setup() { - enewuser ntopng -} - -pkg_postinst() { - elog "ntopng default credentials are user='admin' password='admin'" -} diff --git a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild index 25938565c762..84dd505dc13f 100644 --- a/net-analyzer/ntopng/ntopng-3.8.1-r3.ebuild +++ b/net-analyzer/ntopng/ntopng-5.2.1-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools user toolchain-funcs +EAPI=8 + +inherit autotools toolchain-funcs DESCRIPTION="Network traffic analyzer with web interface" HOMEPAGE="https://www.ntop.org/" @@ -12,48 +13,43 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND=" - >=net-libs/nDPI-3.0:= - dev-db/mysql-connector-c:= +DEPEND="dev-db/mysql-connector-c:= dev-db/sqlite:3 - dev-libs/hiredis + dev-libs/hiredis:= dev-libs/json-c:= dev-libs/libmaxminddb dev-libs/libsodium:= - dev-libs/openssl + dev-libs/openssl:= net-analyzer/rrdtool net-libs/libpcap + >=net-libs/nDPI-4.2:= + <net-libs/nDPI-4.4:= >=net-libs/zeromq-3:= net-misc/curl sys-libs/libcap - sys-libs/zlib -" -RDEPEND=" - ${DEPEND} - dev-db/redis -" -BDEPEND=" - virtual/pkgconfig -" + sys-libs/zlib" +RDEPEND="${DEPEND} + acct-user/ntopng + acct-group/ntopng + dev-db/redis" +BDEPEND="virtual/pkgconfig" + PATCHES=( - "${FILESDIR}"/${PN}-3.8-mysqltool.patch - "${FILESDIR}"/${PN}-3.8-ndpi-includes.patch - "${FILESDIR}"/${PN}-3.8.1-PKG_CONFIG.patch - "${FILESDIR}"/${PN}-3.8.1-parallel-make.patch + "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch + "${FILESDIR}"/${PN}-5.2.1-ndpi-linking.patch + "${FILESDIR}"/${PN}-5.2.1-build-system.patch ) -RESTRICT="test" - -pkg_setup() { - enewuser ntopng -} src_prepare() { default + # Follows upstream's autogen.sh sed \ -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ -e "s/@SHORT_VERSION@/${PV}/g" \ - < "${S}/configure.seed" \ + -e "s/@GIT_DATE@/$(date)/g" \ + -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \ > "${S}/configure.ac" || die eautoreconf @@ -61,7 +57,12 @@ src_prepare() { src_configure() { tc-export PKG_CONFIG - default + + # configure.ac.in at least has some bashisms(?) which get lost(?) + # in conversion to configure.ac (like [ -> nothing?) so just force + # bash for now. It's still not quite right but at least upstream will be + # testing with it. TODO: fix this! + CONFIG_SHELL="${BROOT}/bin/bash" econf } src_compile() { @@ -73,19 +74,17 @@ src_compile() { src_install() { SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" - dodir ${SHARE_NTOPNG_DIR} - insinto ${SHARE_NTOPNG_DIR} + insinto "${SHARE_NTOPNG_DIR}" doins -r httpdocs doins -r scripts - dodir ${SHARE_NTOPNG_DIR}/third-party - insinto ${SHARE_NTOPNG_DIR}/third-party + insinto "${SHARE_NTOPNG_DIR}/third-party" doins -r third-party/i18n.lua-master doins -r third-party/lua-resty-template-master exeinto /usr/bin - doexe ${PN} - doman ${PN}.8 + doexe "${PN}" + doman "${PN}.8" newinitd "${FILESDIR}"/ntopng.init.d ntopng newconfd "${FILESDIR}"/ntopng.conf.d ntopng diff --git a/net-analyzer/ntopng/ntopng-5.6-r2.ebuild b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild new file mode 100644 index 000000000000..f0d95a98fcd5 --- /dev/null +++ b/net-analyzer/ntopng/ntopng-5.6-r2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs + +# Check this on bumps, get latest commit from the relevant branch (e.g. 5.6-stable) +# See bug #894152 and https://github.com/ntop/ntopng/issues/7203 +NTOPNG_DIST_COMMIT="90d81ad0281eb6eb582a683ac321a3959abb1269" +DESCRIPTION="Network traffic analyzer with web interface" +HOMEPAGE="https://www.ntop.org/" +SRC_URI="https://github.com/ntop/ntopng/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/ntop/ntopng-dist/archive/${NTOPNG_DIST_COMMIT}.tar.gz -> ${P}-web-${NTOPNG_DIST_COMMIT}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="dev-db/mysql-connector-c:= + dev-db/sqlite:3 + dev-libs/hiredis:= + dev-libs/json-c:= + dev-libs/libmaxminddb + dev-libs/libsodium:= + dev-libs/openssl:= + net-analyzer/rrdtool + net-libs/libpcap + >=net-libs/nDPI-4.6:= + <net-libs/nDPI-4.8:= + >=net-libs/zeromq-3:= + net-misc/curl + sys-libs/libcap + sys-libs/zlib" +RDEPEND="${DEPEND} + acct-user/ntopng + acct-group/ntopng + dev-db/redis" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-5.2.1-mysqltool.patch + "${FILESDIR}"/${PN}-5.4-ndpi-linking.patch +) + +src_prepare() { + default + + # Follows upstream's autogen.sh + sed \ + -e "s/@VERSION@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@SHORT_VERSION@/${PV}/g" \ + -e "s/@GIT_DATE@/$(date)/g" \ + -e "s/@GIT_RELEASE@/${PV}.$(date +%y%m%d)/g" \ + -e "s/@GIT_BRANCH@//g" < "${S}/configure.ac.in" \ + > "${S}/configure.ac" || die + + eautoreconf +} + +src_configure() { + tc-export PKG_CONFIG + + # configure.ac.in at least has some bashisms(?) which get lost(?) + # in conversion to configure.ac (like [ -> nothing?) so just force + # bash for now. It's still not quite right but at least upstream will be + # testing with it. TODO: fix this! + CONFIG_SHELL="${BROOT}/bin/bash" econf --with-ndpi-includes="${ESYSROOT}"/usr/include/ndpi +} + +src_compile() { + emake \ + CC="$(tc-getCC)" \ + MYCFLAGS="${CFLAGS}" \ + MYLDFLAGS="${LDFLAGS}" +} + +src_install() { + SHARE_NTOPNG_DIR="${EPREFIX}/usr/share/${PN}" + insinto "${SHARE_NTOPNG_DIR}" + doins -r httpdocs + doins -r scripts + + insinto "${SHARE_NTOPNG_DIR}"/httpdocs/dist + doins -r "${WORKDIR}"/ntopng-dist-${NTOPNG_DIST_COMMIT}/. + + insinto "${SHARE_NTOPNG_DIR}/third-party" + doins -r third-party/i18n.lua-master + doins -r third-party/lua-resty-template-master + + exeinto /usr/bin + doexe "${PN}" + doman "${PN}.8" + + newinitd "${FILESDIR}"/ntopng.init.d ntopng + newconfd "${FILESDIR}"/ntopng.conf.d ntopng + + keepdir /var/lib/ntopng + fowners ntopng /var/lib/ntopng +} + +pkg_postinst() { + elog "ntopng default credentials are user='admin' password='admin'" +} diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml index c9c02c73ae91..dce3f3be66c0 100644 --- a/net-analyzer/nttcp/metadata.xml +++ b/net-analyzer/nttcp/metadata.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> -<longdescription>tool to test TCP and UDP throughput</longdescription> </pkgmetadata> diff --git a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild deleted file mode 100644 index 5d6f49f09066..000000000000 --- a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="tool to test TCP and UDP throughput" -HOMEPAGE="http://www.leo.org/~elmar/nttcp/" -SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz" -LICENSE="public-domain" - -SLOT="0" -KEYWORDS="amd64 ~mips ~ppc x86" - -src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch -} - -src_compile() { - emake \ - ARCH= \ - CC="$(tc-getCC)" \ - LFLAGS="${LDFLAGS}" \ - OPT="${CFLAGS}" -} - -src_install() { - dobin ${PN} - doman ${PN}.1 -} diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild index f502164771a3..4203113e8853 100644 --- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild +++ b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 -DESCRIPTION="tool to test TCP and UDP throughput" +inherit toolchain-funcs + +DESCRIPTION="Tool to test TCP and UDP throughput" HOMEPAGE="http://www.leo.org/~elmar/nttcp/" SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz" -LICENSE="public-domain" +LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~mips ~ppc x86" -src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch -} +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_compile() { emake \ diff --git a/net-analyzer/nuttcp/metadata.xml b/net-analyzer/nuttcp/metadata.xml index 66e11db82cfd..e20092a8449c 100644 --- a/net-analyzer/nuttcp/metadata.xml +++ b/net-analyzer/nuttcp/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer type="person" proxied="yes"> <email>spiderx@spiderx.dp.ua</email> <name>Vladimir Pavljuchenkov</name> </maintainer> - <maintainer type="project"> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild index 97c01c07adc1..e45ea3aabc0a 100644 --- a/net-analyzer/nuttcp/nuttcp-8.1.4.ebuild +++ b/net-analyzer/nuttcp/nuttcp-8.1.4-r1.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit readme.gentoo-r1 systemd toolchain-funcs DESCRIPTION="Network performance measurement tool" -HOMEPAGE="http://www.nuttcp.net/" -SRC_URI="http://nuttcp.net/${PN}/${P}.tar.bz2" +HOMEPAGE="https://www.nuttcp.net/" +SRC_URI="https://nuttcp.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="ipv6 xinetd" +IUSE="xinetd" RDEPEND="xinetd? ( sys-apps/xinetd )" @@ -36,13 +36,13 @@ src_prepare() { } src_compile() { - emake "$(usex ipv6 APPEXT='' NOIPV6=-DNO_IPV6)" CC="$(tc-getCC)" + emake APPEXT='' CC="$(tc-getCC)" } src_install() { einstalldocs doman "${PN}".8 - newbin "${P}$(usex ipv6 '' -noipv6)" "${PN}" + newbin "${P}" "${PN}" newinitd "${FILESDIR}"/"${PN}".initd "${PN}" newconfd "${FILESDIR}"/"${PN}".confd "${PN}" diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml index dec13966250c..3e4cae9bf2a6 100644 --- a/net-analyzer/odhcploc/metadata.xml +++ b/net-analyzer/odhcploc/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>jer@gentoo.org</email> - <name>Jeroen Roovers</name> - </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> diff --git a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild deleted file mode 100644 index 57f948763029..000000000000 --- a/net-analyzer/odhcploc/odhcploc-20111021-r1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DESCRIPTION="Open DHCP Locator" -HOMEPAGE="http://odhcploc.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${P}.tar.gz" - -LICENSE="ISC" -SLOT="0" -KEYWORDS="~amd64" - -src_configure() { - tc-export CC -} - -src_install() { - dobin ${PN} - doman ${PN}.8 - dodoc AUTHORS -} diff --git a/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild b/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild new file mode 100644 index 000000000000..24cc8e6c719e --- /dev/null +++ b/net-analyzer/odhcploc/odhcploc-20111021-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Open DHCP Locator" +HOMEPAGE="https://odhcploc.sourceforge.io" +SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${P}.tar.gz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + elibc_musl? ( sys-libs/queue-standalone ) +" + +src_configure() { + # Don't clobber toolchain defaults + sed -i -e 's:-Wp,-D_FORTIFY_SOURCE=2::' Makefile || die + + tc-export CC +} + +src_install() { + dobin ${PN} + doman ${PN}.8 + dodoc AUTHORS +} diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml index ec5e8f6c9ef7..846f4fab4191 100644 --- a/net-analyzer/oinkmaster/metadata.xml +++ b/net-analyzer/oinkmaster/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild index 35f0ef818c0b..30f1a1a8401a 100644 --- a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild +++ b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Rule management for SNORT" -SRC_URI="mirror://sourceforge/oinkmaster/${P}.tar.gz" -HOMEPAGE="http://oinkmaster.sf.net/" +HOMEPAGE="https://oinkmaster.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/oinkmaster/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -14,11 +13,11 @@ KEYWORDS="amd64 ~arm ppc sparc x86" IUSE="X" RDEPEND=" + app-arch/gzip + app-arch/tar >=dev-lang/perl-5.6.1 - X? ( dev-perl/Tk ) net-misc/wget - app-arch/tar - app-arch/gzip + X? ( dev-perl/Tk ) " src_install() { diff --git a/net-analyzer/ookla-speedtest/Manifest b/net-analyzer/ookla-speedtest/Manifest new file mode 100644 index 000000000000..def0e9c7711a --- /dev/null +++ b/net-analyzer/ookla-speedtest/Manifest @@ -0,0 +1,4 @@ +DIST ookla-speedtest-1.2.0-linux-aarch64.tgz 1082287 BLAKE2B dc30e0c2bbe3206e326e22c1724f5bd63a9bf3d2237347222d2b36b2ccc98af06b55f5d5635c4487ae85d32323ea66a927b578ee29f89369ca395787bded34a3 SHA512 d7b78428220b84eac345594a500a76211dcbd19ffc9e399642a2e1506494433f9b6e596828bb5387275b0e1d38eada78af8183cefafa2ed1d93bfecdc366e569 +DIST ookla-speedtest-1.2.0-linux-armhf.tgz 1039260 BLAKE2B 8c4dc63bfdd797fd1e8482fa56f514486a564f3fd0e7f1fc008ba1dd6c20c5b3b8d92eb9b25458324b9ee65987edd1ce18f446b16a8e07f1c1f8df864424f75e SHA512 97a41d4ff38aa550faccfc29b9fe8b5d3e25deb2de4690598f2fb8c9469b379604fbd452ab978268e231b70154807ccc9d268a1cf40fa6aa10d2ec176e9b8be7 +DIST ookla-speedtest-1.2.0-linux-i386.tgz 1191626 BLAKE2B e416169ea7d7f86587b166458d5bff6b2d7e7757fb122deafb4fc824430059c15767b54113705e28b3bdb84bfe8420008f5e9bf5e221427ef7e0838faa04ede8 SHA512 a02cb0aabf9ce261944be9097ad9923bcbdc6b61989e764ac67ff5a46dedaff4f39a27ede733c081e3cc8e0b31f494e6be9aebcae9f4f8c63c4e0184ac9e320b +DIST ookla-speedtest-1.2.0-linux-x86_64.tgz 1106829 BLAKE2B 0eef2c45e3b8d2a9b22f52dce3661d2d0ca472f7127404c0d2ba696068a17e09bdc37427162c41ddb7a3f928c3c402047630f7cd733a3651ee4f65ede2f5d6c2 SHA512 f7ea618abcb17204fea3ede6ec84ed968cd2625540a2922247019830fc6f80a3d2e744a78fc37c7c265e7f51222334b49aef222f80acc1698a57c3c9066708e1 diff --git a/net-analyzer/ookla-speedtest/metadata.xml b/net-analyzer/ookla-speedtest/metadata.xml new file mode 100644 index 000000000000..b74538a2763f --- /dev/null +++ b/net-analyzer/ookla-speedtest/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <longdescription> + Speedtest CLI brings the trusted technology and global server network + behind Speedtest to the command line. Built for software developers, + system administrators and computer enthusiasts alike, + Speedtest CLI is the first official Linux-native Speedtest application + backed by Ookla. + </longdescription> +</pkgmetadata> diff --git a/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild b/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild new file mode 100644 index 000000000000..04352bc97a59 --- /dev/null +++ b/net-analyzer/ookla-speedtest/ookla-speedtest-1.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Internet connection measurement by Ookla" +HOMEPAGE="https://www.speedtest.net/apps/cli" +SRC_URI=" + amd64? ( https://install.speedtest.net/app/cli/${P}-linux-x86_64.tgz ) + arm? ( https://install.speedtest.net/app/cli/${P}-linux-armhf.tgz ) + arm64? ( https://install.speedtest.net/app/cli/${P}-linux-aarch64.tgz ) + x86? ( https://install.speedtest.net/app/cli/${P}-linux-i386.tgz ) +" +S="${WORKDIR}" + +LICENSE="Ookla" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" +RESTRICT="bindist mirror" + +QA_PREBUILT="usr/bin/ookla-speedtest" + +src_install() { + newbin speedtest ookla-speedtest + newman speedtest.5 ookla-speedtest.5 + newdoc speedtest.md ookla-speedtest.md +} diff --git a/net-analyzer/openbsd-netcat/Manifest b/net-analyzer/openbsd-netcat/Manifest index 6b9fe794d87a..9d649ed1d187 100644 --- a/net-analyzer/openbsd-netcat/Manifest +++ b/net-analyzer/openbsd-netcat/Manifest @@ -1,4 +1,4 @@ -DIST netcat-openbsd_1.105-7.debian.tar.gz 31843 BLAKE2B 115eb2d0c0f35055eb26608746806ba97d15b9320954b5d531a73f3f76ed22238395797e90bc3e60dd9cf5b31e696eec59843f37001093013ed0ef82ae590126 SHA512 ec507c858a9f0e75f5a8d6ee8e60eef5200428e55091e831a7acba6c61d70f97af01103c9b65354b0ce773214b0758d957852af793debb70be8aab5b5900b3f6 -DIST netcat-openbsd_1.105.orig.tar.gz 14891 BLAKE2B 65119a4e2cb3d9cd7b2d7d346b827ff1c175cc3255f40d70bbd45213b438635d6b063b3cf210d27595e38b0d67339788221ae5c3737e6096782245fb573bca3a SHA512 1e515b5af83a12c6f270d6e8bede6406cc7c9f83ca0e316816508dfe2e2c49cda3fffb6b24a3922bf9908dc8b70d540eb8cc49e9cbfe867e49133c004d3f4703 -DIST netcat-openbsd_1.190-2.debian.tar.xz 34836 BLAKE2B 3ff4390c07d05e8d1a19c8696da12bdc6bba07c6e88281b04cd7915509f44a14dda66462128da768b255d92f3a02d008750a860db9290f9f8e0e0bb9dd66e01b SHA512 c33510ad6761627e0b7e564747f6ae82c7569157bdc91f6a282a97b038b2b0917c27fdfba137462c7c34d84fcfdfe8b6393204884d153e3d200a86f5c6657a9a -DIST netcat-openbsd_1.190.orig.tar.gz 22384 BLAKE2B c3e83106f53a0214f71c805b1dfe6b66718dfca217f713a0d7016cb0a3c75c78580fbdd277bd7b5324371145c4b986ebb867e6f779cd61ffecb8e732ebabcb84 SHA512 32310813391f63b8283dc4a63e52821e464ecbfcd0ea995e8e15047c6252a86b31eb4725dc69b778594c43d6ce0cc081aa0f00d7cda0587c91941f20b93a33fe +DIST netcat-openbsd_1.218-5.debian.tar.xz 52052 BLAKE2B 38ccde34bfa6f1873a8e38fa7355f94bc74cdeb125fd4081fd68819a685d49a4c8a6cc7ed243d49df2d38c7536f4ac680d598bd4c28a938bc4750c89376d2961 SHA512 a230eb143e32fe80ee108325bb81c4e163d48982b484bf4a93ef266e9eed12890e7e294c2fe3dd2ce91fe5aec7de2f1407bf25dc938c2565bfb3e0759555dddc +DIST netcat-openbsd_1.218.orig.tar.gz 22964 BLAKE2B 2dba29cc93ef5295ec24db7632454564fa640fba139116d2732aff465c9a4b37238f65d51ad727f9b29d304b73ce05282b82ec468444c63f5611a90a1384ac62 SHA512 a830f0e3efdff01ba1bb0b344f49d545b9c184001cd641e523a6d24670b97d52dc723318660a5ec8f3215cb57ebe62ca4c06387000b6c8b6495a5c653a4206c6 +DIST netcat-openbsd_1.219-1.debian.tar.xz 52048 BLAKE2B 62c2e4a6446fbdb01ea34a70c10dc72a980e62b4d8e06e4564f05932b9fb291be73558a1b8c11f448c509b0fc3c5fe42381a1a9f0a14bba0c2e087dd1e6da9f1 SHA512 badc1afbe8a467c068fa1d3bf12817d568eae5bb9774f9f11d3b30c065eb3a8b39724bb456329d7153ea3160cd10fab159a6756f7eeafd9bfc8c5d78114f7da6 +DIST netcat-openbsd_1.219.orig.tar.gz 22940 BLAKE2B 4e871124a22fec2ba572f2a614b7eb5134565acd5d952973f7e7f76ead6b22d0811efcc916726da1e7719c5d3014f94ea53ad09804a77b55c4b15fc571bf0e95 SHA512 9f6d531d33410457b8f1e6a3eb0d105dbd819d5e4fe9753d32d7fd4583680ceba102a60307a8b5ef26b47047492b207388742b725da3708d30d360d4a196f115 diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch deleted file mode 100644 index 8c68a66ad548..000000000000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-darwin.patch +++ /dev/null @@ -1,86 +0,0 @@ -Allow compilation on Darwin - ---- netcat.c -+++ netcat.c -@@ -43,11 +43,13 @@ - #include <arpa/telnet.h> - #include <arpa/inet.h> - -+#ifndef IPTOS_LOWCOST -+# define IPTOS_LOWCOST 0x02 -+#endif - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - # define IPTOS_THROUGHPUT 0x08 - # define IPTOS_RELIABILITY 0x04 --# define IPTOS_LOWCOST 0x02 - # define IPTOS_MINCOST IPTOS_LOWCOST - #endif /* IPTOS_LOWDELAY */ - -@@ -96,8 +98,9 @@ - #include <unistd.h> - #include <fcntl.h> - #include <limits.h> --#include <bsd/stdlib.h> --#include <bsd/string.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - #include "atomicio.h" - - #ifndef SUN_LEN -@@ -169,6 +172,43 @@ - socklen_t salen, int ctimeout); - static void quit(); - -+static char* strtonumerrs[] = { -+ "too large", -+ "too small", -+ "invalid" -+}; -+ -+static long long -+strtonum( -+ const char *nptr, -+ long long minval, -+ long long maxval, -+ const char **errstr) -+{ -+ long long val; -+ -+ while (*nptr != '\0' && isspace(*nptr)) -+ nptr++; -+ if (*nptr == '\0') { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[2]; -+ return 0; -+ } -+ val = atoll(nptr); -+ if (val < minval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[1]; -+ return 0; -+ } -+ if (val > maxval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[0]; -+ return 0; -+ } -+ *errstr = NULL; -+ return val; -+} -+ - int - main(int argc, char *argv[]) - { ---- socks.c -+++ socks.c -@@ -38,7 +38,7 @@ - #include <string.h> - #include <unistd.h> - #include <resolv.h> --#include <bsd/readpassphrase.h> -+#include <readpassphrase.h> - #include "atomicio.h" - - #define SOCKS_PORT "1080" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch new file mode 100644 index 000000000000..a9603b38bc03 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-musl-b64_ntop.patch @@ -0,0 +1,349 @@ +diff -Naur netcat-openbsd-1.105.orig/Makefile netcat-openbsd-1.105/Makefile +--- netcat-openbsd-1.105.orig/Makefile 2017-06-18 09:01:44.293852659 -0700 ++++ netcat-openbsd-1.105/Makefile 2017-06-18 09:04:35.566687655 -0700 +@@ -1,7 +1,7 @@ + # $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $ + + PROG= nc +-SRCS= netcat.c atomicio.c socks.c ++SRCS= netcat.c atomicio.c socks.c compat/base64.c + + LIBS= `pkg-config --libs libbsd` -lresolv + OBJS= $(SRCS:.c=.o) +diff -Naur netcat-openbsd-1.105.orig/compat/base64.c netcat-openbsd-1.105/compat/base64.c +--- netcat-openbsd-1.105.orig/compat/base64.c 1969-12-31 16:00:00.000000000 -0800 ++++ netcat-openbsd-1.105/compat/base64.c 2017-06-18 09:01:31.288700637 -0700 +@@ -0,0 +1,315 @@ ++/* $OpenBSD: base64.c,v 1.8 2015/01/16 16:48:51 deraadt Exp $ */ ++ ++/* ++ * Copyright (c) 1996 by Internet Software Consortium. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS ++ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE ++ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL ++ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR ++ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ++ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ */ ++ ++/* ++ * Portions Copyright (c) 1995 by International Business Machines, Inc. ++ * ++ * International Business Machines, Inc. (hereinafter called IBM) grants ++ * permission under its copyrights to use, copy, modify, and distribute this ++ * Software with or without fee, provided that the above copyright notice and ++ * all paragraphs of this notice appear in all copies, and that the name of IBM ++ * not be used in connection with the marketing of any product incorporating ++ * the Software or modifications thereof, without specific, written prior ++ * permission. ++ * ++ * To the extent it has a right to do so, IBM grants an immunity from suit ++ * under its patents, if any, for the use, sale or manufacture of products to ++ * the extent that such products are used for performing Domain Name System ++ * dynamic updates in TCP/IP networks by means of the Software. No immunity is ++ * granted for any product per se or for any other function of any product. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES, ++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A ++ * PARTICULAR PURPOSE. IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL, ++ * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN ++ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. ++ */ ++ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <arpa/nameser.h> ++ ++#include <ctype.h> ++#include <resolv.h> ++#include <stdio.h> ++ ++#include <stdlib.h> ++#include <string.h> ++ ++static const char Base64[] = ++ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; ++static const char Pad64 = '='; ++ ++/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt) ++ The following encoding technique is taken from RFC 1521 by Borenstein ++ and Freed. It is reproduced here in a slightly edited form for ++ convenience. ++ ++ A 65-character subset of US-ASCII is used, enabling 6 bits to be ++ represented per printable character. (The extra 65th character, "=", ++ is used to signify a special processing function.) ++ ++ The encoding process represents 24-bit groups of input bits as output ++ strings of 4 encoded characters. Proceeding from left to right, a ++ 24-bit input group is formed by concatenating 3 8-bit input groups. ++ These 24 bits are then treated as 4 concatenated 6-bit groups, each ++ of which is translated into a single digit in the base64 alphabet. ++ ++ Each 6-bit group is used as an index into an array of 64 printable ++ characters. The character referenced by the index is placed in the ++ output string. ++ ++ Table 1: The Base64 Alphabet ++ ++ Value Encoding Value Encoding Value Encoding Value Encoding ++ 0 A 17 R 34 i 51 z ++ 1 B 18 S 35 j 52 0 ++ 2 C 19 T 36 k 53 1 ++ 3 D 20 U 37 l 54 2 ++ 4 E 21 V 38 m 55 3 ++ 5 F 22 W 39 n 56 4 ++ 6 G 23 X 40 o 57 5 ++ 7 H 24 Y 41 p 58 6 ++ 8 I 25 Z 42 q 59 7 ++ 9 J 26 a 43 r 60 8 ++ 10 K 27 b 44 s 61 9 ++ 11 L 28 c 45 t 62 + ++ 12 M 29 d 46 u 63 / ++ 13 N 30 e 47 v ++ 14 O 31 f 48 w (pad) = ++ 15 P 32 g 49 x ++ 16 Q 33 h 50 y ++ ++ Special processing is performed if fewer than 24 bits are available ++ at the end of the data being encoded. A full encoding quantum is ++ always completed at the end of a quantity. When fewer than 24 input ++ bits are available in an input group, zero bits are added (on the ++ right) to form an integral number of 6-bit groups. Padding at the ++ end of the data is performed using the '=' character. ++ ++ Since all base64 input is an integral number of octets, only the ++ ------------------------------------------------- ++ following cases can arise: ++ ++ (1) the final quantum of encoding input is an integral ++ multiple of 24 bits; here, the final unit of encoded ++ output will be an integral multiple of 4 characters ++ with no "=" padding, ++ (2) the final quantum of encoding input is exactly 8 bits; ++ here, the final unit of encoded output will be two ++ characters followed by two "=" padding characters, or ++ (3) the final quantum of encoding input is exactly 16 bits; ++ here, the final unit of encoded output will be three ++ characters followed by one "=" padding character. ++ */ ++ ++int ++b64_ntop(src, srclength, target, targsize) ++ u_char const *src; ++ size_t srclength; ++ char *target; ++ size_t targsize; ++{ ++ size_t datalength = 0; ++ u_char input[3]; ++ u_char output[4]; ++ int i; ++ ++ while (2 < srclength) { ++ input[0] = *src++; ++ input[1] = *src++; ++ input[2] = *src++; ++ srclength -= 3; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ output[3] = input[2] & 0x3f; ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Base64[output[3]]; ++ } ++ ++ /* Now we worry about padding. */ ++ if (0 != srclength) { ++ /* Get what's left. */ ++ input[0] = input[1] = input[2] = '\0'; ++ for (i = 0; i < srclength; i++) ++ input[i] = *src++; ++ ++ output[0] = input[0] >> 2; ++ output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); ++ output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); ++ ++ if (datalength + 4 > targsize) ++ return (-1); ++ target[datalength++] = Base64[output[0]]; ++ target[datalength++] = Base64[output[1]]; ++ if (srclength == 1) ++ target[datalength++] = Pad64; ++ else ++ target[datalength++] = Base64[output[2]]; ++ target[datalength++] = Pad64; ++ } ++ if (datalength >= targsize) ++ return (-1); ++ target[datalength] = '\0'; /* Returned value doesn't count \0. */ ++ return (datalength); ++} ++ ++/* skips all whitespace anywhere. ++ converts characters, four at a time, starting at (or after) ++ src from base - 64 numbers into three 8 bit bytes in the target area. ++ it returns the number of data bytes stored at the target, or -1 on error. ++ */ ++ ++int ++b64_pton(src, target, targsize) ++ char const *src; ++ u_char *target; ++ size_t targsize; ++{ ++ int tarindex, state, ch; ++ u_char nextbyte; ++ char *pos; ++ ++ state = 0; ++ tarindex = 0; ++ ++ while ((ch = (unsigned char)*src++) != '\0') { ++ if (isspace(ch)) /* Skip whitespace anywhere. */ ++ continue; ++ ++ if (ch == Pad64) ++ break; ++ ++ pos = strchr(Base64, ch); ++ if (pos == 0) /* A non-base64 character. */ ++ return (-1); ++ ++ switch (state) { ++ case 0: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] = (pos - Base64) << 2; ++ } ++ state = 1; ++ break; ++ case 1: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 4; ++ nextbyte = ((pos - Base64) & 0x0f) << 4; ++ if (tarindex + 1 < targsize) ++ target[tarindex+1] = nextbyte; ++ else if (nextbyte) ++ return (-1); ++ } ++ tarindex++; ++ state = 2; ++ break; ++ case 2: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64) >> 2; ++ nextbyte = ((pos - Base64) & 0x03) << 6; ++ if (tarindex + 1 < targsize) ++ target[tarindex+1] = nextbyte; ++ else if (nextbyte) ++ return (-1); ++ } ++ tarindex++; ++ state = 3; ++ break; ++ case 3: ++ if (target) { ++ if (tarindex >= targsize) ++ return (-1); ++ target[tarindex] |= (pos - Base64); ++ } ++ tarindex++; ++ state = 0; ++ break; ++ } ++ } ++ ++ /* ++ * We are done decoding Base-64 chars. Let's see if we ended ++ * on a byte boundary, and/or with erroneous trailing characters. ++ */ ++ ++ if (ch == Pad64) { /* We got a pad char. */ ++ ch = (unsigned char)*src++; /* Skip it, get next. */ ++ switch (state) { ++ case 0: /* Invalid = in first position */ ++ case 1: /* Invalid = in second position */ ++ return (-1); ++ ++ case 2: /* Valid, means one byte of info */ ++ /* Skip any number of spaces. */ ++ for (; ch != '\0'; ch = (unsigned char)*src++) ++ if (!isspace(ch)) ++ break; ++ /* Make sure there is another trailing = sign. */ ++ if (ch != Pad64) ++ return (-1); ++ ch = (unsigned char)*src++; /* Skip the = */ ++ /* Fall through to "single trailing =" case. */ ++ /* FALLTHROUGH */ ++ ++ case 3: /* Valid, means two bytes of info */ ++ /* ++ * We know this char is an =. Is there anything but ++ * whitespace after it? ++ */ ++ for (; ch != '\0'; ch = (unsigned char)*src++) ++ if (!isspace(ch)) ++ return (-1); ++ ++ /* ++ * Now make sure for cases 2 and 3 that the "extra" ++ * bits that slopped past the last full byte were ++ * zeros. If we don't check them, they become a ++ * subliminal channel. ++ */ ++ if (target && tarindex < targsize && ++ target[tarindex] != 0) ++ return (-1); ++ } ++ } else { ++ /* ++ * We ended by seeing the end of the string. Make sure we ++ * have no partial bytes lying around. ++ */ ++ if (state != 0) ++ return (-1); ++ } ++ ++ return (tarindex); ++} +diff -Naur netcat-openbsd-1.105.orig/compat/base64.h netcat-openbsd-1.105/compat/base64.h +--- netcat-openbsd-1.105.orig/compat/base64.h 1969-12-31 16:00:00.000000000 -0800 ++++ netcat-openbsd-1.105/compat/base64.h 2017-06-18 09:09:02.057554167 -0700 +@@ -0,0 +1,3 @@ ++#include <sys/types.h> ++int b64_ntop(u_char const* src, size_t srclength, char *target, size_t targsize); ++int b64_pton(char const* src, u_char *target, size_t targsize); +diff -Naur netcat-openbsd-1.105.orig/socks.c netcat-openbsd-1.105/socks.c +--- netcat-openbsd-1.105.orig/socks.c 2017-06-18 09:01:44.293852659 -0700 ++++ netcat-openbsd-1.105/socks.c 2017-06-18 09:09:21.105757665 -0700 +@@ -40,6 +40,7 @@ + #include <resolv.h> + #include <bsd/readpassphrase.h> + #include "atomicio.h" ++#include "compat/base64.h" + + #define SOCKS_PORT "1080" + #define HTTP_PROXY_PORT "3128" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch deleted file mode 100644 index e1a462e746b7..000000000000 --- a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin.patch +++ /dev/null @@ -1,137 +0,0 @@ -Allow compilation on Darwin - -diff --git a/netcat.c b/netcat.c -index a0fb51b..bbb5dd1 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -51,11 +51,13 @@ - # include <bsd/readpassphrase.h> - #endif - -+#ifndef IPTOS_LOWCOST -+# define IPTOS_LOWCOST 0x02 -+#endif - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 - # define IPTOS_THROUGHPUT 0x08 - # define IPTOS_RELIABILITY 0x04 --# define IPTOS_LOWCOST 0x02 - # define IPTOS_MINCOST IPTOS_LOWCOST - #endif /* IPTOS_LOWDELAY */ - -@@ -108,8 +110,9 @@ - # include <tls.h> - #endif - #include <unistd.h> --#include <bsd/stdlib.h> --#include <bsd/string.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - - #include "atomicio.h" - -@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, - - static void quit(); - -+static char* strtonumerrs[] = { -+ "too large", -+ "too small", -+ "invalid" -+}; -+ -+static long long -+strtonum( -+ const char *nptr, -+ long long minval, -+ long long maxval, -+ const char **errstr) -+{ -+ long long val; -+ -+ while (*nptr != '\0' && isspace(*nptr)) -+ nptr++; -+ if (*nptr == '\0') { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[2]; -+ return 0; -+ } -+ val = atoll(nptr); -+ if (val < minval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[1]; -+ return 0; -+ } -+ if (val > maxval) { -+ if (errstr != NULL) -+ *errstr = strtonumerrs[0]; -+ return 0; -+ } -+ *errstr = NULL; -+ return val; -+} -+ - int - main(int argc, char *argv[]) - { -@@ -814,9 +814,8 @@ - # endif - } else { - len = sizeof(cliaddr); -- connfd = accept4(s, (struct sockaddr *)&cliaddr, -- &len, SOCK_NONBLOCK); -- if (connfd == -1) { -+ connfd = accept(s, (struct sockaddr *)&cliaddr, &len); -+ if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) { - /* For now, all errnos are fatal */ - err(1, "accept"); - } -@@ -1092,14 +1091,16 @@ - int s, save_errno; - - if (uflag) { -- if ((s = unix_bind(unix_dg_tmp_socket, SOCK_CLOEXEC)) < 0) -+ if ((s = unix_bind(unix_dg_tmp_socket, 0)) < 0) - return -1; - } else { -- if ((s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) { -+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { - errx(1,"create unix socket failed"); - return -1; - } - } -+ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) -+ return -1; - - memset(&s_un, 0, sizeof(struct sockaddr_un)); - s_un.sun_family = AF_UNIX; -@@ -1174,9 +1175,13 @@ - port, gai_strerror(error)); - - for (res = res0; res; res = res->ai_next) { -- if ((s = socket(res->ai_family, res->ai_socktype | -- SOCK_NONBLOCK, res->ai_protocol)) < 0) -+ if ((s = socket(res->ai_family, res->ai_socktype, -+ res->ai_protocol)) < 0) -+ continue; -+ if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { -+ close(s); - continue; -+ } - - /* Bind to a local port or source address if specified. */ - if (sflag || pflag) { -diff --git a/socks.c b/socks.c -index 9068f39..68b68e3 100644 ---- a/socks.c -+++ b/socks.c -@@ -38,7 +38,7 @@ - #include <string.h> - #include <unistd.h> - #include <resolv.h> --#include <bsd/readpassphrase.h> -+#include <readpassphrase.h> - #include "atomicio.h" - - #define SOCKS_PORT "1080" diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch new file mode 100644 index 000000000000..216b8c207922 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.190-darwin13.patch @@ -0,0 +1,54 @@ +strtonum isn't available on <Darwin-11 + +however, it is in the header files on systems like 10.15 with an +availability clause, so don't define strtonum static such that it +matches the prototype from stdlib.h + +diff --git a/netcat.c b/netcat.c +index a0fb51b..bbb5dd1 100644 +--- a/netcat.c ++++ b/netcat.c +@@ -240,6 +243,43 @@ static int connect_with_timeout(int fd, const struct sockaddr *sa, + + static void quit(); + ++static char* strtonumerrs[] = { ++ "too large", ++ "too small", ++ "invalid" ++}; ++ ++long long ++strtonum( ++ const char *nptr, ++ long long minval, ++ long long maxval, ++ const char **errstr) ++{ ++ long long val; ++ ++ while (*nptr != '\0' && isspace(*nptr)) ++ nptr++; ++ if (*nptr == '\0') { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[2]; ++ return 0; ++ } ++ val = atoll(nptr); ++ if (val < minval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[1]; ++ return 0; ++ } ++ if (val > maxval) { ++ if (errstr != NULL) ++ *errstr = strtonumerrs[0]; ++ return 0; ++ } ++ *errstr = NULL; ++ return val; ++} ++ + int + main(int argc, char *argv[]) + { diff --git a/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch new file mode 100644 index 000000000000..564c414fc750 --- /dev/null +++ b/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.219-darwin.patch @@ -0,0 +1,95 @@ +Allow compilation on Darwin, reverting parts of Linux/Debian patch + +Signed-off-by: Fabian Groffen <grobian@gentoo.org> + +--- a/netcat.c 2023-09-26 15:04:51.169658537 +0200 ++++ b/netcat.c 2023-09-26 15:07:00.270929256 +0200 +@@ -50,13 +50,18 @@ + # include <bsd/readpassphrase.h> + #endif + ++#ifndef IPTOS_LOWCOST ++# define IPTOS_LOWCOST 0x02 ++#endif + #ifndef IPTOS_LOWDELAY + # define IPTOS_LOWDELAY 0x10 + # define IPTOS_THROUGHPUT 0x08 + # define IPTOS_RELIABILITY 0x04 +-# define IPTOS_LOWCOST 0x02 + # define IPTOS_MINCOST IPTOS_LOWCOST + #endif /* IPTOS_LOWDELAY */ ++#ifndef SOCK_CLOEXEC ++# define SOCK_CLOEXEC 0 ++#endif + + # ifndef IPTOS_DSCP_AF11 + # define IPTOS_DSCP_AF11 0x28 +@@ -108,8 +113,9 @@ + # include <tls.h> + #endif + #include <unistd.h> +-#include <bsd/stdlib.h> +-#include <bsd/string.h> ++#include <stdlib.h> ++#include <string.h> ++#include <ctype.h> + + #include "atomicio.h" + +@@ -814,9 +820,8 @@ + int connfd; + + len = sizeof(cliaddr); +- connfd = accept4(s, (struct sockaddr *)&cliaddr, +- &len, SOCK_NONBLOCK); +- if (connfd == -1) { ++ connfd = accept(s, (struct sockaddr *)&cliaddr, &len); ++ if (connfd == -1 || fcntl(connfd, F_SETFL, O_NONBLOCK) == -1) { + /* For now, all errnos are fatal */ + err(1, "accept"); + } +@@ -1069,6 +1074,8 @@ + } else + err(1, "poll failed"); + } ++ if (fcntl(s, F_SETFD, FD_CLOEXEC) == -1) ++ return -1; + + return ret; + } +@@ -1218,9 +1225,13 @@ + port, gai_strerror(error)); + + for (res = res0; res; res = res->ai_next) { +- if ((s = socket(res->ai_family, res->ai_socktype | +- SOCK_NONBLOCK, res->ai_protocol)) == -1) ++ if ((s = socket(res->ai_family, res->ai_socktype, ++ res->ai_protocol)) == -1) + continue; ++ if (fcntl(s, F_SETFL, O_NONBLOCK) == -1) { ++ close(s); ++ continue; ++ } + + /* Bind to a local port or source address if specified. */ + if (sflag || pflag) { +--- a/socks.c 2023-09-26 15:04:51.085185645 +0200 ++++ b/socks.c 2023-09-26 15:07:30.947097100 +0200 +@@ -38,7 +38,7 @@ + #include <string.h> + #include <unistd.h> + #include <resolv.h> +-#include <bsd/readpassphrase.h> ++#include <readpassphrase.h> + #include "atomicio.h" + + #define SOCKS_PORT "1080" +@@ -53,6 +53,8 @@ + #define SOCKS_DOMAIN 3 + #define SOCKS_IPV6 4 + ++#define explicit_bzero(S,L) bzero(S,L) ++ + int remote_connect(const char *, const char *, struct addrinfo, char *); + int socks_connect(const char *, const char *, struct addrinfo, + const char *, const char *, struct addrinfo, int, diff --git a/net-analyzer/openbsd-netcat/metadata.xml b/net-analyzer/openbsd-netcat/metadata.xml index e6b017e50acc..65ccccff4b10 100644 --- a/net-analyzer/openbsd-netcat/metadata.xml +++ b/net-analyzer/openbsd-netcat/metadata.xml @@ -1,11 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>heroxbd@gentoo.org</email> <name>Benda Xu</name> </maintainer> -<longdescription lang="en"> - This package provides the openbsd linux port of netcat. -</longdescription> </pkgmetadata> diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild deleted file mode 100644 index 298a47420fd0..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs eutils - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" -LICENSE="BSD" -SLOT="0" -IUSE="elibc_Darwin" - -KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -PATCHES=( "${WORKDIR}/debian/patches" ) - -src_prepare() { - default - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - epatch "${FILESDIR}"/${P}-darwin.patch - fi -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}/debian" - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild deleted file mode 100644 index 34432cdfd0dd..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="the OpenBSD network swiss army knife" -HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/nc/" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-7.debian.tar.gz" -LICENSE="BSD" -SLOT="0" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="dev-libs/libbsd" - -S=${WORKDIR}/netcat-openbsd-${PV} - -PATCHES=( "${WORKDIR}/debian/patches" ) - -src_install() { - # avoid name conflict against net-analyzer/netcat - newbin nc nc.openbsd - newman nc.1 nc.openbsd.1 - cd "${WORKDIR}/debian" - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "FO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild deleted file mode 100644 index 83108311916c..000000000000 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.190.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="The OpenBSD network swiss army knife" -HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ - https://salsa.debian.org/debian/netcat-openbsd" -SRC_URI="http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}.orig.tar.gz - http://http.debian.net/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${PV}-2.debian.tar.xz" -LICENSE="BSD" -SLOT="0" -IUSE="elibc_Darwin" - -KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x64-macos" - -DEPEND="virtual/pkgconfig" -RDEPEND="!elibc_Darwin? ( dev-libs/libbsd ) - !net-analyzer/netcat - !net-analyzer/netcat6 -" - -S=${WORKDIR}/netcat-openbsd-${PV} - -src_prepare() { - for i_patch in $(<"${WORKDIR}"/debian/patches/series); do - eapply "${WORKDIR}"/debian/patches/"${i_patch}" - done - if [[ ${CHOST} == *-darwin* ]] ; then - # this undoes some of the Debian/Linux changes - eapply "${FILESDIR}"/${P}-darwin.patch - fi - default -} - -src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -src_install() { - dobin nc - doman nc.1 - cd "${WORKDIR}"/debian || die - newdoc netcat-openbsd.README.Debian README - dodoc -r examples -} - -pkg_postinst() { - if [[ ${KERNEL} = "linux" ]]; then - ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" - ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" - ewarn "to the running kernel will do. See bug #490246 for details." - fi -} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild new file mode 100644 index 000000000000..c2ded9744780 --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.218_p5.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd" +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos" + +RDEPEND=" + !net-analyzer/netcat + !elibc_Darwin? ( dev-libs/libbsd ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +} diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild new file mode 100644 index 000000000000..afe9a5ea3fbf --- /dev/null +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.219_p1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=$(ver_cut 1-2) +DESCRIPTION="The OpenBSD network swiss army knife" +HOMEPAGE="https://cvsweb.openbsd.org/src/usr.bin/nc/ https://salsa.debian.org/debian/netcat-openbsd" +SRC_URI=" + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}.orig.tar.gz + mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${MY_PV}-$(ver_cut 4).debian.tar.xz +" +S="${WORKDIR}"/netcat-openbsd-${MY_PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux ~arm64-macos ~x64-macos" + +RDEPEND=" + !net-analyzer/netcat + !elibc_Darwin? ( dev-libs/libbsd ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + local i + for i in $(<"${WORKDIR}"/debian/patches/series) ; do + PATCHES+=( "${WORKDIR}"/debian/patches/${i} ) + done + + if [[ ${CHOST} == *-darwin* ]] ; then + # This undoes some of the Debian/Linux changes + PATCHES+=( "${FILESDIR}"/${PN}-1.219-darwin.patch ) + + if [[ ${CHOST##*-darwin} -lt 20 ]] ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.190-darwin13.patch ) + fi + fi + + if use elibc_musl ; then + PATCHES+=( "${FILESDIR}"/${PN}-1.105-musl-b64_ntop.patch ) + fi + + default +} + +src_compile() { + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin nc + doman nc.1 + + cd "${WORKDIR}"/debian || die + newdoc netcat-openbsd.README.Debian README + dodoc -r examples +} + +pkg_postinst() { + if use kernel_linux ; then + ewarn "SO_REUSEPORT is introduced in linux 3.9. If your running kernel is older" + ewarn "and kernel header is newer, nc will not listen correctly. Matching the header" + ewarn "to the running kernel will do. See bug #490246 for details." + fi +} diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index e9387af7ba6e..678d032cb5a3 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1 +1,2 @@ -DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0 SHA512 db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147 +DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd +DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7 diff --git a/net-analyzer/openvas-scanner/files/README.gentoo b/net-analyzer/openvas-scanner/files/README.gentoo new file mode 100644 index 000000000000..16547c23c7b4 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/README.gentoo @@ -0,0 +1,3 @@ +The redis configuration file is located in: +/etc/gvm/redis-openvas.conf +Please apply your changes to the new configuration files. diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron b/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron deleted file mode 100644 index 5563b92929b1..000000000000 --- a/net-analyzer/openvas-scanner/files/gvm-feed-sync.cron +++ /dev/null @@ -1 +0,0 @@ -0 2 * * * gvm [ -x /etc/gvm/gvm-feed-sync.sh ] && /bin/bash /etc/gvm/gvm-feed-sync.sh > /dev/null diff --git a/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh b/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh deleted file mode 100644 index ba21632a4d6c..000000000000 --- a/net-analyzer/openvas-scanner/files/gvm-feed-sync.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# GVM cron script that updates feed. - -# Start to update FEED & First NVT. -try=0 -until [ $try -ge 5 ]; do - greenbone-nvt-sync --curl &>/dev/null && break - try=$[$try+1] - sleep 30 -done - -# Check status -if [ $? -eq 0 ]; then - # Avoid your IP temporary banned because of multiple connection - sleep 5 - # Try to update scapdata. - try=0 - until [ $try -ge 5 ]; do - greenbone-scapdata-sync &>/dev/null && break - try=$[$try+1] - sleep 30 - done - - # Check status - if [ $? -eq 0 ]; then - # Avoid your IP temporary banned because of multiple connection - sleep 5 - # Try to update certdata - try=0 - until [ $try -ge 5 ]; do - greenbone-certdata-sync &>/dev/null && break - try=$[$try+1] - sleep 30 - done - - # Check status - if [ $? -eq 0 ]; then - exit 0 - else - exit 1 - fi - fi -fi diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch new file mode 100644 index 000000000000..9d7294708360 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch @@ -0,0 +1,16 @@ +Fixes underlinking pcatp lib in nasl/CMakeLists.txt +Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1611 + +diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt +index 975154a..dd1b925 100644 +--- a/nasl/CMakeLists.txt ++++ b/nasl/CMakeLists.txt +@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1) + set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}") + set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}") + # line below is needed so it also works with no-undefined which is e.g. used by Mandriva +-target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ++target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS} + ${LIBOPENVAS_MISC_LDFLAGS} + ${GLIB_JSON_LDFLAGS} + ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch deleted file mode 100644 index d5b8a2a6b62f..000000000000 --- a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/CMakeLists.txt 2019-07-21 23:16:18.608251465 +0300 -+++ b/src/CMakeLists.txt 2019-07-21 23:17:08.434210058 +0300 -@@ -175,7 +175,7 @@ - ## Install - - install (TARGETS openvassd -- RUNTIME DESTINATION ${SBINDIR} -+ RUNTIME DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - -@@ -183,7 +183,7 @@ - DESTINATION ${OPENVAS_SYSCONF_DIR}) - - install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync -- DESTINATION ${SBINDIR} -+ DESTINATION ${BINDIR} - PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE - GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - - diff --git a/net-analyzer/openvas-scanner/files/openvas.conf-22 b/net-analyzer/openvas-scanner/files/openvas.conf-22 new file mode 100644 index 000000000000..b2d964ff4b53 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/openvas.conf-22 @@ -0,0 +1 @@ +db_address = /run/redis-openvas/redis.sock diff --git a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate b/net-analyzer/openvas-scanner/files/openvas.logrotate index f80bba881c7b..7d116f6fbbc0 100644 --- a/net-analyzer/greenbone-security-assistant/files/gsad.logrotate +++ b/net-analyzer/openvas-scanner/files/openvas.logrotate @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Daemon ignore HUP so we use 'copytruncate' instead of 'create' # with safe file size to prevent losing log entries. -/var/log/gvm/gsad.log { +/var/log/gvm/openvas.log { compress missingok notifempty diff --git a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf b/net-analyzer/openvas-scanner/files/openvassd-daemon.conf deleted file mode 100644 index 6bb70d165355..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd-daemon.conf +++ /dev/null @@ -1,17 +0,0 @@ -# OpenVAS Scanner command args - -# e.g --foreground -OPENVAS_SCANNER_OPTIONS="" - -# Scanner listen socket -OPENVAS_SCANNER_LISTEN_SOCKET="--unix-socket=/var/run/openvassd.sock" - -# Scanner listen owner -OPENVAS_SCANNER_LISTEN_OWNER="--listen-owner=gvm" - -# Scanner listen group -OPENVAS_SCANNER_LISTEN_GROUP="--listen-group=gvm" - -# Scanner listen mode -OPENVAS_SCANNER_LISTEN_MODE="--listen-mode=755" - diff --git a/net-analyzer/openvas-scanner/files/openvassd.gvm.conf b/net-analyzer/openvas-scanner/files/openvassd.gvm.conf deleted file mode 100644 index 5dfb8b527454..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.gvm.conf +++ /dev/null @@ -1,124 +0,0 @@ -# You can get detailed informations from https://linux.die.net/man/8/openvassd -# Configuration file of the OpenVAS Security Scanner -# Every line starting with a '#' is a comment - -[Misc] - -# Path to the security checks folder: -plugins_folder = /var/lib/openvas/plugins - -# Path to OpenVAS caching folder: -cache_folder = /var/cache/openvas - -# Path to OpenVAS include directories: -# (multiple entries are separated with colon ':') -include_folders = /var/lib/openvas/plugins - -# Config File -config_file = /etc/openvas/openvassd.conf - -# Maximum number of simultaneous hosts tested : -max_hosts = 30 - -# Maximum number of simultaneous checks against each host tested : -max_checks = 10 - -# Niceness. If set to 'yes', openvassd will renice itself to 10. -be_nice = no - -# Log file (or 'syslog') : -logfile = /var/log/gvm/openvassd.log - -# Shall we log every details of the attack ? (disk intensive) -log_whole_attack = no - -# Log the name of the plugins that are loaded by the server ? -log_plugins_name_at_load = no - -# Dump file for debugging output, use `-' for stdout -dumpfile = /var/log/gvm/openvassd.dump - -# Rules file : -rules = /etc/openvas/openvassd.rules - -# CGI paths to check for (cgi-bin:/cgi-aws:/ can do) -cgi_path = /cgi-bin:/scripts - -# Range of the ports the port scanners will scan : -# 'default' means that OpenVAS will scan ports found in its -# services file. -port_range = default - -# Optimize the test (recommended) : -# Turn off for push hard but increase false positive and slow down scans -optimize_test = yes - -# Optimization : -# Read timeout for the sockets of the tests : -checks_read_timeout = 5 - -# Ports against which two plugins should not be run simultaneously : -# non_simult_ports = Services/www, 139, Services/finger -non_simult_ports = 139, 445 - -# Maximum lifetime of a plugin (in seconds) : -plugins_timeout = 320 - -# Safe checks rely on banner grabbing & If enabled push harder to target: -safe_checks = yes - -# Automatically activate the plugins that are depended on -auto_enable_dependencies = yes - -# Do not echo data from plugins which have been automatically enabled -silent_dependencies = no - -# Designate hosts by MAC address, not IP address (useful for DHCP networks) -use_mac_addr = no - - -#--- Knowledge base saving (can be configured by the client) : -# Save the knowledge base on disk : -save_knowledge_base = no - -# Restore the KB for each test : -kb_restore = no - -# Only test hosts whose KB we do not have : -only_test_hosts_whose_kb_we_dont_have = no - -# Only test hosts whose KB we already have : -only_test_hosts_whose_kb_we_have = no - -# KB test replay : -kb_dont_replay_scanners = no -kb_dont_replay_info_gathering = no -kb_dont_replay_attacks = no -kb_dont_replay_denials = no -kb_max_age = 864000 -#--- end of the KB section - -# Redis socket default setting -db_address = /tmp/redis.sock - -# If this option is set, OpenVAS will not scan a network incrementally -# (10.0.0.1, then 10.0.0.2, 10.0.0.3 and so on..) but will attempt to -# slice the workload throughout the whole network (ie: it will scan -# 10.0.0.1, then 10.0.0.127, then 10.0.0.2, then 10.0.0.128 and so on... -slice_network_addresses = no - -# Should consider all the NASL scripts as being signed ? (unsafe if set to 'yes') -nasl_no_signature_check = yes - -#Certificates -cert_file=/var/lib/gvm/CA/servercert.pem -key_file=/var/lib/gvm/private/CA/serverkey.pem -ca_file=/var/lib/gvm/CA/cacert.pem - -# If you decide to protect your private key with a password, -# uncomment and change next line -# pem_password=password -# If you want to force the use of a client certificate, uncomment next line -# force_pubkey_auth = yes - -#end. diff --git a/net-analyzer/openvas-scanner/files/openvassd.init b/net-analyzer/openvas-scanner/files/openvassd.init deleted file mode 100644 index 9bd7332134fc..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.init +++ /dev/null @@ -1,14 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="Open Vulnerability Assessment Scanner" -command="/usr/bin/openvassd" -command_args="${OPENVAS_SCANNER_OPTIONS} ${OPENVAS_SCANNER_LISTEN_SOCKET} ${OPENVAS_SCANNER_LISTEN_OWNER} ${OPENVAS_SCANNER_LISTEN_GROUP} ${OPENVAS_SCANNER_LISTEN_MODE}" -pidfile="/run/openvassd.pid" -command_background="true" - -depend() { - after bootmisc - need localmount net redis -} diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate deleted file mode 100644 index 9cf47d54763d..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.logrotate +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 -# Daemon ignore HUP so we use 'copytruncate' instead of 'create' -# with safe file size to prevent losing log entries. - -/var/log/gvm/openvassd.log { - compress - missingok - notifempty - sharedscripts - copytruncate - maxsize 10M -} diff --git a/net-analyzer/openvas-scanner/files/openvassd.service b/net-analyzer/openvas-scanner/files/openvassd.service deleted file mode 100644 index b7d7df8bbab0..000000000000 --- a/net-analyzer/openvas-scanner/files/openvassd.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=Open Vulnerability Assessment Scanner -After=network.target -After=redis.service -Before=gvmd.service -Requires=redis.service - -[Service] -Type=forking -EnvironmentFile=-/etc/openvas/sysconfig/openvassd-daemon.conf -ExecStart=/usr/bin/openvassd $OPENVAS_SCANNER_OPTIONS $OPENVAS_SCANNER_LISTEN_SOCKET $OPENVAS_SCANNER_LISTEN_OWNER $OPENVAS_SCANNER_LISTEN_GROUP $OPENVAS_SCANNER_LISTEN_MODE -Restart=on-failure -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.confd b/net-analyzer/openvas-scanner/files/redis-openvas.confd new file mode 100644 index 000000000000..6a75dfdc7d28 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.confd @@ -0,0 +1,20 @@ +# Redis user. +REDIS_USER="gvm" + +# Redis group. +REDIS_GROUP="gvm" + +# Redis configuration file. +REDIS_CONF="/etc/gvm/redis-openvas.conf" + +# Redis dump directory. +REDIS_DIR="/var/lib/openvas/redis" + +# Redis options. +# (Redis expects the first argument to be the configuration file.) +REDIS_OPTS="${REDIS_CONF}" + +# Specify the network service that corresponds to the "bind" setting +# in your redis.conf. For example, if you bind to 127.0.0.1, this should +# be set to "net.lo" which provides the loopback interface. +rc_need="net.lo" diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.initd b/net-analyzer/openvas-scanner/files/redis-openvas.initd new file mode 100644 index 000000000000..0841942eac6d --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.initd @@ -0,0 +1,29 @@ +#!/sbin/openrc-run +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${REDIS_DIR:=/var/lib/openvas/redis} +: ${REDIS_CONF:=/etc/gvm/redis-openvas.conf} +: ${REDIS_OPTS:="${REDIS_CONF}"} +: ${REDIS_USER:=gvm} +: ${REDIS_GROUP:=gvm} +: ${REDIS_TIMEOUT:=30} + +# https://bugs.gentoo.org/631002#c10 +# Force '--daemonize no' to override the config file +command="/usr/sbin/redis-server" +command_args="${REDIS_OPTS} --daemonize no" +command_background="true" +command_user="${REDIS_USER}:${REDIS_GROUP}" +pidfile="/run/${RC_SVCNAME}/redis-server.pid" +retry="${REDIS_TIMEOUT}" +directory="${REDIS_DIR}" + +start_post() { + checkpath -f --mode 0644 --owner ${REDIS_USER}:${REDIS_GROUP} /var/log/gvm/openvas.log +} + +depend() { + use localmount logger + after keepalived +} diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.service b/net-analyzer/openvas-scanner/files/redis-openvas.service new file mode 100644 index 000000000000..5eb8dd29e287 --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.service @@ -0,0 +1,13 @@ +[Unit] +Description=A persistent key-value database +After=syslog.target network.target +PartOf=gvm.target + +[Service] +Type=forking +PIDFile=/run/redis-openvas/redis-server.pid +ExecStart=/usr/sbin/redis-server /etc/gvm/redis-openvas.conf +User=gvm + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles b/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles new file mode 100644 index 000000000000..6dea2932cc0b --- /dev/null +++ b/net-analyzer/openvas-scanner/files/redis-openvas.tmpfiles @@ -0,0 +1,2 @@ +# redis runtime directory +d /run/redis-openvas 0755 gvm root - diff --git a/net-analyzer/openvas-scanner/files/redis.conf.example b/net-analyzer/openvas-scanner/files/redis.conf.example deleted file mode 100644 index 6a41211aaae8..000000000000 --- a/net-analyzer/openvas-scanner/files/redis.conf.example +++ /dev/null @@ -1,57 +0,0 @@ -bind 127.0.0.1 -protected-mode yes -port 0 -tcp-backlog 511 -unixsocket /tmp/redis.sock -unixsocketperm 700 -timeout 0 -tcp-keepalive 300 -daemonize no -supervised no -pidfile /run/redis/redis.pid -loglevel notice -logfile /var/log/redis/redis.log -databases 16 -always-show-logo yes -stop-writes-on-bgsave-error yes -rdbcompression yes -rdbchecksum yes -dbfilename dump.rdb -dir /var/lib/redis/ -slave-serve-stale-data yes -slave-read-only yes -repl-diskless-sync no -repl-diskless-sync-delay 5 -repl-disable-tcp-nodelay no -slave-priority 100 -lazyfree-lazy-eviction no -lazyfree-lazy-expire no -lazyfree-lazy-server-del no -slave-lazy-flush no -appendonly no -appendfilename "appendonly.aof" -appendfsync everysec -no-appendfsync-on-rewrite no -auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 64mb -aof-load-truncated yes -aof-use-rdb-preamble no -lua-time-limit 5000 -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-ziplist-entries 512 -hash-max-ziplist-value 64 -list-max-ziplist-size -2 -list-compress-depth 0 -set-max-intset-entries 512 -zset-max-ziplist-entries 128 -zset-max-ziplist-value 64 -hll-sparse-max-bytes 3000 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit slave 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -aof-rewrite-incremental-fsync yes diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml index 50c99b9436cc..8b98cc0ee111 100644 --- a/net-analyzer/openvas-scanner/metadata.xml +++ b/net-analyzer/openvas-scanner/metadata.xml @@ -1,17 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> <use> - <flag name="cron">Install a cron job to update GVM's feed daily.</flag> - <flag name="extras">Html docs support</flag> + <flag name="snmp">Build againts <pkg>net-analyzer/net-snmp</pkg> for "improved SNMP support"</flag> </use> <longdescription lang="en"> Open Vulnerability Assessment System (OpenVAS) Scanner is the Greenbone Vulnerability Management (GVM) Solution. diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild new file mode 100644 index 000000000000..5c8c16dce1d2 --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-22.7.9.ebuild @@ -0,0 +1,158 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature + +MY_DN="openvas" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/" +SRC_URI=" + https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +SLOT="0" +LICENSE="GPL-2 GPL-2+" +KEYWORDS="amd64 ~x86" +IUSE="doc snmp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + >=dev-db/redis-5.0.3 + >=dev-libs/glib-2.42:2 + >=dev-libs/json-glib-1.4.4 + >=net-libs/gnutls-3.2.15:= + >=net-analyzer/gvm-libs-22.4 + net-libs/libpcap + app-crypt/gpgme:= + >=dev-libs/libgcrypt-1.6:= + dev-libs/libgpg-error + >=dev-libs/libksba-1.0.7 + >=net-libs/libssh-0.6.0:= + dev-libs/libbsd + snmp? ( net-analyzer/net-snmp:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=sys-devel/bison-2.5 + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + virtual/pandoc + ) + test? ( dev-libs/cgreen ) +" + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560 + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock" + "-DOPENVAS_RUN_DIR=/run/ospd" + "-DINSTALL_OLD_SYNC_SCRIPT=OFF" + "-DBUILD_WITH_NETSNMP=$(usex snmp)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doxygen-full manual + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die + local HTML_DOCS=( + "${BUILD_DIR}"/doc/generated/html/. + "${BUILD_DIR}"/doc/html-manual + ) + fi + cmake_src_install + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + if ! use prefix; then + fowners gvm:gvm /var/log/gvm + fi + + keepdir /var/lib/openvas/{gnupg,plugins} + if ! use prefix; then + fowners -R gvm:gvm /var/lib/openvas + fi + + insinto /etc/openvas + newins "${FILESDIR}/openvas.conf-22" openvas.conf + + systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service + newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf + + insinto /etc/gvm + doins config/redis-openvas.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf + fi + + fperms 0750 /etc/gvm + fperms 0640 /etc/gvm/redis-openvas.conf + + newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas + newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o gvm -g gvm + fi + keepdir /var/lib/openvas/redis + + readme.gentoo_create_doc +} + +pkg_postinst() { + tmpfiles_process redis-openvas.conf + optfeature "port scanner" net-analyzer/nmap + readme.gentoo_print_elog +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild new file mode 100644 index 000000000000..8e66176a615b --- /dev/null +++ b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd tmpfiles toolchain-funcs readme.gentoo-r1 optfeature + +MY_DN="openvas" + +DESCRIPTION="Open Vulnerability Assessment Scanner" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/" +SRC_URI=" + https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz +" + +SLOT="0" +LICENSE="GPL-2 GPL-2+" +KEYWORDS="~amd64 ~x86" +IUSE="doc snmp test" +RESTRICT="!test? ( test )" + +DEPEND=" + acct-user/gvm + app-crypt/gpgme:= + >=dev-db/redis-5.0.3 + >=dev-libs/glib-2.42:2 + >=dev-libs/libgcrypt-1.6:= + dev-libs/libgpg-error + >=dev-libs/libksba-1.0.7 + dev-libs/libbsd + >=net-libs/libssh-0.6.0:= + >=dev-libs/json-glib-1.4.4 + >=net-analyzer/gvm-libs-22.4 + >=net-libs/gnutls-3.6.4:= + net-libs/libpcap + >=net-misc/curl-7.74.0[ssl] + snmp? ( net-analyzer/net-snmp:= ) +" +RDEPEND="${DEPEND}" +BDEPEND=" + >=sys-devel/bison-2.5 + app-alternatives/lex + virtual/pkgconfig + doc? ( + app-text/doxygen[dot] + app-text/xmltoman + app-text/htmldoc + dev-perl/CGI + dev-perl/SQL-Translator + virtual/pandoc + ) + test? ( dev-libs/cgreen ) +" +PATCHES=( + # See https://github.com/greenbone/openvas-scanner/pull/1611 + "${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch +) + +src_prepare() { + cmake_src_prepare + # QA-Fix | Remove -Werror compiler flag + sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die #909560 + # QA-Fix | Remove !CLANG doxygen warnings for 7.0.0 + if use doc; then + if ! tc-is-clang; then + local f + for f in doc/*.in + do + sed -i \ + -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ + -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ + "${f}" || die "couldn't disable CLANG parsing" + done + fi + fi + + #Remove tests that doesn't work in the network sandbox + if use test; then + sed -i 's/add_test (pcap-test pcap-test)/ /g' misc/CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + "-DLOCALSTATEDIR=${EPREFIX}/var" + "-DSYSCONFDIR=${EPREFIX}/etc" + "-DSBINDIR=${EPREFIX}/usr/bin" + "-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock" + "-DOPENVAS_RUN_DIR=/run/ospd" + "-DBUILD_WITH_NETSNMP=$(usex snmp)" + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + if use doc; then + cmake_build -C "${BUILD_DIR}" doxygen-full manual + fi + cmake_build rebuild_cache + if use test; then + cmake_build tests + fi +} + +src_install() { + if use doc; then + mv "${BUILD_DIR}"/doc/html "${BUILD_DIR}"/doc/html-manual || die + local HTML_DOCS=( + "${BUILD_DIR}"/doc/generated/html/. + "${BUILD_DIR}"/doc/html-manual + ) + fi + cmake_src_install + + insinto /etc/logrotate.d + newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" + + # Set proper permissions on required files/directories + keepdir /var/log/gvm + if ! use prefix; then + fowners gvm:gvm /var/log/gvm + fi + + keepdir /var/lib/openvas/{gnupg,plugins} + if ! use prefix; then + fowners -R gvm:gvm /var/lib/openvas + fi + + insinto /etc/openvas + newins "${FILESDIR}/openvas.conf-22" openvas.conf + + systemd_newunit "${FILESDIR}/redis-openvas.service" redis-openvas.service + newtmpfiles "${FILESDIR}/redis-openvas.tmpfiles" redis-openvas.conf + + insinto /etc/gvm + doins config/redis-openvas.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm /etc/gvm/redis-openvas.conf + fi + + fperms 0750 /etc/gvm + fperms 0640 /etc/gvm/redis-openvas.conf + + newconfd "${FILESDIR}/redis-openvas.confd" redis-openvas + newinitd "${FILESDIR}/redis-openvas.initd" redis-openvas + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o gvm -g gvm + fi + keepdir /var/lib/openvas/redis + + readme.gentoo_create_doc +} + +pkg_postinst() { + tmpfiles_process redis-openvas.conf + optfeature "port scanner" net-analyzer/nmap + readme.gentoo_print_elog +} diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild deleted file mode 100644 index a1e0d34ebf61..000000000000 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake flag-o-matic systemd toolchain-funcs - -MY_PN="openvas" -MY_DN="openvassd" - -DESCRIPTION="Open Vulnerability Assessment Scanner" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2 GPL-2+" -KEYWORDS="~amd64 ~x86" -IUSE="cron extras" - -DEPEND=" - app-crypt/gpgme:= - dev-db/redis - dev-libs/libgcrypt:= - dev-libs/libksba - >=net-analyzer/gvm-libs-10.0.1 - net-analyzer/net-snmp - net-libs/gnutls:= - net-libs/libpcap - net-libs/libssh:= -" - -RDEPEND=" - ${DEPEND}" - -BDEPEND=" - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - extras? ( app-doc/doxygen[dot] - app-doc/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - )" - -BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build" -S="${WORKDIR}/${MY_PN}-${PV}" - -PATCHES=( - # Install exec. to /usr/bin instead of /usr/sbin - "${FILESDIR}/${P}-sbin.patch" -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1 - sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" "$S"/src/CMakeLists.txt || die - # QA-Fix | Remove !CLANG doxygen warnings for 6.0.1 - if use extras; then - if ! tc-is-clang; then - local f - for f in doc/*.in - do - sed -i \ - -e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \ - -e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \ - "${f}" || die "couldn't disable CLANG parsing" - done - fi - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - ) - # Add release hardening flags for 6.0.1 - append-cflags -Wno-format-truncation -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector - append-ldflags -Wl,-z,relro -Wl,-z,now - cmake_src_configure -} - -src_compile() { - cmake_src_compile - if use extras; then - cmake_build -C "${BUILD_DIR}" doc - cmake_build doc-full -C "${BUILD_DIR}" doc - HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. ) - fi - cmake_build rebuild_cache -} - -src_install() { - cmake_src_install - - dodir /etc/openvas - insinto /etc/openvas - newins "${FILESDIR}/${MY_DN}.gvm.conf" openvassd.conf - - insinto /etc/openvas - doins "${FILESDIR}"/redis.conf.example - - dodir /etc/openvas/sysconfig - insinto /etc/openvas/sysconfig - doins "${FILESDIR}/${MY_DN}-daemon.conf" - - if use cron; then - # Install the cron job if they want it. - exeinto /etc/gvm - doexe "${FILESDIR}/gvm-feed-sync.sh" - fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh - - insinto /etc/cron.d - newins "${FILESDIR}"/gvm-feed-sync.cron gvm - fi - - fowners -R gvm:gvm /etc/openvas - - newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}" - newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}" - - dodir /etc/logrotate.d - insinto /etc/logrotate.d - newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" - - systemd_dounit "${FILESDIR}/${MY_DN}.service" - - # Set proper permissions on required files/directories - keepdir /var/log/gvm - fowners gvm:gvm /var/log/gvm - keepdir /var/lib/openvas/{gnupg,plugins} - fowners -R gvm:gvm /var/lib/openvas -} diff --git a/net-analyzer/opsgenie-lamp/metadata.xml b/net-analyzer/opsgenie-lamp/metadata.xml index c36c37139fad..db463f3eeb66 100644 --- a/net-analyzer/opsgenie-lamp/metadata.xml +++ b/net-analyzer/opsgenie-lamp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest new file mode 100644 index 000000000000..0bcfc7d786d4 --- /dev/null +++ b/net-analyzer/ospd-openvas/Manifest @@ -0,0 +1,2 @@ +DIST ospd-openvas-22.6.2.tar.gz 246360 BLAKE2B 22c95cafdc6c223465805f30b522d357c28b9da3df74743cdee3cc608215d730da9101c37d2498e9680f506ed1301e12d9af3c8bab1c2a1847c034c7d6c10ca8 SHA512 a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe +DIST ospd-openvas-22.7.0.tar.gz 246142 BLAKE2B bb5ea9bdc82929958466d2002ce28e63e5ff8c72561758f328c05f0d8c6431f7e305772707027f764fd881334d3c0b993d7f1727f8d7d16da83cc34b9a608895 SHA512 5a2c533589dc7a27a1be1b834243054eaf1bdb250fc41a98b0b35e6e60b8a2793e0e1d7dcd8bbf638bf23da1636efb5a80310df75727990768035743300ca8b1 diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd new file mode 100644 index 000000000000..dbe9d762dae0 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd @@ -0,0 +1,4 @@ +# OpenVAS Scanner command args + +# e.g --foreground +OSPD_OPENVAS_OPTIONS="" diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd new file mode 100644 index 000000000000..d8ef2f27c214 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd @@ -0,0 +1,24 @@ +#!/sbin/openrc-run +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +: ${GVM_USER:=gvm} +: ${GVM_GROUP:=$(id -ng ${GVM_USER})} +: ${OSPD_TIMEOUT:=30} + +name="remotely control an OpenVAS Scanner" +command=/usr/bin/ospd-openvas +command_user="${GVM_USER}:${GVM_GROUP}" +command_args="${OSPD_OPENVAS_OPTIONS} \ + --config /etc/gvm/ospd-openvas.conf" +pidfile=/run/ospd/ospd-openvas.pid +retry="${OSPD_TIMEOUT}" + +depend() { + after bootmisc redis-openvas + need localmount redis-openvas +} + +start_pre() { + checkpath -d --owner ${GVM_USER} /var/run/ospd +} diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/ospd-openvas/files/ospd-openvas.logrotate index 453462575f8b..7fed1aa23437 100644 --- a/net-analyzer/gvmd/files/gvmd.logrotate +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.logrotate @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Daemon ignore HUP so we use 'copytruncate' instead of 'create' # with safe file size to prevent losing log entries. -/var/log/gvm/gvmd.log { +/var/log/gvm/ospd-openvas.log { compress missingok notifempty diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf b/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf new file mode 100644 index 000000000000..976d81bc72bc --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.service.conf @@ -0,0 +1,7 @@ +[Unit] +After=network.target networking.service redis-openvas.service mosquitto.service +Wants=redis-openvas.service +PartOf=gvm.target + +[Service] +ExecStartPre=+setfacl -m u:gvm:rw /run/redis-openvas/redis.sock diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf b/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf new file mode 100644 index 000000000000..cd8b7d8d0e70 --- /dev/null +++ b/net-analyzer/ospd-openvas/files/ospd-openvas.service_notus.conf @@ -0,0 +1,9 @@ +[Unit] +After=network.target networking.service redis-openvas.service mosquitto.service +Wants=redis-openvas.service +PartOf=gvm.target + +[Service] +ExecStartPre=+setfacl -m u:gvm:rw /run/redis-openvas/redis.sock +ExecStart= +ExecStart=/usr/bin/ospd-openvas --config /etc/gvm/ospd-openvas.conf --log-config /etc/gvm/ospd-logging.conf --lock-file-dir /var/lib/openvas --socket-mode 0o770 --mqtt-broker-address localhost --mqtt-broker-port 1883 --notus-feed-dir /var/lib/notus/advisories diff --git a/net-analyzer/ospd-openvas/metadata.xml b/net-analyzer/ospd-openvas/metadata.xml new file mode 100644 index 000000000000..18eb90f3e699 --- /dev/null +++ b/net-analyzer/ospd-openvas/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + This is an OSP server implementation to allow GVM to remotely control OpenVAS. + Once running, you need to configure OpenVAS for the Greenbone Vulnerability Manager, for example via the web interface Greenbone Security Assistant. Then you can create scan tasks to use OpenVAS. + </longdescription> + <use> + <flag name="notus">Set systemd service file to use notus-scanner</flag> + </use> + <upstream> + <remote-id type="github">greenbone/ospd-openvas</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild new file mode 100644 index 000000000000..d202b6f35bd0 --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-22.6.2.ebuild @@ -0,0 +1,86 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas" +SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+ GPL-2+" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="doc +notus" + +DEPEND=" + acct-user/gvm + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + <dev-python/defusedxml-0.8[${PYTHON_USEDEP}] + >=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.2[${PYTHON_USEDEP}] + >=dev-python/packaging-20.4[${PYTHON_USEDEP}] + <dev-python/packaging-24.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/redis-4.5.0[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + net-libs/paho-mqtt-c + app-misc/mosquitto +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + >=net-analyzer/openvas-scanner-22.4 + notus? ( >=net-analyzer/notus-scanner-22.4 ) +" + +distutils_enable_tests unittest + +python_compile() { + if use doc; then + bash "${S}"/docs/generate || die + HTML_DOCS=( "${S}"/docs/. ) + fi + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + doins config/${PN}.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-22.confd" "${PN}" + + systemd_dounit config/${PN}.service + + if use notus; then + systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \ + ${PN}.service + else + systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \ + ${PN}.service + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas + + # OSPD OpenVAS attempts to call openvas via sudo as network security + # scanning often requires priviliged operations. + insinto /etc/sudoers.d + newins - openvas <<-EOF + gvm ALL = NOPASSWD: /usr/bin/openvas +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/openvas +} diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild new file mode 100644 index 000000000000..99c6e7b40fe7 --- /dev/null +++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 2020-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry +inherit distutils-r1 systemd + +DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas" +SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="AGPL-3+ GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +notus" + +DEPEND=" + acct-user/gvm + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + <dev-python/defusedxml-0.8[${PYTHON_USEDEP}] + >=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.2[${PYTHON_USEDEP}] + <dev-python/lxml-6.0.0[${PYTHON_USEDEP}] + >=dev-python/packaging-20.4[${PYTHON_USEDEP}] + <dev-python/packaging-25.0[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/redis-4.5.0[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + <dev-python/python-gnupg-0.6.0[${PYTHON_USEDEP}] + >=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] + >=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}] + net-libs/paho-mqtt-c + app-misc/mosquitto +" +RDEPEND=" + ${DEPEND} + app-admin/sudo + >=net-analyzer/openvas-scanner-22.4 + notus? ( >=net-analyzer/notus-scanner-22.4 ) +" + +distutils_enable_tests unittest + +python_compile() { + if use doc; then + bash "${S}"/docs/generate || die + HTML_DOCS=( "${S}"/docs/. ) + fi + distutils-r1_python_compile +} + +python_install() { + distutils-r1_python_install + + insinto /etc/gvm + doins config/${PN}.conf + if ! use prefix; then + fowners -R gvm:gvm /etc/gvm + fi + + newinitd "${FILESDIR}/${PN}-22.initd" "${PN}" + newconfd "${FILESDIR}/${PN}-22.confd" "${PN}" + + systemd_dounit config/${PN}.service + + if use notus; then + systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \ + ${PN}.service + else + systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \ + ${PN}.service + fi + + insinto /etc/logrotate.d + newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas + + # OSPD OpenVAS attempts to call openvas via sudo as network security + # scanning often requires priviliged operations. + insinto /etc/sudoers.d + newins - openvas <<-EOF + gvm ALL = NOPASSWD: /usr/bin/openvas +EOF + fperms 0750 /etc/sudoers.d + fperms 0440 /etc/sudoers.d/openvas +} diff --git a/net-analyzer/ospd/Manifest b/net-analyzer/ospd/Manifest deleted file mode 100644 index bdacc73b9a16..000000000000 --- a/net-analyzer/ospd/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ospd-2.0.0.tar.gz 81645 BLAKE2B 4c0c7af3caf274ea9e6a43790eb1e9d386ce42d9976e5e9625b49ffe12d8db2e613109458dcc59f322bc00aee39a4a89045caf302182474d1fab4ca1c4ff1bcf SHA512 971b4b57c39844ef08a0ae56d4bf87f0440c993960b5ad37516c622ad41eb2ab30fabb9d0a05fd043a9a1d98e446eaab9d5018cc1607fd711c533475f4703012 diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml deleted file mode 100644 index c20e7ad3a230..000000000000 --- a/net-analyzer/ospd/metadata.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIÅžIR</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <use> - <flag name="extras">Html docs support</flag> - </use> - <longdescription lang="en"> - OSPD is a base class for scanner wrappers which share the same communication protocol: - OSP (Open Scanner Protocol). OSP creates a unified interface for different security scanners - and makes their control flow and scan results consistently available under the central - Greenbone Vulnerability Manager service. - </longdescription> - <upstream> - <remote-id type="github">greenbone/ospd</remote-id> - </upstream> -</pkgmetadata> - diff --git a/net-analyzer/ospd/ospd-2.0.0.ebuild b/net-analyzer/ospd/ospd-2.0.0.ebuild deleted file mode 100644 index 24f2cac6bb8d..000000000000 --- a/net-analyzer/ospd/ospd-2.0.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -DESCRIPTION="Base class for scanner wrappers,communication protocol for GVM" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/ospd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="extras" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -python_compile() { - if use extras; then - bash "${S}"/doc/generate || die - HTML_DOCS=( "${S}"/doc/. ) - fi - distutils-r1_python_compile -} diff --git a/net-analyzer/ossec-hids/Manifest b/net-analyzer/ossec-hids/Manifest index e33470f61e0b..a88003bb41c7 100644 --- a/net-analyzer/ossec-hids/Manifest +++ b/net-analyzer/ossec-hids/Manifest @@ -1,3 +1 @@ -DIST ossec-hids-3.1.0.tar.gz 1886469 BLAKE2B c175c8659a8b5d0d269a5cb6bf142276f29e6f676afc6029accf854d68299d71147ba65a667601e77c6db8ca49a29afa49534e5683369f420f6389059ae61fc3 SHA512 fe55f82ac354d9fcd767d8379a492279644308788535780bb029d46688c93f259771686462570137555b40082c6756daad44bbdd1ddc953ed0bb22b65c6cb566 -DIST ossec-hids-3.2.0.tar.gz 1896977 BLAKE2B d77cff3a3a72287ad2235f346c7d07cfdad83872d956f57877ed44ad21bb717e4b4ddcfd0e8b2ce45cb90160bb63a28a7d06bc6225b53cc5ed42f7a97c5a1765 SHA512 40b25b97c43a66b8a145914ab0badd9d4f7de7d2168aa7a49abdf778c620a4b533ce3de0883d26c4c39816cf78674a053788a57c5f9c38fbea7cd8b13a35d18f -DIST ossec-hids-3.3.0.tar.gz 1900070 BLAKE2B a18a1e55ba44450c634b59099f10b674d27b2079ff456a034dc7bb4bbaf3c89b96f197515f3fb7aa54c248643f333e830a519b04cd4a9402cec2c32597fd96b2 SHA512 97c7e7b21ce88a3f1c89b79ff74b0c13804ba313cf3f30b98bcb4011f422ca050876e780c30624812d399d6b5c59629e52f6772b9ee0cd7cead1d66044dca627 +DIST ossec-hids-3.6.0.tar.gz 1921753 BLAKE2B ca33a94d09265c94dbdb99e2b9637d1e062f39ab88837a5c8f089d64a6369c1bef1e010b18ac4713cd4965dcf189bb1c2866fd33813cd94ae34ac04182070580 SHA512 1f5e897de757df264dfb56def74b7d8f886b6b9d772b5b3d0197c9cd00a32fd7fd8a7b53566851fea3cd74d433b5594cbd074e50b7dbe36305fb3c243e8ddcf5 diff --git a/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch new file mode 100644 index 000000000000..e8ed3c66dd9e --- /dev/null +++ b/net-analyzer/ossec-hids/files/gcc-fno-common-3.6.0.patch @@ -0,0 +1,402 @@ +diff --git a/src/addagent/main.c b/src/addagent/main.c +index 587a8a3d8..ab12f0326 100644 +--- a/src/addagent/main.c ++++ b/src/addagent/main.c +@@ -17,6 +17,7 @@ static void print_banner(void); + static void manage_shutdown(int sig) __attribute__((noreturn)); + #endif + ++int willchroot; + + #if defined(__MINGW32__) + static int setenv(const char *name, const char *val, __attribute__((unused)) int overwrite) +diff --git a/src/addagent/manage_agents.c b/src/addagent/manage_agents.c +index ac39c1e66..4f9c266ff 100644 +--- a/src/addagent/manage_agents.c ++++ b/src/addagent/manage_agents.c +@@ -85,6 +85,8 @@ int add_agent(int json_output) + + char authfile[257]; + ++ extern int willchroot; ++ + if(willchroot > 0) { + snprintf(authfile, 256, "%s", AUTH_FILE); //XXX + } else { +diff --git a/src/addagent/manage_agents.h b/src/addagent/manage_agents.h +index 4812dba43..f2962e80b 100644 +--- a/src/addagent/manage_agents.h ++++ b/src/addagent/manage_agents.h +@@ -147,4 +147,4 @@ extern fpos_t fp_pos; + #define GMF_UNKN_ERROR ARGV0 ": Could not run GetModuleFileName which returned (%ld).\n" + + +-int willchroot; ++//int willchroot; +diff --git a/src/addagent/manage_keys.c b/src/addagent/manage_keys.c +index 146b48326..ffb9a1f21 100644 +--- a/src/addagent/manage_keys.c ++++ b/src/addagent/manage_keys.c +@@ -336,6 +336,8 @@ int k_bulkload(const char *cmdbulk) + char delims[] = ","; + char *token = NULL; + ++ extern int willchroot; ++ + /* Check if we can open the input file */ + printf("Opening: [%s]\n", cmdbulk); + infp = fopen(cmdbulk, "r"); +diff --git a/src/analysisd/analysisd.c b/src/analysisd/analysisd.c +index a220f4421..0a81971de 100644 +--- a/src/analysisd/analysisd.c ++++ b/src/analysisd/analysisd.c +@@ -42,7 +42,12 @@ + #endif + + #ifdef SQLITE_ENABLED +-#include "syscheck-sqlite.h" ++#include <sqlite3.h> ++sqlite3 *conn; ++#endif ++ ++#ifdef LIBGEOIP_ENABLED ++GeoIP *geoipdb; + #endif + + /** Prototypes **/ +diff --git a/src/analysisd/config.h b/src/analysisd/config.h +index 8d74c756e..976d1942e 100644 +--- a/src/analysisd/config.h ++++ b/src/analysisd/config.h +@@ -12,6 +12,7 @@ + + #include "config/config.h" + #include "config/global-config.h" ++ + #ifdef LIBGEOIP_ENABLED + #include "GeoIP.h" + #endif +@@ -20,9 +21,11 @@ + extern long int __crt_ftell; /* Global ftell pointer */ + extern _Config Config; /* Global Config structure */ + ++/* + #ifdef LIBGEOIP_ENABLED + GeoIP *geoipdb; + #endif ++*/ + + int GlobalConf(const char *cfgfile); + +diff --git a/src/analysisd/decoders/geoip.c b/src/analysisd/decoders/geoip.c +index 464e4bb71..9816b4c81 100644 +--- a/src/analysisd/decoders/geoip.c ++++ b/src/analysisd/decoders/geoip.c +@@ -30,6 +30,7 @@ char *GetGeoInfobyIP(char *ip_addr) + GeoIPRecord *geoiprecord; + char *geodata = NULL; + char geobuffer[256 +1]; ++ extern GeoIP *geoipdb; + + if(!geoipdb) + { +diff --git a/src/analysisd/decoders/syscheck.c b/src/analysisd/decoders/syscheck.c +index a6d675892..30339a00d 100644 +--- a/src/analysisd/decoders/syscheck.c ++++ b/src/analysisd/decoders/syscheck.c +@@ -16,7 +16,7 @@ + #include "decoder.h" + + #ifdef SQLITE_ENABLED +-#include "syscheck-sqlite.h" ++#include <sqlite3.h> + #endif + + typedef struct __sdb { +diff --git a/src/analysisd/makelists.c b/src/analysisd/makelists.c +index 06c90db70..dfbe6a4a3 100644 +--- a/src/analysisd/makelists.c ++++ b/src/analysisd/makelists.c +@@ -32,6 +32,10 @@ time_t c_time; + char __shost[512]; + OSDecoderInfo *NULL_Decoder; + ++#ifdef LIBGEOIP_ENABLED ++GeoIP *geoipdb; ++#endif ++ + /* print help statement */ + __attribute__((noreturn)) + static void help_makelists(void) +diff --git a/src/analysisd/syscheck-sqlite.h b/src/analysisd/syscheck-sqlite.h +deleted file mode 100644 +index 526cab26e..000000000 +--- a/src/analysisd/syscheck-sqlite.h ++++ /dev/null +@@ -1,5 +0,0 @@ +-#ifdef SQLITE_ENABLED +-#include <sqlite3.h> +- +-sqlite3 *conn; +-#endif +diff --git a/src/analysisd/testrule.c b/src/analysisd/testrule.c +index c08fb4885..b1aa928f7 100644 +--- a/src/analysisd/testrule.c ++++ b/src/analysisd/testrule.c +@@ -83,6 +83,7 @@ int main(int argc, char **argv) + memset(prev_month, '\0', 4); + + #ifdef LIBGEOIP_ENABLED ++ extern GeoIP *geoipdb; + geoipdb = NULL; + #endif + +diff --git a/src/client-agent/agentd.c b/src/client-agent/agentd.c +index c09cf87d3..67828e79c 100644 +--- a/src/client-agent/agentd.c ++++ b/src/client-agent/agentd.c +@@ -23,6 +23,8 @@ void AgentdStart(const char *dir, int uid, int gid, const char *user, const char + fd_set fdset; + struct timeval fdtimeout; + ++ extern agent *agt; ++ + available_server = 0; + + /* Initial random numbers must happen before chroot */ +diff --git a/src/client-agent/agentd.h b/src/client-agent/agentd.h +index 0246a5457..a362ff9a3 100644 +--- a/src/client-agent/agentd.h ++++ b/src/client-agent/agentd.h +@@ -81,9 +81,9 @@ void os_agent_cb(int fd, short ev, void *arg); + extern time_t available_server; + extern int run_foreground; + extern keystore keys; +-extern agent *agt; ++//extern agent *agt; + #ifndef WIN32 +-struct imsgbuf server_ibuf; ++//struct imsgbuf server_ibuf; + #endif //WIN32 + + #endif /* __AGENTD_H */ +diff --git a/src/client-agent/event-forward.c b/src/client-agent/event-forward.c +index 2e81f0c90..22ed0beb9 100644 +--- a/src/client-agent/event-forward.c ++++ b/src/client-agent/event-forward.c +@@ -19,6 +19,9 @@ + /* Receive a message locally on the agent and forward it to the manager */ + void *EventForward(void) + { ++ ++ extern agent *agt; ++ + ssize_t recv_b; + char msg[OS_MAXSTR + 1]; + +diff --git a/src/client-agent/main.c b/src/client-agent/main.c +index 5f85cfb73..01c18970c 100644 +--- a/src/client-agent/main.c ++++ b/src/client-agent/main.c +@@ -16,7 +16,8 @@ + #define ARGV0 "ossec-agentd" + #endif + +-extern struct imsgbuf server_ibuf; ++//extern struct imsgbuf server_ibuf; ++struct imsgbuf server_ibuf; + + + /* Prototypes */ +@@ -112,6 +113,8 @@ int main(int argc, char **argv) + + debug1(STARTED_MSG, ARGV0); + ++ extern agent *agt; ++ + agt = (agent *)calloc(1, sizeof(agent)); + if (!agt) { + ErrorExit(MEM_ERROR, ARGV0, errno, strerror(errno)); +diff --git a/src/client-agent/notify.c b/src/client-agent/notify.c +index 1b239f26c..93fec325c 100644 +--- a/src/client-agent/notify.c ++++ b/src/client-agent/notify.c +@@ -68,6 +68,8 @@ void run_notify() + os_md5 md5sum; + time_t curr_time; + ++ extern agent *agt; ++ + keep_alive_random[0] = '\0'; + curr_time = time(0); + +diff --git a/src/client-agent/receiver-win.c b/src/client-agent/receiver-win.c +index 859bdf7f9..4ab62ee77 100644 +--- a/src/client-agent/receiver-win.c ++++ b/src/client-agent/receiver-win.c +@@ -19,6 +19,7 @@ + /* Receive events from the server */ + void *receiver_thread(__attribute__((unused)) void *none) + { ++ extern agent *agt; + int recv_b; + + char file[OS_SIZE_1024 + 1]; +diff --git a/src/client-agent/receiver.c b/src/client-agent/receiver.c +index fde64c282..5286e60dc 100644 +--- a/src/client-agent/receiver.c ++++ b/src/client-agent/receiver.c +@@ -29,6 +29,8 @@ void *receive_msg() + char cleartext[OS_MAXSTR + 1]; + char *tmp_msg; + ++ extern agent *agt; ++ + memset(cleartext, '\0', OS_MAXSTR + 1); + memset(buffer, '\0', OS_MAXSTR + 1); + +diff --git a/src/client-agent/sendmsg.c b/src/client-agent/sendmsg.c +index 454c2e714..3076dfcf9 100644 +--- a/src/client-agent/sendmsg.c ++++ b/src/client-agent/sendmsg.c +@@ -15,6 +15,9 @@ + /* Send a message to the server */ + int send_msg(int agentid, const char *msg) + { ++ ++ extern agent *agt; ++ + size_t msg_size; + char crypt_msg[OS_MAXSTR + 1]; + +diff --git a/src/client-agent/start_agent.c b/src/client-agent/start_agent.c +index 51670cee5..f1df43715 100644 +--- a/src/client-agent/start_agent.c ++++ b/src/client-agent/start_agent.c +@@ -24,6 +24,9 @@ int connect_server(int initial_id) + #ifdef WIN32 + unsigned int attempts = 2; + #endif //WIN32 ++ ++ extern agent *agt; ++ + int rc = initial_id; + + /* Checking if the initial is zero, meaning we have to +@@ -139,6 +142,8 @@ void start_agent(int is_startup) + char cleartext[OS_MAXSTR + 1]; + char fmsg[OS_MAXSTR + 1]; + ++ extern agent *agt; ++ + memset(msg, '\0', OS_MAXSTR + 2); + memset(buffer, '\0', OS_MAXSTR + 1); + memset(cleartext, '\0', OS_MAXSTR + 1); +@@ -241,6 +246,8 @@ void os_agent_cb(int fd, short ev, void *arg) { + struct imsg imsg; + struct imsgbuf *ibuf = (struct imsgbuf *)arg; + ++ extern agent *agt; ++ + if (ev & EV_READ) { + if ((n = imsg_read(ibuf) == -1 && errno != EAGAIN)) { + ErrorExit("%s: ERROR: imsg_read() failed: %s", ARGV0, strerror(errno)); +diff --git a/src/os_net/os_net.c b/src/os_net/os_net.c +index f18e3be77..756e9fac8 100644 +--- a/src/os_net/os_net.c ++++ b/src/os_net/os_net.c +@@ -14,7 +14,7 @@ + #include <errno.h> + #include "shared.h" + #include "os_net.h" +-agent *agt; ++agent *os_net_agt; + + /* Prototypes */ + static OSNetInfo *OS_Bindport(char *_port, unsigned int _proto, const char *_ip); +@@ -346,11 +346,11 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + return(OS_INVALID); + } + +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + memset(&hints, 0, sizeof(struct addrinfo)); + hints.ai_flags = AI_NUMERICHOST; +- s = getaddrinfo(agt->lip, NULL, &hints, &result); ++ s = getaddrinfo(os_net_agt->lip, NULL, &hints, &result); + if (s != 0) { + verbose("getaddrinfo: %s", gai_strerror(s)); + } +@@ -363,8 +363,8 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + memset(&hints, 0, sizeof(struct addrinfo)); + /* Allow IPv4 or IPv6 if local_ip isn't specified */ + hints.ai_family = AF_UNSPEC; +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + hints.ai_family = local_ai->ai_family; + } + } +@@ -398,13 +398,13 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip) + continue; + } + +- if (agt) { +- if (agt->lip) { ++ if (os_net_agt) { ++ if (os_net_agt->lip) { + if (bind(ossock, local_ai->ai_addr, local_ai->ai_addrlen)) { + verbose("Unable to bind to local address %s. Ignoring. (%s)", +- agt->lip, strerror(errno)); ++ os_net_agt->lip, strerror(errno)); + } +- else verbose("Connecting from local address %s", agt->lip); ++ else verbose("Connecting from local address %s", os_net_agt->lip); + } + } + +diff --git a/src/os_net/os_net.h b/src/os_net/os_net.h +index 9b7250928..3aaf00429 100644 +--- a/src/os_net/os_net.h ++++ b/src/os_net/os_net.h +@@ -13,7 +13,7 @@ + + #include "headers/shared.h" + #include "config/client-config.h" +-extern agent *agt; ++extern agent *os_net_agt; + #ifdef WIN32 + #ifndef AI_ADDRCONFIG + #define AI_ADDRCONFIG 0x0400 +diff --git a/src/win32/win_agent.c b/src/win32/win_agent.c +index 40a37e621..a2ec784f2 100644 +--- a/src/win32/win_agent.c ++++ b/src/win32/win_agent.c +@@ -124,6 +124,7 @@ int local_start() + WSADATA wsaData; + DWORD threadID; + DWORD threadID2; ++ extern agent *agt; + + /* Start agent */ + agt = (agent *)calloc(1, sizeof(agent)); +@@ -271,6 +272,7 @@ int SendMSG(__attribute__((unused)) int queue, const char *message, const char * + char tmpstr[OS_MAXSTR + 2]; + char crypt_msg[OS_MAXSTR + 2]; + DWORD dwWaitResult; ++ extern agent *agt; + + tmpstr[OS_MAXSTR + 1] = '\0'; + crypt_msg[OS_MAXSTR + 1] = '\0'; +@@ -468,6 +470,8 @@ void send_win32_info(time_t curr_time) + tmp_msg[OS_MAXSTR + 1] = '\0'; + crypt_msg[OS_MAXSTR + 1] = '\0'; + ++ extern agent *agt; ++ + debug1("%s: DEBUG: Sending keep alive message.", ARGV0); + + /* Fix time */ diff --git a/net-analyzer/ossec-hids/files/makefile-3.3.0.patch b/net-analyzer/ossec-hids/files/makefile-3.3.0.patch deleted file mode 100644 index 810bc077d438..000000000000 --- a/net-analyzer/ossec-hids/files/makefile-3.3.0.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile 2019-03-09 16:33:13.465947636 +0100 -+++ b/Makefile 2019-03-09 16:32:57.105946856 +0100 -@@ -370,7 +370,6 @@ - install-server: install-server-generic - - install-common: build -- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} - $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ - $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs - $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log -@@ -1160,7 +1159,7 @@ - #### test ########## - #################### - --CFLAGS_TEST = -g -O0 --coverage -+CFLAGS_TEST = -g -O0 - - LDFLAGS_TEST = -lcheck -lm -pthread -lrt - -@@ -1171,7 +1170,7 @@ - - test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared - --.PHONY: test run_tests build_tests test_valgrind test_coverage -+.PHONY: test run_tests build_tests test_valgrind - - test: build_tests - ${MAKE} run_tests diff --git a/net-analyzer/ossec-hids/files/makefile-3.2.0.patch b/net-analyzer/ossec-hids/files/makefile-3.6.0.patch index 810bc077d438..810bc077d438 100644 --- a/net-analyzer/ossec-hids/files/makefile-3.2.0.patch +++ b/net-analyzer/ossec-hids/files/makefile-3.6.0.patch diff --git a/net-analyzer/ossec-hids/files/makefile.patch b/net-analyzer/ossec-hids/files/makefile.patch deleted file mode 100644 index 2169b5287fd7..000000000000 --- a/net-analyzer/ossec-hids/files/makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/Makefile 2018-10-12 00:25:16.000000000 +0200 -+++ b/Makefile 2018-10-26 17:59:44.458689842 +0200 -@@ -378,7 +378,6 @@ - install-server: install-server-generic - - install-common: build -- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} - install -d -m 0550 -o root -g ${OSSEC_GROUP} ${PREFIX}/ - install -d -m 0750 -o ${OSSEC_USER} -g ${OSSEC_GROUP} ${PREFIX}/logs - install -m 0660 -o ${OSSEC_USER} -g ${OSSEC_GROUP} /dev/null ${PREFIX}/logs/ossec.log -@@ -1166,7 +1165,7 @@ - #### test ########## - #################### - --CFLAGS_TEST = -g -O0 --coverage -+CFLAGS_TEST = -g -O0 - - LDFLAGS_TEST = -lcheck -lm -pthread -lrt - -@@ -1177,7 +1176,7 @@ - - test_programs = test_os_zlib test_os_xml test_os_regex test_os_crypto test_shared - --.PHONY: test run_tests build_tests test_valgrind test_coverage -+.PHONY: test run_tests build_tests test_valgrind - - test: build_tests - ${MAKE} run_tests diff --git a/net-analyzer/ossec-hids/metadata.xml b/net-analyzer/ossec-hids/metadata.xml index a6ba742f6ee0..3d4c2c0e64ac 100644 --- a/net-analyzer/ossec-hids/metadata.xml +++ b/net-analyzer/ossec-hids/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo@seichter.de</email> - <name>Ralph Seichter</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> OSSEC is a full platform to monitor and control your systems. It mixes together all the aspects of HIDS (host-based intrusion detection), log diff --git a/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild deleted file mode 100644 index 9df4ea46973f..000000000000 --- a/net-analyzer/ossec-hids/ossec-hids-3.1.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user - -DESCRIPTION="Open Source Host-based Intrusion Detection System" -HOMEPAGE="https://www.ossec.net/" -SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="agent hybrid local mysql postgres server sqlite" -REQUIRED_USE="^^ ( agent hybrid local server ) - ?? ( mysql postgres )" - -DEPEND="mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:= ) - sys-libs/zlib:=" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${P}/src" - -declare -a MY_OPT - -pkg_setup() { - enewuser ossec -1 -1 /var/ossec - enewuser ossecm -1 -1 -1 ossec - enewuser ossecr -1 -1 -1 ossec -} - -src_prepare() { - default - eapply "${FILESDIR}/makefile.patch" -} - -src_configure() { - local target="local" - use agent && target="agent" - use hybrid && target="hybrid" - use server && target="server" - MY_OPT=( - TARGET=${target} - USE_SQLITE=$(usex sqlite) - V=0 - ZLIB_SYSTEM=yes - ) - use mysql && MY_OPT+=( DATABASE=mysql ) - use postgres && MY_OPT+=( DATABASE=pgsql ) -} - -src_compile() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec -} - -src_test() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec test -} - -src_install() { - keepdir /var/ossec/logs/{alerts,archives,firewall} - keepdir /var/ossec/lua/{compiled,native} - keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck} - keepdir /var/ossec/{.ssh,stats,tmp,var/run} - emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install -} diff --git a/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild deleted file mode 100644 index 61c466015956..000000000000 --- a/net-analyzer/ossec-hids/ossec-hids-3.2.0-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user - -DESCRIPTION="Open Source Host-based Intrusion Detection System" -HOMEPAGE="https://www.ossec.net/" -SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="agent hybrid local mysql postgres server sqlite" -REQUIRED_USE="^^ ( agent hybrid local server ) - ?? ( mysql postgres )" - -DEPEND="mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:= )" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${P}/src" -PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) - -declare -a MY_OPT - -pkg_setup() { - enewuser ossec -1 -1 /var/ossec - enewuser ossecm -1 -1 -1 ossec - enewuser ossecr -1 -1 -1 ossec -} - -src_configure() { - local target="local" - use agent && target="agent" - use hybrid && target="hybrid" - use server && target="server" - MY_OPT=( - TARGET=${target} - USE_SQLITE=$(usex sqlite) - V=0 - ZLIB_SYSTEM=yes - ) - use mysql && MY_OPT+=( DATABASE=mysql ) - use postgres && MY_OPT+=( DATABASE=pgsql ) -} - -src_compile() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec -} - -src_test() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec test -} - -src_install() { - keepdir /var/ossec/logs/{alerts,archives,firewall} - keepdir /var/ossec/lua/{compiled,native} - keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck} - keepdir /var/ossec/{.ssh,stats,tmp,var/run} - newenvd - 50ossec-hids <<<'CONFIG_PROTECT="/var/ossec/etc"' - emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install -} diff --git a/net-analyzer/ossec-hids/ossec-hids-3.2.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.2.0.ebuild deleted file mode 100644 index 417ebde460d4..000000000000 --- a/net-analyzer/ossec-hids/ossec-hids-3.2.0.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit user - -DESCRIPTION="Open Source Host-based Intrusion Detection System" -HOMEPAGE="https://www.ossec.net/" -SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="agent hybrid local mysql postgres server sqlite" -REQUIRED_USE="^^ ( agent hybrid local server ) - ?? ( mysql postgres )" - -DEPEND="mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:= )" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${P}/src" -PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) - -declare -a MY_OPT - -pkg_setup() { - enewuser ossec -1 -1 /var/ossec - enewuser ossecm -1 -1 -1 ossec - enewuser ossecr -1 -1 -1 ossec -} - -src_configure() { - local target="local" - use agent && target="agent" - use hybrid && target="hybrid" - use server && target="server" - MY_OPT=( - TARGET=${target} - USE_SQLITE=$(usex sqlite) - V=0 - ZLIB_SYSTEM=yes - ) - use mysql && MY_OPT+=( DATABASE=mysql ) - use postgres && MY_OPT+=( DATABASE=pgsql ) -} - -src_compile() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec -} - -src_test() { - emake "${MY_OPT[@]}" PREFIX=/var/ossec test -} - -src_install() { - keepdir /var/ossec/logs/{alerts,archives,firewall} - keepdir /var/ossec/lua/{compiled,native} - keepdir /var/ossec/queue/{agent-info,agentless,alerts,diff,fts,ossec,rids,rootcheck,syscheck} - keepdir /var/ossec/{.ssh,stats,tmp,var/run} - emake "${MY_OPT[@]}" PREFIX="${D}/var/ossec" install -} diff --git a/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild index c9b83c7daa34..a716eb211cf9 100644 --- a/net-analyzer/ossec-hids/ossec-hids-3.3.0.ebuild +++ b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild @@ -1,36 +1,43 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit user - DESCRIPTION="Open Source Host-based Intrusion Detection System" HOMEPAGE="https://www.ossec.net/" SRC_URI="https://github.com/ossec/ossec-hids/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" -IUSE="agent hybrid local mysql postgres server sqlite" +KEYWORDS="amd64" +IUSE="agent hybrid local mysql postgres server sqlite test" REQUIRED_USE="^^ ( agent hybrid local server ) ?? ( mysql postgres )" +RESTRICT="!test? ( test )" -DEPEND="dev-libs/libpcre2 +RDEPEND="acct-user/ossec + acct-user/ossecm + acct-user/ossecr + dev-libs/libevent + dev-libs/libpcre2[jit] mysql? ( virtual/mysql ) - sqlite? ( dev-db/sqlite:3 ) - postgres? ( dev-db/postgresql:= )" -RDEPEND="${DEPEND}" + postgres? ( dev-db/postgresql:= ) + sqlite? ( dev-db/sqlite:3 )" +DEPEND="${RDEPEND} + test? ( + dev-libs/check + dev-python/subunit + )" S="${WORKDIR}/${P}/src" -PATCHES=( "${FILESDIR}/makefile-${PV}.patch" ) declare -a MY_OPT -pkg_setup() { - enewgroup ossec - enewuser ossec -1 -1 /var/ossec ossec - enewuser ossecm -1 -1 -1 ossec - enewuser ossecr -1 -1 -1 ossec +src_prepare() { + # Patch for the GCC version 10 -fno-common change. See + # https://github.com/ossec/ossec-hids/pull/1875 + eapply -p2 "${FILESDIR}/gcc-fno-common-${PV}.patch" + eapply -p1 "${FILESDIR}/makefile-${PV}.patch" + eapply_user } src_configure() { diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest index 44c30549ab5a..781d32d58930 100644 --- a/net-analyzer/ostinato/Manifest +++ b/net-analyzer/ostinato/Manifest @@ -1 +1,2 @@ -DIST ostinato-0.9_p20180522.tar.gz 424128 BLAKE2B 69a15e523986cd34f89669fab0ed64987f68ea7d82d481de418c2d86f3b325b5c1ff9081db8c77532b603b01f504c37c24a4f7f5b7244657cac8b2f707bc7bdf SHA512 7d8359b193c98165ea376ad0ad57e01b782e35a7b887465d74c67ae1cd434036e8beb67593c569e15a87d5d0c7f602c9f01acf068e9ffff0c0496ab4f889a83a +DIST ostinato-1.1.tar.gz 612589 BLAKE2B 2244b3be5649e0623139b667c61a169a3e7f5dae6f022d6550cd825f1af8fa2c2d82210af1f381ae53af19fff9a56d58b30a406fc1f3d89c73bc7e3d0ab18fa4 SHA512 a45e157d155d4f2efe9a1594a140647b5cbd7264985b15a9ed47d86198c9df9d763170097dcfd40fae1317206e53c9155f08c48c747cce458e0cae7f3a841449 +DIST ostinato-1.2.0.tar.gz 1169889 BLAKE2B 73d1ba4801ee8f50757fbe3a5e4c6fb67957296326c5ffcc5ecfde723ee975bd6a8f494644198b4b47a296fd087e2ed7a43088facd8c39d3ed70b8056fae5da5 SHA512 c3fb1f63a8f32c199ae2c8630244a3d6110e25e9117fbc96b009fd54d6bc16dbfa120b2d26c474ca06e86dbed59a5051443f82064fb8a0eda2feb212e4e1a1c5 diff --git a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch b/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch deleted file mode 100644 index ff09d689ae5c..000000000000 --- a/net-analyzer/ostinato/files/ostinato-0.9_p20180522-buildfix.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/common/mld.cpp 2018-05-22 18:18:21.000000000 +0200 -+++ b/common/mld.cpp 2018-06-26 13:59:58.562569302 +0200 -@@ -24,6 +24,14 @@ - #include <QHostAddress> - #include <QStringList> - -+template <> inline Q_DECL_CONSTEXPR unsigned long qbswap<unsigned long>(unsigned long source) { -+ if (sizeof(unsigned long) == 8) { -+ return qbswap<quint64>(quint64(source)); -+ } else { -+ return qbswap<quint32>(quint32(source)); -+ } -+} -+ - MldProtocol::MldProtocol(StreamBase *stream, AbstractProtocol *parent) - : GmpProtocol(stream, parent) - { diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml index fb90fd94be6f..64eb1aca5936 100644 --- a/net-analyzer/ostinato/metadata.xml +++ b/net-analyzer/ostinato/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>zerochaos@gentoo.org</email> <name>Rick Farina</name> </maintainer> <upstream> - <remote-id type="google-code">ostinato</remote-id> + <remote-id type="github">pstavirs/ostinato</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild index 1beae2abfc9f..bccd03f406c0 100644 --- a/net-analyzer/ostinato/ostinato-0.9_p20180522.ebuild +++ b/net-analyzer/ostinato/ostinato-1.1-r2.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -COMMIT=9a4e7e7550c6b20a8f0f1393a55036492c1b7703 inherit qmake-utils -DESCRIPTION="A packet generator and analyzer" +DESCRIPTION="Packet generator and analyzer" HOMEPAGE="https://ostinato.org/" -SRC_URI="https://github.com/pstavirs/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -#KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="" #https://github.com/pstavirs/ostinato/issues/173 @@ -21,19 +20,23 @@ DEPEND=" dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-libs/libnl:= >=net-libs/libpcap-1.8.1-r2 " RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-${COMMIT}" - PATCHES=( - "${FILESDIR}/${P}-buildfix.patch" - "${FILESDIR}/${P}-no-modeltest.patch" + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" ) -src_configure(){ - eqmake5 PREFIX="${ED}/usr" ost.pro +src_configure() { + eqmake5 PREFIX="/usr" ost.pro +} + +src_install() { + emake INSTALL_ROOT="${ED}" install } diff --git a/net-analyzer/ostinato/ostinato-1.2.0.ebuild b/net-analyzer/ostinato/ostinato-1.2.0.ebuild new file mode 100644 index 000000000000..586f8e2f2597 --- /dev/null +++ b/net-analyzer/ostinato/ostinato-1.2.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit qmake-utils + +DESCRIPTION="Packet generator and analyzer" +HOMEPAGE="https://ostinato.org/" +SRC_URI="https://github.com/pstavirs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +#https://github.com/pstavirs/ostinato/issues/173 +# libpcap dep is versioned to pull in the fix for #602098 +RDEPEND=" + dev-libs/protobuf:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qtwidgets:5 + dev-libs/libnl:3 + >=net-libs/libpcap-1.8.1-r2 +" +DEPEND="${RDEPEND} + dev-qt/qtsvg:5 + dev-qt/qtxml:5" + +PATCHES=( + "${FILESDIR}/${PN}-0.9_p20180522-no-modeltest.patch" +) + +src_configure() { + sed -i 's#"/drone"#"/ostinato-drone"#' client/mainwindow.cpp || die + eqmake5 PREFIX="/usr" ost.pro +} + +src_install() { + emake INSTALL_ROOT="${ED}" install + mv "${ED}"/usr/bin/{drone,ostinato-drone} +} diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/p0f/metadata.xml +++ b/net-analyzer/p0f/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/p0f/p0f-3.09_beta.ebuild b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild index 68db0781a828..305af081ef7d 100644 --- a/net-analyzer/p0f/p0f-3.09_beta.ebuild +++ b/net-analyzer/p0f/p0f-3.09_beta-r1.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit toolchain-funcs +EAPI=8 + +inherit edo toolchain-funcs MY_P=${P/_beta/b} DESCRIPTION="A tool to perform passive OS detection based on SYN packets" -HOMEPAGE="http://lcamtuf.coredump.cx/p0f3/" -SRC_URI="http://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" +HOMEPAGE="https://lcamtuf.coredump.cx/p0f3/" +SRC_URI="https://lcamtuf.coredump.cx/p0f3/releases/${MY_P}.tgz" +S="${WORKDIR}"/${MY_P} LICENSE="LGPL-2.1" SLOT="0" @@ -18,8 +20,6 @@ IUSE="debug ipv6" RDEPEND="net-libs/libpcap" DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} - src_prepare() { default @@ -36,7 +36,9 @@ src_prepare() { src_compile() { tc-export CC - ./build.sh $(use debug && echo debug) || die + + edo ./build.sh $(use debug && echo debug) + emake -C tools p0f-client p0f-sendsyn $(use ipv6 && echo p0f-sendsyn6) } diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index 69e82515e9d3..62512f7495e4 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,2 +1 @@ -DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2 -DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd +DIST packit-1.8.tar.gz 150410 BLAKE2B d0a0926643b6b595159d1fec703295a880c1fcad188e2d9a6719b879bad0b1f081ab75031550257d5c8573f2d8ed9960e7d46fdbe4c4c19c669015b048509a24 SHA512 1873c687c8be489966d5f8868def3cb824264dcfd8c6572b03fd51f15f8920965c8682b13cc6a9d6fec62bf9fe3b4e91f5a9d3d4c6441232d3f6f51a244a8baf diff --git a/net-analyzer/packit/files/packit-1.0-noopt.patch b/net-analyzer/packit/files/packit-1.0-noopt.patch deleted file mode 100644 index d6bfdf6fb74f..000000000000 --- a/net-analyzer/packit/files/packit-1.0-noopt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/main.c -+++ b/src/main.c -@@ -201,6 +201,7 @@ - #ifdef DEBUG - fprintf(stdout, "DEBUG: parse_inject\n"); - #endif -+ if (!opts) print_usage(); - - while((opt = getopt(argc, argv, opts)) != -1) - { diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch deleted file mode 100644 index f4813d868ab1..000000000000 --- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch +++ /dev/null @@ -1,251 +0,0 @@ ---- a/src/capture_defs.h -+++ b/src/capture_defs.h -@@ -30,12 +30,12 @@ - #define READ_TIMEOUT 500 - #define SNAPLEN_DEFAULT 68 - --u_int16_t g_display; --u_int16_t g_link_layer; --u_int16_t g_dump_pkt; --u_int16_t g_time_gmt; --u_int16_t g_t_rst; --u_int16_t g_snap_len; --u_int32_t g_pkt_rst; -+extern u_int16_t g_display; -+extern u_int16_t g_link_layer; -+extern u_int16_t g_dump_pkt; -+extern u_int16_t g_time_gmt; -+extern u_int16_t g_t_rst; -+extern u_int16_t g_snap_len; -+extern u_int32_t g_pkt_rst; - - #endif /* __CAPTURE_DEFS_H */ ---- a/src/error.c -+++ b/src/error.c -@@ -26,6 +26,8 @@ - - #include "error.h" - -+char error_buf[ERRBUF_MAXLEN]; -+ - void - fatal_error(char *err,...) - { ---- a/src/error.h -+++ b/src/error.h -@@ -33,7 +33,7 @@ - #define SUCCESS 1 - #define FAILURE -1 - --char error_buf[ERRBUF_MAXLEN]; -+extern char error_buf[ERRBUF_MAXLEN]; - - void fatal_error(char *,...); - ---- a/src/globals.h -+++ b/src/globals.h -@@ -138,20 +138,20 @@ - #define P_INT64 0x7FFFFFFFFFFFFFFF - #define P_UINT64 0xFFFFFFFFFFFFFFFF - --char g_w_file[OPT_MAXLEN]; --char g_r_file[OPT_MAXLEN]; -+extern char g_w_file[OPT_MAXLEN]; -+extern char g_r_file[OPT_MAXLEN]; - --pcap_t *g_pkt; --u_int8_t g_tr_fin; --char *g_filter; --char *g_device; --u_int16_t g_hdr_len; --u_int16_t g_pkt_len; --u_int16_t g_verbose; --u_int16_t g_resolve; --u_int16_t g_p_mode; --u_int64_t g_cnt; --u_int64_t g_inj_cnt; --u_int64_t g_cap_cnt; -+extern pcap_t *g_pkt; -+extern u_int8_t g_tr_fin; -+extern char *g_filter; -+extern char *g_device; -+extern u_int16_t g_hdr_len; -+extern u_int16_t g_pkt_len; -+extern u_int16_t g_verbose; -+extern u_int16_t g_resolve; -+extern u_int16_t g_p_mode; -+extern u_int64_t g_cnt; -+extern u_int64_t g_inj_cnt; -+extern u_int64_t g_cap_cnt; - - #endif /* __GLOBALS_H */ ---- a/src/inject_defs.h -+++ b/src/inject_defs.h -@@ -30,7 +30,7 @@ - #ifndef __INJECTION_STRUCTS_H - #define __INJECTION_STRUCTS_H - --struct ip4hdr_opts -+extern struct ip4hdr_opts - { - u_int16_t p; /* protocol type */ - u_int16_t rand_p; -@@ -59,7 +59,7 @@ - u_int16_t rand_d_addr; - } g_ip4hdr_o; - --struct tcphdr_opts -+extern struct tcphdr_opts - { - u_int16_t s_port; /* tcp source port */ - u_int16_t d_port; /* tcp destination port */ -@@ -82,7 +82,7 @@ - - } g_thdr_o; - --struct udphdr_opts -+extern struct udphdr_opts - { - u_int16_t s_port; /* udp source port */ - u_int16_t d_port; /* udp destination port */ -@@ -90,7 +90,7 @@ - u_int16_t sum; /* udp checksum */ - } g_uhdr_o; - --struct icmp4hdr_opts -+extern struct icmp4hdr_opts - { - u_int16_t type; /* icmp4 type */ - u_int16_t code; /* icmp4 code */ -@@ -132,7 +132,7 @@ - u_int32_t ttime; /* transmit timestamp */ - } g_i4hdr_o; - --struct enethdr_opts -+extern struct enethdr_opts - { - u_int16_t rand_s_addr; - u_int16_t rand_d_addr; -@@ -143,7 +143,7 @@ - u_int8_t dhw_addr[18]; - } g_ehdr_o; - --struct arphdr_opts -+extern struct arphdr_opts - { - u_int16_t op_type; /* arp operation */ - -@@ -163,28 +163,28 @@ - u_int8_t rhw_addr[18]; - } g_ahdr_o; - --libnet_t *g_pkt_d; -+extern libnet_t *g_pkt_d; - --u_int16_t g_init_type; --u_int16_t g_rand_d_port; --u_int16_t g_rand_s_port; --u_int16_t g_s_port; --u_int16_t g_d_port; --u_int16_t g_port_range; --u_int16_t g_interval_sec; --u_int16_t g_interval_usec; --u_int16_t g_injection_type; --u_int16_t g_r_timeout; --u_int16_t g_burst_rate; --u_int16_t g_payload_len; --u_int8_t *g_payload; --u_int8_t g_hex_payload; --u_int8_t *g_s_d_port; --u_int8_t g_hwaddr_p[18]; --u_int8_t g_rawip; -+extern u_int16_t g_init_type; -+extern u_int16_t g_rand_d_port; -+extern u_int16_t g_rand_s_port; -+extern u_int16_t g_s_port; -+extern u_int16_t g_d_port; -+extern u_int16_t g_port_range; -+extern u_int16_t g_interval_sec; -+extern u_int16_t g_interval_usec; -+extern u_int16_t g_injection_type; -+extern u_int16_t g_r_timeout; -+extern u_int16_t g_burst_rate; -+extern u_int16_t g_payload_len; -+extern u_int8_t *g_payload; -+extern u_int8_t g_hex_payload; -+extern u_int8_t *g_s_d_port; -+extern u_int8_t g_hwaddr_p[18]; -+extern u_int8_t g_rawip; - --struct timeval g_bf_pcap; --struct timeval g_af_pcap; -+extern struct timeval g_bf_pcap; -+extern struct timeval g_af_pcap; - - - #endif /* __INJECTION_STRUCTS_H */ ---- a/src/main.c -+++ b/src/main.c -@@ -30,6 +30,62 @@ - - #include "main.h" - -+char g_w_file[OPT_MAXLEN]; -+char g_r_file[OPT_MAXLEN]; -+ -+pcap_t *g_pkt; -+u_int8_t g_tr_fin; -+char *g_filter; -+char *g_device; -+u_int16_t g_hdr_len; -+u_int16_t g_pkt_len; -+u_int16_t g_verbose; -+u_int16_t g_resolve; -+u_int16_t g_p_mode; -+u_int64_t g_cnt; -+u_int64_t g_inj_cnt; -+u_int64_t g_cap_cnt; -+ -+/* capture_defs.h */ -+u_int16_t g_display; -+u_int16_t g_link_layer; -+u_int16_t g_dump_pkt; -+u_int16_t g_time_gmt; -+u_int16_t g_t_rst; -+u_int16_t g_snap_len; -+u_int32_t g_pkt_rst; -+ -+/* inject_defs.h */ -+u_int16_t g_init_type; -+u_int16_t g_rand_d_port; -+u_int16_t g_rand_s_port; -+u_int16_t g_s_port; -+u_int16_t g_d_port; -+u_int16_t g_port_range; -+u_int16_t g_interval_sec; -+u_int16_t g_interval_usec; -+u_int16_t g_injection_type; -+u_int16_t g_r_timeout; -+u_int16_t g_burst_rate; -+u_int16_t g_payload_len; -+u_int8_t *g_payload; -+u_int8_t g_hex_payload; -+u_int8_t *g_s_d_port; -+u_int8_t g_hwaddr_p[18]; -+u_int8_t g_rawip; -+ -+struct timeval g_bf_pcap; -+struct timeval g_af_pcap; -+ -+struct arphdr_opts g_ahdr_o; -+struct enethdr_opts g_ehdr_o; -+struct icmp4hdr_opts g_i4hdr_o; -+struct ip4hdr_opts g_ip4hdr_o; -+struct tcphdr_opts g_thdr_o; -+struct udphdr_opts g_uhdr_o; -+ -+libnet_t *g_pkt_d; -+ - void - parse_capture_options(int argc, char *argv[]) - { diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml index 74c2baebb4ec..fc9bbe0d2a69 100644 --- a/net-analyzer/packit/metadata.xml +++ b/net-analyzer/packit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <upstream> + <remote-id type="github">resurrecting-open-source-projects/packit</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild deleted file mode 100644 index 5059d8e159a0..000000000000 --- a/net-analyzer/packit/packit-1.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.8.ebuild index 48ba4aeab1c9..4e1f8358e695 100644 --- a/net-analyzer/packit/packit-1.6.1.ebuild +++ b/net-analyzer/packit/packit-1.8.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools -DESCRIPTION="network packet generator and capture tool" +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" @@ -12,22 +13,18 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" +DEPEND="net-libs/libnet:1.1 + net-libs/libpcap" RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch - "${FILESDIR}"/${PN}-1.6.1-fno-common.patch -) src_prepare() { default + eautoreconf } src_install() { default + dodoc docs/* } diff --git a/net-analyzer/packit/packit-9999.ebuild b/net-analyzer/packit/packit-9999.ebuild deleted file mode 100644 index d58eaf300f88..000000000000 --- a/net-analyzer/packit/packit-9999.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools git-r3 - -DESCRIPTION="network packet generator and capture tool" -HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit" -EGIT_REPO_URI="https://github.com/resurrecting-open-source-projects/packit" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.0-noopt.patch -) - -src_prepare() { - default - eautoreconf -} - -src_install() { - default - dodoc docs/* -} diff --git a/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch b/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch new file mode 100644 index 000000000000..479aaeec520e --- /dev/null +++ b/net-analyzer/pathload/files/pathload-1.3.2-clang16.patch @@ -0,0 +1,34 @@ +configure.ac is missing, so need to edit this manually + +https://bugs.gentoo.org/870661 +--- a/configure ++++ b/configure +@@ -630,3 +630,3 @@ + +-main(){return(0);} ++int main(void){return(0);} + EOF +--- a/pathload_rcv.h ++++ b/pathload_rcv.h +@@ -85,3 +85,3 @@ + EXTERN l_int32 get_sndr_time_interval(double snd_time[],double *sum); +-EXTERN void sig_alrm(); ++EXTERN void sig_alrm(int __attribute__((__unused__)) unused); + EXTERN void terminate_gracefully(struct timeval exp_start_time); +@@ -100,3 +100,3 @@ + EXTERN void help(); +-EXTERN void sig_sigusr1() ; ++EXTERN void sig_sigusr1(int __attribute__((__unused__)) unused) ; + +--- a/pathload_rcv_func.c ++++ b/pathload_rcv_func.c +@@ -669,3 +669,3 @@ + +-void sig_sigusr1() ++void sig_sigusr1(int __attribute__((__unused__)) unused) + { +@@ -674,3 +674,3 @@ + +-void sig_alrm() ++void sig_alrm(int __attribute__((__unused__)) unused) + { diff --git a/net-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/pathload/metadata.xml +++ b/net-analyzer/pathload/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild index 27b8252d8e52..b8e220379490 100644 --- a/net-analyzer/pathload/pathload-1.3.2-r1.ebuild +++ b/net-analyzer/pathload/pathload-1.3.2-r1.ebuild @@ -1,24 +1,27 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Non-intrusive utility for estimation of available bandwidth of Internet paths" HOMEPAGE="https://www.cc.gatech.edu/fac/constantinos.dovrolis/bw-est/pathload.html" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tar.gz" +S="${WORKDIR}/${P/-/_}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -S=${WORKDIR}/${PN}_${PV} PATCHES=( - "${FILESDIR}"/${PN}-1.3.2-make.patch + "${FILESDIR}"/${P}-make.patch + "${FILESDIR}"/${P}-clang16.patch ) src_configure() { tc-export CC + default } diff --git a/net-analyzer/pbgpp/Manifest b/net-analyzer/pbgpp/Manifest deleted file mode 100644 index 43fd678851e9..000000000000 --- a/net-analyzer/pbgpp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pbgpp-0.2.10.tar.gz 38796 BLAKE2B d4b2ad0796a7682b4ad9bc8265c501b428854ed0c6cf3d0d0b4ed502216e3a813adb204c135b9880ca257050b92a8968449de12c14fc2a4b78c95872ca6d0c07 SHA512 ecacd1ef81b1ed379ab4bf5aad534e93bef94a2f67fdb04cfa5dc98d13f53060ce99bc220c7bce64862a182c11c4b60a31752978cec619f5546dfd7fb721d466 diff --git a/net-analyzer/pbgpp/metadata.xml b/net-analyzer/pbgpp/metadata.xml deleted file mode 100644 index dc2f73460f87..000000000000 --- a/net-analyzer/pbgpp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>chainsaw@gentoo.org</email> - <name>Tony Vroon</name> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild b/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild deleted file mode 100644 index b150d3a518fe..000000000000 --- a/net-analyzer/pbgpp/pbgpp-0.2.10.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="PCAP BGP Parser" -HOMEPAGE="https://github.com/de-cix/pbgp-parser" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-python/kafka-python[${PYTHON_USEDEP}] - dev-python/pcapy[${PYTHON_USEDEP}]" diff --git a/net-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml index 4a2800404400..685a0835d3af 100644 --- a/net-analyzer/pbnj/metadata.xml +++ b/net-analyzer/pbnj/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild index 22d8615ff550..2e661641aa78 100644 --- a/net-analyzer/pbnj/pbnj-2.04-r1.ebuild +++ b/net-analyzer/pbnj/pbnj-2.04-r1.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit perl-module -DESCRIPTION="A tool for running Nmap scans and diff'ing the results" -HOMEPAGE="http://pbnj.sourceforge.net/" -SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2" +DESCRIPTION="Tool for running Nmap scans and diff'ing the results" +HOMEPAGE="https://pbnj.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/pbnj/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" dev-perl/DBD-SQLite diff --git a/net-analyzer/pbnj/pbnj-2.04.ebuild b/net-analyzer/pbnj/pbnj-2.04.ebuild deleted file mode 100644 index 1c04a49c3a0b..000000000000 --- a/net-analyzer/pbnj/pbnj-2.04.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit perl-module - -DESCRIPTION="A tool for running Nmap scans and diff'ing the results" -HOMEPAGE="http://pbnj.sourceforge.net/" -SRC_URI="mirror://sourceforge/pbnj/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - dev-perl/DBD-SQLite - dev-perl/DBI - dev-perl/File-HomeDir - dev-perl/File-Which - dev-perl/Nmap-Parser - dev-perl/Text-CSV_XS - dev-perl/XML-Twig - dev-perl/YAML -" -RDEPEND=" - ${DEPEND} - net-analyzer/nmap -" diff --git a/net-analyzer/pchar/Manifest b/net-analyzer/pchar/Manifest deleted file mode 100644 index 7e249db080e3..000000000000 --- a/net-analyzer/pchar/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pchar-1.5.tar.gz 117678 BLAKE2B adf146867fae37e20f33cde9055b2766e3261a4da992de4d12cd937ea4afc0b9e8ed8a5ccfb43a34526b39a84ad06dfd204b979d0a9aefb20f4dcf1090c813bd SHA512 56784589a16638a12230a11a177b8dd97a7abac927624beaaea89e0169423f7242c2b434a36aad1a07d977e6b006fd71eb9132aecb1d35e3e3363eb2d1549d84 diff --git a/net-analyzer/pchar/files/pchar-1.5-snmp.patch b/net-analyzer/pchar/files/pchar-1.5-snmp.patch deleted file mode 100644 index 9ebfbad39eb0..000000000000 --- a/net-analyzer/pchar/files/pchar-1.5-snmp.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- GetIfInfo.h.old 2005-02-12 21:32:18.000000000 +0100 -+++ GetIfInfo.h 2006-09-22 11:08:44.000000000 +0200 -@@ -17,7 +17,7 @@ - bool IsValid(void); - - const char * GetDescription(void) const; -- const char * GetIfInfo::GetName(void) const; -+ const char * GetName(void) const; - const char * GetContact(void) const; - const char * GetLocation(void) const; - const char * GetIfDescription(void) const; ---- configure.in.old 2005-02-12 21:32:18.000000000 +0100 -+++ configure.in 2006-10-24 23:08:38.000000000 +0200 -@@ -128,8 +128,8 @@ - LDFLAGS="-L$with_snmp/lib $LDFLAGS" - CPPFLAGS="-I$with_snmp/include $CPPFLAGS" - fi -- AC_CHECK_LIB(crypto, des_cbc_encrypt) -- AC_CHECK_LIB(snmp, snmp_sess_init,,,-lcrypto) -+ AC_CHECK_LIB(crypto, DES_cbc_encrypt) -+ AC_CHECK_LIB(snmp, snmp_sess_init) - fi - - dnl pcap support if desired. If the user enabled --with-pcap, diff --git a/net-analyzer/pchar/metadata.xml b/net-analyzer/pchar/metadata.xml deleted file mode 100644 index f1fd21ae99d5..000000000000 --- a/net-analyzer/pchar/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>chutzpah@gentoo.org</email> - <name>Patrick McLean</name> -</maintainer> -<longdescription lang="en"> -pchar is a reimplementation of the pathchar utility, written by Van -Jacobson. Both programs attempt to characterize the bandwidth, -latency, and loss of links along an end-to-end path through the -Internet. pchar works in both IPv4 and IPv6 networks. -</longdescription> -<use> - <flag name="pcap">Use the <pkg>net-libs/libpcap</pkg> library</flag> -</use> -</pkgmetadata> diff --git a/net-analyzer/pchar/pchar-1.5-r1.ebuild b/net-analyzer/pchar/pchar-1.5-r1.ebuild deleted file mode 100644 index 37006d24eeac..000000000000 --- a/net-analyzer/pchar/pchar-1.5-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -WANT_AUTOCONF=2.1 -WANT_AUTOMAKE=none - -inherit eutils autotools toolchain-funcs - -DESCRIPTION="Internet bandwidth, latency, and loss of links analyzer" -HOMEPAGE="http://www.kitchenlab.org/www/bmah/Software/pchar/" -SRC_URI="http://www.kitchenlab.org/www/bmah/Software/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" -IUSE="ipv6 pcap snmp" - -DEPEND=">=dev-libs/openssl-0.9.7 - snmp? ( net-analyzer/net-snmp[ucd-compat(+)] ) - pcap? ( net-libs/libpcap )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-snmp.patch - - eautoreconf -} - -src_configure() { - tc-export CC CXX - - econf --without-suid \ - $(use_with ipv6) \ - $(use_with snmp snmp /usr/lib) \ - $(use_with pcap) -} - -src_install() { - einstall - dodoc FAQ CHANGES README -} diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest index 1469fdffd3f6..994a344d6a4d 100644 --- a/net-analyzer/pinger/Manifest +++ b/net-analyzer/pinger/Manifest @@ -1,2 +1 @@ -DIST pinger-0.32e.tar.gz 239002 BLAKE2B d8fb905eac4cc84271196fb96503be512c18356668ddef943af028eac9aeb61a0836d3e85ee1c45546a0f88725e0a883947d5c3f38030b55b857d4be13af196f SHA512 8a6cebe9b37399e2e84eead3b386b999212904ecffb1fc951b4165295b278690217f35d20830e1f1440b94567d9d5d3423d37ee6e9200173be9aacefb68a87f7 DIST pinger-0.33.tar.gz 247827 BLAKE2B 6139044be634438945c92a431b97276b5556b513a948a675d6d70c73e4e22d08a58b9cf6607170f804354c18371af54a222b0e064cc1c8275ba77f67ddbd6699 SHA512 fff07599ef91fbdcff9be7806eca57a71e8e6fac7e9afc67c4147e6246b0bcdadf379de28f87054dbe7c409955c0e0ddeae7f529e954231bea0cfb39e4e29bc1 diff --git a/net-analyzer/pinger/files/gtk-2.0.m4 b/net-analyzer/pinger/files/gtk-2.0.m4 deleted file mode 100644 index 88596a969e19..000000000000 --- a/net-analyzer/pinger/files/gtk-2.0.m4 +++ /dev/null @@ -1,196 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GTK_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo "*** pkg-config too old; version 0.7 or better required." - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - fclose (fopen ("conf.gtktest", "w")); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include <gtk/gtk.h> -#include <stdio.h> -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff --git a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch b/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch deleted file mode 100644 index f9175b22540f..000000000000 --- a/net-analyzer/pinger/files/pinger-0.32e-tinfo.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -65,8 +65,18 @@ - AC_DEFINE([HAVE_GTK_2], 1, Found GTK 2), - HAVE_GTK_2=0) - fi -+AC_ARG_ENABLE(ncurses, [ --enable-ncurses enable ncurses support], -+ [if test "$enableval" = no; then no_ncurses=yes; fi]) -+if test x$no_ncurses != xyes; then -+PKG_CHECK_MODULES(ncurses, ncurses,[ -+ AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library) -+ HAVE_CURSES=1 -+ LIBS="$LIBS $ncurses_LIBS" -+ CFLAGS="$CFLAGS $ncurses_CFLAGS"], - AC_CHECK_LIB(ncurses, initscr, HAVE_CURSES=1; LIBS="$LIBS -lncurses"; - AC_DEFINE([HAVE_LIBNCURSES], [1], found ncurses library)) -+ ) -+fi - AC_CHECK_LIB(intl, libintl_gettext, LIBS="$LIBS -lintl") - AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", AC_MSG_ERROR(Pthread required and not found. Please check if you have libpthread in your system and specify using CFLAGS and LDFLAGS when configure)) - diff --git a/net-analyzer/pinger/files/pinger-0.33-clang16.patch b/net-analyzer/pinger/files/pinger-0.33-clang16.patch new file mode 100644 index 000000000000..1a6fe6cf03da --- /dev/null +++ b/net-analyzer/pinger/files/pinger-0.33-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/870871 +--- a/src/interface_ncurses.c ++++ b/src/interface_ncurses.c +@@ -41,3 +41,3 @@ + * characters */ +-static nr_print_ull(char *c, int max_chars, unsigned long long l) ++static int nr_print_ull(char *c, int max_chars, unsigned long long l) + { diff --git a/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch b/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch new file mode 100644 index 000000000000..0777242ba6f8 --- /dev/null +++ b/net-analyzer/pinger/files/pinger-0.33-musl-int-types.patch @@ -0,0 +1,158 @@ +From: Sam James <sam@gentoo.org> +Date: Wed, 29 Dec 2021 23:40:20 +0000 +Subject: [PATCH] Use <stdint.h> types + +Fixes musl compatibility. + +Bug: https://bugs.gentoo.org/712746 +--- a/src/fake_gtk.h ++++ b/src/fake_gtk.h +@@ -7,7 +7,6 @@ + #define GdkEvent int + #define gpointer int * + #define gboolean void +-#define gint int + #define GdkInputCondition int + + #else +--- a/src/globals.h ++++ b/src/globals.h +@@ -62,10 +62,6 @@ + #define EXTERN extern + #endif + +-#ifndef __USE_MISC +-#define unsigned int uint; +-#endif +- + #define MAX_HOSTS 100 + /* Maximum size of domain name */ + #define MAX_DNAME_LEN 60 +@@ -93,8 +89,8 @@ typedef struct host_data_t + struct timeval lastok_tv; /* timestamp of last ok echo */ + int status; /* status of host, online, without reply, ... */ + double delay; /* ping latency in miliseconds */ +- u_int last_seq_sent; /* sequence nr. of last packet sent */ +- u_int last_seq_recv; /* sequence nr. of last packet received */ ++ unsigned int last_seq_sent; /* sequence nr. of last packet sent */ ++ unsigned int last_seq_recv; /* sequence nr. of last packet received */ + unsigned long long nr_sent; /* number of send and received */ + unsigned long long nr_recv; + int ok_delay; /* time in ms, after we send next echo when OK (sucessfuly ping - ECHO REPLY) */ +@@ -164,9 +160,9 @@ typedef struct flstruct + #ifdef LOCAL + /* hosts specified only by domain names are resolved every 10 minutes. Specify + * other interval in seconds here if required. -1=disable. */ +-uint dns_check_s = 600; ++unsigned int dns_check_s = 600; + #else +-extern uint dns_check_s; ++extern unsigned int dns_check_s; + #endif + + EXTERN int mode; +--- a/src/interface_gtk.c ++++ b/src/interface_gtk.c +@@ -3,6 +3,7 @@ + #include "ping.h" + #include <gdk/gdkkeysyms.h> + #include <stdio.h> ++#include <stdint.h> + #include <string.h> + + GtkWidget *window; +@@ -13,7 +14,7 @@ static GtkWidget *scrolled_list; + static GtkWidget *tabs; + /* status bar for clock */ + static GtkWidget *status_bar; +-static guint status_bar_context; ++static unsigned int status_bar_context; + /* Box where store tabs and status bar */ + static GtkWidget *vbox; + +@@ -31,7 +32,7 @@ struct regular_disp_data + { + hosts_data *hosts; + int *stop_loop; +- guint disp_timeout_id; ++ unsigned int disp_timeout_id; + }; + + /* Interface display data */ +@@ -54,7 +55,7 @@ enum + static GtkWidget *create_list(hosts_data * hosts, int set_nr, + GtkListStore ** model); + static gboolean display_pinger_status(gpointer data); +-static gint gtk_delete_event(GtkWidget * widget, GdkEvent * event, ++static int gtk_delete_event(GtkWidget * widget, GdkEvent * event, + gpointer data); + static gchar *my_locale_to_utf8(char *text, char *file, int line); + +@@ -63,7 +64,7 @@ static void tab_refresh_rate(GtkWidget * widget, GdkEvent * event, + { + g_source_remove(int_disp_data->disp_timeout_id); + int_disp_data->disp_timeout_id = +- g_timeout_add((guint32) * (int *) data, display_pinger_status, ++ g_timeout_add((uint32_t) * (int *) data, display_pinger_status, + (gpointer) int_disp_data); + } + +@@ -462,7 +463,7 @@ static GtkWidget *create_list(hosts_data * hosts, int set_nr, + } + + /* delete_event callback function. data is (hosts_data *) */ +-static gint gtk_delete_event(GtkWidget * widget, ++static int gtk_delete_event(GtkWidget * widget, + GdkEvent * event, gpointer data) + { + if (free_sockets((hosts_data *) data)) +@@ -532,7 +533,7 @@ void gtk_gui_loop(hosts_data * hosts, int *stop_loop) + disp_data.stop_loop = stop_loop; + + disp_data.disp_timeout_id = +- g_timeout_add((guint32) hosts->titles->refresh_int, ++ g_timeout_add((uint32_t) hosts->titles->refresh_int, + display_pinger_status, (gpointer) & disp_data); + display_pinger_status((gpointer) & disp_data); + +--- a/src/ping.c ++++ b/src/ping.c +@@ -35,10 +35,10 @@ + #endif + + /* Compute checksum for ICMP output buffer */ +-static u_short cksum(u_short * buf, u_int len) ++static unsigned short cksum(unsigned short * buf, unsigned int len) + { +- u_int sum = 0; +- u_short retval; ++ unsigned int sum = 0; ++ unsigned short retval; + + /* 32 bit sum adds sequential 16 bit buffer parts */ + while (len > 1) { +@@ -51,12 +51,12 @@ static u_short cksum(u_short * buf, u_int len) + + union + { +- u_short word; +- u_char byte; ++ unsigned short word; ++ unsigned char byte; + } odd; + + odd.word = 0; +- odd.byte = *(u_char *) buf; ++ odd.byte = *(unsigned char *) buf; + sum += odd.word; + } + +@@ -189,7 +189,7 @@ int send_icmp_echo(host_data * host, hosts_data * hosts) + ich->checksum = 0; + ich->un.echo.sequence = ++host->last_seq_sent; + ich->un.echo.id = getpid() & 0xFFFF; +- ich->checksum = cksum((u_short *) outpacket, outpacket_len); ++ ich->checksum = cksum((unsigned short *) outpacket, outpacket_len); + + if ((sendto + (host->rawfd, outpacket, outpacket_len, 0, (struct sockaddr *) &to, diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml index a0c377799422..2d912969ffda 100644 --- a/net-analyzer/pinger/metadata.xml +++ b/net-analyzer/pinger/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild deleted file mode 100644 index 85b142c36460..000000000000 --- a/net-analyzer/pinger/pinger-0.32e.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic - -DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses" -HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/index.php" -SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="gtk ncurses nls" - -REQUIRED_USE=" - !gtk? ( ncurses ) - !ncurses? ( gtk ) -" - -RDEPEND=" - gtk? ( >=x11-libs/gtk+-2.4:2 ) - ncurses? ( sys-libs/ncurses ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS BUGS ChangeLog NEWS README ) - -src_prepare() { - # bug #494636 - cp "${FILESDIR}"/gtk-2.0.m4 m4/ || die - - epatch "${FILESDIR}"/${P}-tinfo.patch - - sed -i -e '/Root privileges/d' src/Makefile.am || die - - eautoreconf -} - -src_configure() { - append-cppflags -D_GNU_SOURCE - - econf $(use_enable gtk) $(use_enable ncurses) $(use_enable nls) -} diff --git a/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33-r1.ebuild index 74c25eb05be6..38ed420ff7df 100644 --- a/net-analyzer/pinger/pinger-0.33.ebuild +++ b/net-analyzer/pinger/pinger-0.33-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit autotools eutils flag-o-matic +inherit autotools flag-o-matic DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses" HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/" @@ -14,15 +14,11 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="gtk2 gtk3 ncurses nls" -REQUIRED_USE=" - || ( gtk2 gtk3 ncurses ) - ?? ( gtk2 gtk3 ) -" -GTK_DEPEND=" - dev-libs/glib:2 -" -RDEPEND=" - gtk2? ( +REQUIRED_USE="|| ( gtk2 gtk3 ncurses ) + ?? ( gtk2 gtk3 )" + +GTK_DEPEND="dev-libs/glib:2" +RDEPEND="gtk2? ( ${GTK_DEPEND} >=x11-libs/gtk+-2.4:2 ) @@ -30,17 +26,20 @@ RDEPEND=" ${GTK_DEPEND} >=x11-libs/gtk+-3.12:3 ) - ncurses? ( sys-libs/ncurses ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" + ncurses? ( sys-libs/ncurses:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS BUGS ChangeLog NEWS README ) +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-musl-int-types.patch + "${FILESDIR}"/${P}-clang16.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default sed -i -e '/Root privileges/d' src/Makefile.am || die diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/pktstat/metadata.xml +++ b/net-analyzer/pktstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild index 38568044a9f1..c3266ee8f631 100644 --- a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild +++ b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A network monitoring tool with bandwidth tracking" HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/" @@ -12,18 +13,21 @@ LICENSE="public-domain" SLOT="0" KEYWORDS="amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" RDEPEND=" net-libs/libpcap >=sys-libs/ncurses-5.3-r1 " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch + "${FILESDIR}"/${P}-smtp_line.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch - epatch "${FILESDIR}"/${P}-smtp_line.patch + default + eautoreconf } diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest index e2625e381fbb..2d7d7e60d533 100644 --- a/net-analyzer/pmacct/Manifest +++ b/net-analyzer/pmacct/Manifest @@ -1,5 +1 @@ -DIST pmacct-1.6.2.tar.gz 1311678 BLAKE2B 123629ca2e5e58bb4e684001b1c6d2d510e18450eed1c6e45bbe79ec7bb37072ba9b844fe0d8826a7923d0b09cf6923ea87d4e22fb2f251e7ebb9744d1c59b93 SHA512 8495f97752ae586fd842eed49ce91db3e4753133f7d380d067e7df153abeea469e5126800074e9071cb7227a3f1df64d4642dfece624fbbfa39b4537fde38b46 -DIST pmacct-1.7.1.tar.gz 1392360 BLAKE2B 75a4dda461c2fe643c24a901c19efacf325d1922bcda503a1ff41fe0b6c4178732d476b479875e9e0ba34872dbd86b8d8b2087471148f10e202f57c4a212f2fd SHA512 6a5d75522b9197b324907598ee4ba22bbda96b45e10f62df2ae507e23faac927af5468f587deab08d1e0f3f6422c609d106dcf30fa7bf16eb215bb35ea6aa08c -DIST pmacct-1.7.2.tar.gz 1416302 BLAKE2B 5d6f9c5849c07c7bdd3b6251b2611935ff558ca393d2cc0d21e5e681b0069b3a5bb4a985a9dc59b62b8b4ed697ecbd4cbb71f0aba42ce8d1527187b98d2e90d3 SHA512 ffdc63e96fc6af6f5d531243bc0aec0925663d8e91e83ada275f8e9a969dcf85cebd06b17ae2c796722bb209602d5b2bc487757ec736a740a8f33698d93a8675 -DIST pmacct-1.7.3.tar.gz 1467237 BLAKE2B a2fb627df9f61f91c69a9333a968485695b45c8ebe812e11ba250185a5e93f262954290d7ee41789fb13f7f5c5ef336294be83c8d91adcd0fc3c348485e515af SHA512 09d0e6721760035112cb0c7936fe177f7858b19fa1df2c7da84822dc816413e7c6bace35fe45ad32930961183d61f9e4f3a4879747be45f47ab658a3e0f055b2 -DIST pmacct-1.7.4.tar.gz 1581213 BLAKE2B 3835abc91947af083932e01b828c2324f90595c973fdde9d9f4034dc7d03e12fad6bbe6e91e1462ec36963ccb41a5a740159f531d7e1929f4cd8d994b89a58a1 SHA512 780b6cc25562fb7b5a1f55b48ce9719b36c1ee0d9ee2b6db8d7f238cd5d9f204938313b13e3ff3f62c7b9b179279f18314eba38ad787ffc346a4b217da239ca1 +DIST pmacct-1.7.8.tar.gz 2175335 BLAKE2B 1b95d48c479d59f2d4a7654e870e6f61c984c57c31aebbfb9fbf86f2d1027cde6a0f334489f33186bbb19ee7bdf94726f0053faa4829273de2d1975f58dff97f SHA512 df576644688ddb1957aa1583b101b96d86ab404c1416e0709b1bc85d691d13841bdb92a37a4526bc9273101dd11e3134d2fb35c06d2cbcde8e5bf7e84751a1c2 diff --git a/net-analyzer/pmacct/files/nfacctd.service b/net-analyzer/pmacct/files/nfacctd.service new file mode 100644 index 000000000000..d649f47030bf --- /dev/null +++ b/net-analyzer/pmacct/files/nfacctd.service @@ -0,0 +1,18 @@ +[Unit] +Description=netflow accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/nfacctd -f /etc/pmacctd/nfacctd.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch b/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch deleted file mode 100644 index 9e6c618fe443..000000000000 --- a/net-analyzer/pmacct/files/pmacct-1.7.3-nDPI-3.0.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -955,6 +955,7 @@ - CFLAGS="$_save_CFLAGS" - ]) - PKG_CHECK_MODULES([NDPI26], [libndpi >= 2.6], [AC_DEFINE(WITH_NDPI26, 1)], [AC_DEFINE(WITH_NDPI, 1)]) -+ PKG_CHECK_MODULES([NDPI30], [libndpi >= 3.0], [AC_DEFINE(WITH_NDPI30, 1)], [AC_DEFINE(WITH_NDPI, 1)]) - ;; - no) - AC_MSG_RESULT(no) ---- a/src/ndpi/ndpi.c -+++ b/src/ndpi/ndpi.c -@@ -374,10 +374,14 @@ - if (flow->detection_completed || flow->tcp_finished) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) - #ifdef WITH_NDPI26 -+#ifdef WITH_NDPI30 -+ flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, 1, workflow->prefs.protocol_guess); -+#else - flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow, workflow->prefs.protocol_guess); -+#endif /* WITH_NDPI30 */ - #else - flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow); --#endif -+#endif /* WITH_NDPI26 */ - - if (workflow->prefs.protocol_guess) { - if (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN && !flow->guess_completed) { diff --git a/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch new file mode 100644 index 000000000000..7381408d4489 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacct-1.7.6-nogit.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index 34269bd9..c6dbe8ba 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1140,10 +1140,7 @@ dnl Git submodule Dependencies buid system + dnl -------------------------------------- + + dnl First check whether to build git submodule deps +-WITH_EXTERNAL_DEPS_DEFAULT=yes +-if [ test ! -f "$srcdir/src/external_libs/libcdada/include/cdada.h" ] && [ test -z `git rev-parse HEAD 2> /dev/null` ]; then +- WITH_EXTERNAL_DEPS_DEFAULT=no +-fi ++WITH_EXTERNAL_DEPS_DEFAULT=no + + AC_MSG_CHECKING([whether external dependencies (git submodules) should be compiled]) + AC_ARG_WITH(external-deps, diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d index 1dccfcdd80f5..fad4b49ccbe3 100644 --- a/net-analyzer/pmacct/files/pmacctd-init.d +++ b/net-analyzer/pmacct/files/pmacctd-init.d @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 PMACCTDDIR=${PMACCTDDIR:-/etc/pmacctd} @@ -27,7 +27,7 @@ start() { start-stop-daemon --start \ --pidfile "${PMACCTDPID}" \ --exec /usr/sbin/"${SVCNAME}" \ - -- -D -f "${PMACCTDCONF}" \ -F "${PMACCTDPID}" ${OPTS} + -- -D -f "${PMACCTDCONF}" -F "${PMACCTDPID}" ${OPTS} eend $? } diff --git a/net-analyzer/pmacct/files/pmacctd.service b/net-analyzer/pmacct/files/pmacctd.service new file mode 100644 index 000000000000..a2dbb8c45846 --- /dev/null +++ b/net-analyzer/pmacct/files/pmacctd.service @@ -0,0 +1,19 @@ +[Unit] +Description=promiscuous mode accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/pmacctd -f /etc/pmacctd/pmacctd.conf -i %I + +[Install] +WantedBy=multi-user.target + diff --git a/net-analyzer/pmacct/files/sfacctd.service b/net-analyzer/pmacct/files/sfacctd.service new file mode 100644 index 000000000000..7a334e0ffadd --- /dev/null +++ b/net-analyzer/pmacct/files/sfacctd.service @@ -0,0 +1,18 @@ +[Unit] +Description=sflow accounting daemon +After=network.target + +[Service] +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelLogs=true +ProtectControlGroups=true +RestrictRealtime=true +Type=forking +ExecStart=/usr/sbin/sfacctd -f /etc/pmacctd/sfacctd.conf -i %I + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml index a306c0fa5034..1c025fea769e 100644 --- a/net-analyzer/pmacct/metadata.xml +++ b/net-analyzer/pmacct/metadata.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="64bit">Use 64bit counters instead of 32bit ones</flag> -<flag name="bgp-bins">Link BGP daemon binaries</flag> -<flag name="bmp-bins">Link BMP daemon binaries</flag> -<flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> -<flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag> -<flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag> -<flag name="l2">Enable Layer-2 features and support</flag> -<flag name="mongodb">Enable support for MongoDB through <pkg>dev-libs/mongo-c-driver</pkg></flag> -<flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag> -<flag name="nflog">Enable support for NFLOG through uacctd</flag> -<flag name="plabel">Enable IP prefix labels</flag> -<flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag> -<flag name="st-bins">Link Streaming Telemetry daemon binaries</flag> -<flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag> -<flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="bgp-bins">Link BGP daemon binaries</flag> + <flag name="bmp-bins">Link BMP daemon binaries</flag> + <flag name="geoipv2">Enable support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag> + <flag name="jansson">Enable support for JSON through <pkg>dev-libs/jansson</pkg></flag> + <flag name="kafka">Enable support for Apache Kafka through <pkg>dev-libs/librdkafka</pkg></flag> + <flag name="l2">Enable Layer-2 features and support</flag> + <flag name="ndpi">Enable support for nDPI through <pkg>net-libs/nDPI</pkg></flag> + <flag name="nflog">Enable support for NFLOG through uacctd</flag> + <flag name="rabbitmq">Enable support for RabbitMQ through <pkg>net-libs/rabbitmq-c</pkg></flag> + <flag name="st-bins">Link Streaming Telemetry daemon binaries</flag> + <flag name="traffic-bins">Link IPv4/IPv6 traffic accounting binaries</flag> + <flag name="zmq">Enable support for ZeroMQ through <pkg>net-libs/zeromq</pkg></flag> + </use> + <upstream> + <remote-id type="github">pmacct/pmacct</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/pmacct/pmacct-1.6.2.ebuild b/net-analyzer/pmacct/pmacct-1.6.2.ebuild deleted file mode 100644 index a2934f5a2a94..000000000000 --- a/net-analyzer/pmacct/pmacct-1.6.2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="64bit debug geoip geoipv2 ipv6 jansson kafka mongodb mysql nflog postgres rabbitmq sqlite threads" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( virtual/mysql ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_configure() { - tc-export CC AR RANLIB - - econf \ - $(use_enable 64bit) \ - $(use_enable debug) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable ipv6) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable threads) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild deleted file mode 100644 index 15ef9922c121..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.1-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb - mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( net-libs/nDPI ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART TOOLS UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_configure() { - tc-export CC AR RANLIB - append-cppflags -DMYSQL_SERVER_VERSION=99999999 - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable ipv6) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild b/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild deleted file mode 100644 index ec5a692ea2e9..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.2-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 ipv6 jansson kafka +l2 mongodb - mysql ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( net-libs/nDPI ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_configure() { - tc-export CC AR RANLIB - append-cppflags -DMYSQL_SERVER_VERSION=99999999 - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable ipv6) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild b/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild deleted file mode 100644 index 29e8537602fb..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.3-r2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-2.4:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch -) - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cppflags -DMYSQL_SERVER_VERSION=99999999 - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.4.ebuild b/net-analyzer/pmacct/pmacct-1.7.4.ebuild deleted file mode 100644 index 99560fad9a73..000000000000 --- a/net-analyzer/pmacct/pmacct-1.7.4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -SRC_URI="http://www.pmacct.net/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE=" - 64bit +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-2.4:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-1.7.3-nDPI-3.0.patch - "${FILESDIR}"/${PN}-1.7.4--Werror.patch -) - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable 64bit) \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pmacct/pmacct-1.7.8.ebuild b/net-analyzer/pmacct/pmacct-1.7.8.ebuild new file mode 100644 index 000000000000..716720824619 --- /dev/null +++ b/net-analyzer/pmacct/pmacct-1.7.8.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs systemd + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pmacct/pmacct" + inherit git-r3 +else + SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz + http://www.pmacct.net/${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq" + +REQUIRED_USE=" + ?? ( geoip geoipv2 ) + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + jansson? ( dev-libs/jansson:= ) + kafka? ( dev-libs/librdkafka ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) + ndpi? ( >=net-libs/nDPI-3.2:= ) + nflog? ( net-libs/libnetfilter_log ) + postgres? ( dev-db/postgresql:* ) + rabbitmq? ( net-libs/rabbitmq-c ) + sqlite? ( =dev-db/sqlite-3* ) + zmq? ( >=net-libs/zeromq-4.2.0:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" +) + +DOCS=( + CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC AR RANLIB + + local myeconfargs=( + $(use_enable bgp-bins) + $(use_enable bmp-bins) + $(use_enable geoip) + $(use_enable geoipv2) + $(use_enable jansson) + $(use_enable kafka) + $(use_enable l2) + $(use_enable mysql) + $(use_enable ndpi) + $(use_enable nflog) + $(use_enable postgres pgsql) + $(use_enable rabbitmq) + $(use_enable sqlite sqlite3) + $(use_enable st-bins) + $(use_enable traffic-bins) + $(use_enable zmq) + + --without-external-deps + --disable-ebpf + --disable-debug + --disable-mongodb + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + local dirname + for dirname in examples sql telemetry; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/pmacct/pmacct-9999.ebuild b/net-analyzer/pmacct/pmacct-9999.ebuild new file mode 100644 index 000000000000..716720824619 --- /dev/null +++ b/net-analyzer/pmacct/pmacct-9999.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools toolchain-funcs systemd + +DESCRIPTION="A network tool to gather IP traffic information" +HOMEPAGE="http://www.pmacct.net/" + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://github.com/pmacct/pmacct" + inherit git-r3 +else + SRC_URI="https://github.com/pmacct/pmacct/releases/download/v${PV}/${P}.tar.gz + http://www.pmacct.net/${P}.tar.gz" + + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" + +IUSE="+bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mysql ndpi nflog postgres rabbitmq sqlite +st-bins +traffic-bins zmq" + +REQUIRED_USE=" + ?? ( geoip geoipv2 ) + kafka? ( jansson ) + rabbitmq? ( jansson ) +" + +RDEPEND="dev-libs/libcdada + net-libs/libpcap + geoip? ( dev-libs/geoip ) + geoipv2? ( dev-libs/libmaxminddb ) + jansson? ( dev-libs/jansson:= ) + kafka? ( dev-libs/librdkafka ) + mysql? ( + dev-db/mysql-connector-c:0= + sys-process/numactl + ) + ndpi? ( >=net-libs/nDPI-3.2:= ) + nflog? ( net-libs/libnetfilter_log ) + postgres? ( dev-db/postgresql:* ) + rabbitmq? ( net-libs/rabbitmq-c ) + sqlite? ( =dev-db/sqlite-3* ) + zmq? ( >=net-libs/zeromq-4.2.0:= )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${PN}-1.7.4--Werror.patch" + "${FILESDIR}/${PN}-1.7.6-nogit.patch" +) + +DOCS=( + CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE + docs/INTERNALS docs/PLUGINS docs/SIGNALS +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + tc-export CC AR RANLIB + + local myeconfargs=( + $(use_enable bgp-bins) + $(use_enable bmp-bins) + $(use_enable geoip) + $(use_enable geoipv2) + $(use_enable jansson) + $(use_enable kafka) + $(use_enable l2) + $(use_enable mysql) + $(use_enable ndpi) + $(use_enable nflog) + $(use_enable postgres pgsql) + $(use_enable rabbitmq) + $(use_enable sqlite sqlite3) + $(use_enable st-bins) + $(use_enable traffic-bins) + $(use_enable zmq) + + --without-external-deps + --disable-ebpf + --disable-debug + --disable-mongodb + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + local dirname + for dirname in examples sql telemetry; do + docinto ${dirname} + dodoc -r ${dirname}/* + done + + newinitd "${FILESDIR}"/pmacctd-init.d pmacctd + newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd + + systemd_dounit "${FILESDIR}"/{nfacctd,pmacctd,sfacctd}.service + + insinto /etc/pmacctd + newins examples/pmacctd-imt.conf.example pmacctd.conf +} diff --git a/net-analyzer/pmacct/pmacct-999999.ebuild b/net-analyzer/pmacct/pmacct-999999.ebuild deleted file mode 100644 index a4410a2887e1..000000000000 --- a/net-analyzer/pmacct/pmacct-999999.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 toolchain-funcs - -DESCRIPTION="A network tool to gather IP traffic information" -HOMEPAGE="http://www.pmacct.net/" -EGIT_REPO_URI="https://github.com/pmacct/pmacct/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE=" - +bgp-bins +bmp-bins geoip geoipv2 jansson kafka +l2 mongodb mysql - ndpi nflog plabel postgres rabbitmq sqlite +st-bins +traffic-bins zmq -" -REQUIRED_USE=" - ?? ( geoip geoipv2 ) - kafka? ( jansson ) - rabbitmq? ( jansson ) -" - -RDEPEND=" - net-libs/libpcap - geoip? ( dev-libs/geoip ) - geoipv2? ( dev-libs/libmaxminddb ) - jansson? ( dev-libs/jansson ) - kafka? ( dev-libs/librdkafka ) - mongodb? ( - >=dev-libs/mongo-c-driver-0.8.1-r1 - <dev-libs/mongo-c-driver-0.98 - ) - mysql? ( dev-db/mysql-connector-c:0= ) - ndpi? ( >=net-libs/nDPI-3.0:= ) - nflog? ( net-libs/libnetfilter_log ) - postgres? ( dev-db/postgresql:* ) - rabbitmq? ( net-libs/rabbitmq-c ) - sqlite? ( =dev-db/sqlite-3* ) - zmq? ( >=net-libs/zeromq-4.2.0:= ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( - CONFIG-KEYS ChangeLog FAQS QUICKSTART UPGRADE - docs/INTERNALS docs/PLUGINS docs/SIGNALS -) - -src_prepare() { - default - sed -i -e 's|-Werror||g' configure.ac || die - eautoreconf -} - -src_configure() { - tc-export CC AR RANLIB - append-cflags -fcommon - - econf \ - $(use_enable bgp-bins) \ - $(use_enable bmp-bins) \ - $(use_enable geoip) \ - $(use_enable geoipv2) \ - $(use_enable jansson) \ - $(use_enable kafka) \ - $(use_enable l2) \ - $(use_enable plabel) \ - $(use_enable mongodb) \ - $(use_enable mysql) \ - $(use_enable ndpi) \ - $(use_enable nflog) \ - $(use_enable postgres pgsql) \ - $(use_enable rabbitmq) \ - $(use_enable sqlite sqlite3) \ - $(use_enable st-bins) \ - $(use_enable traffic-bins) \ - $(use_enable zmq) \ - --disable-debug -} - -src_install() { - default - - for dirname in examples sql telemetry; do - docinto ${dirname} - dodoc -r ${dirname}/* - done - - newinitd "${FILESDIR}"/pmacctd-init.d pmacctd - newconfd "${FILESDIR}"/pmacctd-conf.d pmacctd - - insinto /etc/pmacctd - newins examples/pmacctd-imt.conf.example pmacctd.conf -} diff --git a/net-analyzer/pnp4nagios/Manifest b/net-analyzer/pnp4nagios/Manifest index e33adf3e6b1d..f97b423eb62d 100644 --- a/net-analyzer/pnp4nagios/Manifest +++ b/net-analyzer/pnp4nagios/Manifest @@ -1 +1,2 @@ -DIST pnp4nagios-0.6.26.tar.gz 3039265 BLAKE2B 1adb3c41222e6bc93671af955a1564387d77901ce118f5d309d101d88c691140e0feef1c2594bc5db44706ff01505a4fcf99b79b6a0c5b5cb923838dd00f1ff0 SHA512 caf6dcced74967174d9e6f09dd1a5bee17397c10a68d0f577c37dcc836f928d78c20d75a0189539e9ffa93715ab7b6e732e9f36b9698cf4dd9c09cfb65184427 +DIST pnp4nagios-0.6.26_p20221106.tar.gz 3029704 BLAKE2B 5866f4dbfef9b1028255eb3e47ac57fa260c1e2caca50fcb1c5ff93a3dc9bee9f14152e3a269ecf12daab59e50e1f4dfcd6513f9ce3dc5da35de50b944c38260 SHA512 cd0c3ad3d4983c43f7e1a100e8a2e6a530b573ca6bed60125c87b22ab33c2486c5ce99c6f52d641cdc7468984925a22a6ee7e1ac330ea2278ec2439acb910d04 +DIST pnp4nagios-0.6.26_p20230918.tar.gz 3036216 BLAKE2B 101b84623bec93cb3c3c2c5f5785a308afeeff6c7a89504ec5e39812be5e0807eaf7dabf720a69e58a3dd7bfd654f124dd26030deab60f5c6e0a31bd665e83e6 SHA512 4b03c5bf3d00339627e22cf14669b21433f926d6e698933833911a40d8b324d5a70dc5187ee5291f48bfcc12e9b51aaba24c8d263d5f25081544f97dce372890 diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch new file mode 100644 index 000000000000..21f9c89ed94f --- /dev/null +++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_compat.patch @@ -0,0 +1,53 @@ +# https://github.com/Tontonitch/pnp4nagios/commits/master + +diff --git a/share/pnp/application/views/graph_content.php b/share/pnp/application/views/graph_content.php +index 3ea99dc0..00469ce0 100644 +--- a/share/pnp/application/views/graph_content.php ++++ b/share/pnp/application/views/graph_content.php +@@ -88,7 +88,8 @@ + # treated like a url fragment when zooming + $gid = array(); + parse_str(ltrim($this->url, '?'), $gid); +- $gid = htmlentities("?host=".urlencode($gid["host"])."&srv=".urlencode($gid["srv"])); ++ $srv = isset($gid['srv']) ? $gid['srv'] : ''; ++ $gid = htmlentities("?host=".urlencode($gid["host"])."&srv=".urlencode($srv)); + + echo "<div start=".$value['TIMERANGE']['start']." end=".$value['TIMERANGE']['end']." style=\"width:".$value['GRAPH_WIDTH']."px; height:".$value['GRAPH_HEIGHT']."px; position:absolute; top:33px\" class=\"graph\" id=\"".$gid."\" ></div>"; + +diff --git a/share/pnp/application/vendor/fpdf/fpdf.php b/share/pnp/application/vendor/fpdf/fpdf.php +index cfc09593..efb53b4e 100755 +--- a/share/pnp/application/vendor/fpdf/fpdf.php ++++ b/share/pnp/application/vendor/fpdf/fpdf.php +@@ -1040,8 +1040,11 @@ protected function _dochecks() + if(ini_get('mbstring.func_overload') & 2)
+ $this->Error('mbstring overloading must be disabled');
+ // Ensure runtime magic quotes are disabled
+- if(get_magic_quotes_runtime())
+- @set_magic_quotes_runtime(0);
++# if(get_magic_quotes_runtime())
++# @set_magic_quotes_runtime(0);
++ if (PHP_VERSION_ID < 70400 && get_magic_quotes_runtime()) {
++ set_magic_quotes_runtime(0);
++ }
+ }
+
+ protected function _checkoutput()
+diff --git a/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php b/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php +index 9e6d521a..c044f200 100755 +--- a/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php ++++ b/share/pnp/application/vendor/fpdf/fpdi_pdf_parser.php +@@ -305,6 +305,7 @@ protected function _getPageRotation($obj) + }
+
+ $res = $this->_getPageRotation($obj[1][1]['/Parent']);
++ if(false == $res) return false;
+ if ($res[0] == pdf_parser::TYPE_OBJECT)
+ return $res[1];
+
+@@ -344,4 +345,4 @@ protected function _readPages(&$pages, &$result) + }
+ }
+ }
+-} +\ No newline at end of file ++}
diff --git a/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch new file mode 100644 index 000000000000..2407bb6c51e9 --- /dev/null +++ b/net-analyzer/pnp4nagios/files/pnp4nagios-0.6.26_p20221106_php80.patch @@ -0,0 +1,42 @@ +diff --git a/lib/kohana/system/core/utf8.php b/lib/kohana/system/core/utf8.php +index 9f20f42..b349c68 100644 +--- a/lib/kohana/system/core/utf8.php ++++ b/lib/kohana/system/core/utf8.php +@@ -49,17 +49,6 @@ if ( ! extension_loaded('iconv')) + ); + } + +-if (extension_loaded('mbstring') AND (ini_get('mbstring.func_overload') & MB_OVERLOAD_STRING)) +-{ +- trigger_error +- ( +- 'The <a href="http://php.net/mbstring">mbstring</a> extension is overloading PHP\'s native string functions. '. +- 'Disable this by setting mbstring.func_overload to 0, 1, 4 or 5 in php.ini or a .htaccess file.'. +- 'This application cannot be run without UTF-8 support.', +- E_USER_ERROR +- ); +-} +- + // Check PCRE support for Unicode properties such as \p and \X. + $ER = error_reporting(0); + define('PCRE_UNICODE_PROPERTIES', (bool) preg_match('/^\pL$/u', 'ñ')); +@@ -740,4 +729,4 @@ final class utf8 { + return _from_unicode($arr); + } + +-} // End utf8 +\ No newline at end of file ++} // End utf8 +diff --git a/share/pnp/application/models/data.php b/share/pnp/application/models/data.php +index 576c8ec..20cdade 100644 +--- a/share/pnp/application/models/data.php ++++ b/share/pnp/application/models/data.php +@@ -266,7 +266,7 @@ class Data_Model extends System_Model + $xml = array(); + if (file_exists($xmlfile)) { + libxml_use_internal_errors(TRUE); +- libxml_clear_errors(TRUE); ++ libxml_clear_errors(); + if(! $xml = simplexml_load_file($xmlfile) ){; + if( $throw_exception == TRUE ){ + $errors = '<br>'; diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml index 6612bb05751a..9e00dcae8fec 100644 --- a/net-analyzer/pnp4nagios/metadata.xml +++ b/net-analyzer/pnp4nagios/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>sysadmin@gentoo.org</email> @@ -11,14 +11,13 @@ Build against <pkg>net-analyzer/nagios-core</pkg> (the default) </flag> <flag name="icinga"> - Build against <pkg>net-analyzer/icinga2</pkg> or - <pkg>net-analyzer/icinga</pkg> instead of + Build against <pkg>net-analyzer/icinga2</pkg> instead of <pkg>net-analyzer/nagios-core</pkg> </flag> </use> <upstream> <remote-id type="sourceforge">pnp4nagios</remote-id> - <remote-id type="github">lingej/pnp4nagios</remote-id> + <remote-id type="github">ConSol-Monitoring/pnp4nagios</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild new file mode 100644 index 000000000000..3df8d7c6aedd --- /dev/null +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20221106.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A performance data analyzer for nagios" +HOMEPAGE="http://www.pnp4nagios.org/" +GH_COMMIT="5e09f538373ac4310a13355746bb3d3a10eb7bef" +SRC_URI="https://github.com/lingej/pnp4nagios/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${GH_COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="apache2 icinga +nagios" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" + +REQUIRED_USE="^^ ( icinga nagios )" + +# Some things (sync mode, for one) are broken with nagios-4.x, but since +# nagios-3.x has been end-of-life'd, we don't have much choice here but +# to accept it. +DEPEND="net-analyzer/rrdtool[graph,perl] + icinga? ( + acct-group/icinga + acct-user/icinga + ) + nagios? ( + acct-group/nagios + acct-user/nagios + )" + +# A list of modules used in our Apache config file. +APACHE_MODS="apache2_modules_alias," # "Alias" directive +APACHE_MODS+="apache2_modules_authz_core," # "Require" directive +APACHE_MODS+="apache2_modules_rewrite" # "RewriteEngine" and friends + +RDEPEND="${DEPEND} + dev-lang/php:*[filter,gd,json(+),simplexml,xml,zlib] + media-fonts/dejavu + virtual/perl-Getopt-Long + virtual/perl-Time-HiRes + apache2? ( >=www-servers/apache-2.4[${APACHE_MODS}] )" + +PATCHES=( + "${FILESDIR}/${PN}-0.6.14-makefile.patch" + "${FILESDIR}/${PN}-0.6.26_p20221106_compat.patch" + "${FILESDIR}/${PN}-0.6.26_p20221106_php80.patch" +) + +src_configure() { + local user_group=nagios + use icinga && user_group=icinga + + local myeconfargs=( + --sysconfdir="${EPREFIX}"/etc/pnp + --datarootdir="${EPREFIX}"/usr/share/pnp + --localstatedir="${EPREFIX}"/var/lib/pnp + --with-nagios-user="${user_group}" + --with-nagios-group="${user_group}" + --with-perfdata-logfile="${EPREFIX}"/var/log/pnp/process_perfdata.log + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + # The default target just shows a help + emake all +} + +src_install() { + # Don't use INSTALL_OPTS because they set insecure permissions on + # all of /etc/pnp (https://github.com/lingej/pnp4nagios/issues/140). + emake INSTALL_OPTS="" DESTDIR="${D}" install install-config + einstalldocs + newinitd "${FILESDIR}"/npcd.initd npcd + rm "${ED}/usr/share/pnp/install.php" || \ + die "unable to remove ${ED}/usr/share/pnp/install.php" + + # Fix CVE-2012-3457 (Gentoo bug 430358) + fperms o-rwx /etc/pnp/process_perfdata.cfg + + if use apache2 ; then + insinto /etc/apache2/modules.d + newins "${FILESDIR}"/98_pnp4nagios-2.4.conf 98_pnp4nagios.conf + fi + + # The nagios or icinga user needs to write performance data to the + # perfdata-dir... + local user_group=nagios + use icinga && user_group=icinga + fowners ":${user_group}" /var/lib/pnp/{,perfdata,spool} + fperms g+rwx /var/lib/pnp/{,perfdata,spool} + + # and likewise for its logs... + dodir /var/log/pnp + fowners ":${user_group}" /var/log/pnp + fperms g+rwx /var/log/pnp + + # and its statistics. This one is arguably the responsibility of the + # build system, since process_perfdata.cfg refers to this location. + dodir /var/lib/pnp/stats + fowners ":${user_group}" /var/lib/pnp/stats + fperms g+rwx /var/lib/pnp/stats +} + +pkg_postinst() { + elog "To enable the pnp4nagios web front-end, please visit" + elog "${EROOT}/etc/conf.d/apache2 and add \"-D PNP -D PHP\"" + elog "to APACHE2_OPTS. Then pnp4nagios will be available at," + elog + elog " http://localhost/pnp4nagios" + elog +} diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild index 6a09ab87188b..5ef07a6cac34 100644 --- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.26-r9.ebuild +++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.26_p20230918.ebuild @@ -1,27 +1,33 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 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" +HOMEPAGE="https://github.com/ConSol-Monitoring/pnp" +GH_COMMIT="e52677d3994d35197db68120d7089906a174a3f9" +SRC_URI="https://github.com/ConSol-Monitoring/pnp/archive/${GH_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/pnp-${GH_COMMIT}" LICENSE="GPL-2" SLOT="0" IUSE="apache2 icinga +nagios" -KEYWORDS="amd64 ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ~ppc ppc64 ~sparc x86" REQUIRED_USE="^^ ( icinga nagios )" # Some things (sync mode, for one) are broken with nagios-4.x, but since # nagios-3.x has been end-of-life'd, we don't have much choice here but # to accept it. -DEPEND=" - dev-lang/php:*[filter,gd,json,simplexml,xml,zlib] - net-analyzer/rrdtool[graph,perl] - icinga? ( net-analyzer/icinga2 ) - nagios? ( net-analyzer/nagios-core )" +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,24 +35,30 @@ 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" ) +PATCHES=( + "${FILESDIR}/${PN}-0.6.14-makefile.patch" +) src_configure() { local user_group=nagios use icinga && user_group=icinga - econf \ - --sysconfdir="${EPREFIX}"/etc/pnp \ - --datarootdir="${EPREFIX}"/usr/share/pnp \ - --localstatedir="${EPREFIX}"/var/lib/pnp \ - --with-nagios-user="${user_group}" \ - --with-nagios-group="${user_group}" \ + 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() { @@ -60,8 +72,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 @@ -92,7 +104,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/poink/metadata.xml b/net-analyzer/poink/metadata.xml index b9c50c7f068b..a5a3b6242849 100644 --- a/net-analyzer/poink/metadata.xml +++ b/net-analyzer/poink/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/pontos/Manifest b/net-analyzer/pontos/Manifest new file mode 100644 index 000000000000..4222dcb9e6c8 --- /dev/null +++ b/net-analyzer/pontos/Manifest @@ -0,0 +1,2 @@ +DIST pontos-24.1.2.tar.gz 379930 BLAKE2B b0c9fd02c17ca0fed7468e34264f8e41e87b4c50f6254d8d4d9ee5c7a8444a7acfbf3c113483e26831be68279d7c08bf412634fff5e3454dc0e7ec5273ddcdd6 SHA512 55fcb768d89b0fd478bbf14a435d7d42c6c9ae2ff2a834ce685e25b105ed071d156d1afbc0231d80dd8d5c844f33b648b08772a0aab943127c58f9a475f267d9 +DIST pontos-24.3.2.tar.gz 378585 BLAKE2B cb6a89a2fbfefe1b038b5886dc7a278657d36a05bab818335efd029d6320b8b60defcd73c3e94df17008ab611434898b565cb7057e1f0198113bd8a7a0600934 SHA512 4ed6a79097197da01d35a660ce13edfa028c11b082626038ea037b99b1f365b054d2c07ae841c739735da057e2d8d9fc64b63f18ad3aa941e14ff725261dde80 diff --git a/net-analyzer/pontos/metadata.xml b/net-analyzer/pontos/metadata.xml new file mode 100644 index 000000000000..57f5489f18e3 --- /dev/null +++ b/net-analyzer/pontos/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + The pontos Python package is a collection of utilities, tools, classes + and functions maintained by Greenbone Networks. + It is needed to run tests on some Greenbone Vulnerability Management packages. + </longdescription> + <upstream> + <remote-id type="github">greenbone/pontos</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/pontos/pontos-24.1.2.ebuild b/net-analyzer/pontos/pontos-24.1.2.ebuild new file mode 100644 index 000000000000..251e78ef2d3a --- /dev/null +++ b/net-analyzer/pontos/pontos-24.1.2.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Common utilities and tools maintained by Greenbone Networks" +HOMEPAGE=" + https://www.greenbone.net + https://github.com/greenbone/pontos/ + https://greenbone.github.io/pontos/ +" + +SRC_URI="https://github.com/greenbone/pontos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3+" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-python/colorful-0.5.4[${PYTHON_USEDEP}] + >=dev-python/tomlkit-0.5.11[${PYTHON_USEDEP}] + >=dev-python/packaging-20.3[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23[${PYTHON_USEDEP}] + >=dev-python/rich-12.4.4[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/semver-2.13[${PYTHON_USEDEP}] + >=dev-python/lxml-4.9.0[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +EPYTEST_DESELECT=( + tests/git/test_git.py::GitExtendedTestCase::test_git_error + tests/version/commands/test_java.py::GetCurrentJavaVersionCommandTestCase::test_getting_version_without_version_config + tests/version/commands/test_java.py::VerifyJavaVersionCommandTestCase::test_verify_version_does_not_match +) + +distutils_enable_tests pytest diff --git a/net-analyzer/pontos/pontos-24.3.2.ebuild b/net-analyzer/pontos/pontos-24.3.2.ebuild new file mode 100644 index 000000000000..bf8315f7c568 --- /dev/null +++ b/net-analyzer/pontos/pontos-24.3.2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Common utilities and tools maintained by Greenbone Networks" +HOMEPAGE=" + https://www.greenbone.net + https://github.com/greenbone/pontos/ + https://greenbone.github.io/pontos/ +" + +SRC_URI="https://github.com/greenbone/pontos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3+" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/colorful-0.5.4[${PYTHON_USEDEP}] + >=dev-python/tomlkit-0.5.11[${PYTHON_USEDEP}] + >=dev-python/packaging-20.3[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23[${PYTHON_USEDEP}] + >=dev-python/rich-12.4.4[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}] + >=dev-python/semver-2.13[${PYTHON_USEDEP}] + >=dev-python/lxml-4.9.0[${PYTHON_USEDEP}] + >=dev-python/shtab-1.7.0[${PYTHON_USEDEP}] +" + +DEPEND="${RDEPEND}" + +EPYTEST_DESELECT=( + tests/git/test_git.py::GitExtendedTestCase::test_git_error + tests/version/commands/test_java.py::GetCurrentJavaVersionCommandTestCase::test_getting_version_without_version_config + tests/version/commands/test_java.py::VerifyJavaVersionCommandTestCase::test_verify_version_does_not_match +) + +distutils_enable_tests pytest diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/portmon/metadata.xml +++ b/net-analyzer/portmon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/portmon/portmon-2.0-r1.ebuild b/net-analyzer/portmon/portmon-2.0-r1.ebuild index 824a242bbd0c..5c02c83701b0 100644 --- a/net-analyzer/portmon/portmon-2.0-r1.ebuild +++ b/net-analyzer/portmon/portmon-2.0-r1.ebuild @@ -7,7 +7,7 @@ DESCRIPTION="Portmon is a network service monitoring daemon" HOMEPAGE="http://aboleo.net/software/portmon/" SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" SLOT="0" LICENSE="GPL-2" diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild deleted file mode 100644 index b8d639d55d72..000000000000 --- a/net-analyzer/portmon/portmon-2.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Portmon is a network service monitoring daemon" -HOMEPAGE="http://aboleo.net/software/portmon/" -SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz" - -KEYWORDS="~amd64 ~ppc x86" -SLOT="0" -LICENSE="GPL-2" - -src_configure() { - econf --sysconfdir=/etc/portmon -} - -src_install() { - into /usr - dosbin src/portmon - - doman extras/portmon.8 - - insinto /etc/portmon - doins extras/portmon.hosts.sample - dodoc AUTHORS BUGS README - - newinitd "${FILESDIR}"/portmon.init portmon -} diff --git a/net-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml index 99bfe72a50cf..ff8e6562e4e4 100644 --- a/net-analyzer/portsentry/metadata.xml +++ b/net-analyzer/portsentry/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild index 29e14b375300..ae9657ed17ad 100644 --- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild +++ b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild @@ -1,29 +1,48 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Automated port scan detector and response tool" # Seems like CISCO took the site down? HOMEPAGE="https://sourceforge.net/projects/sentrytools/" -SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/sentrytools/${P}.tar.gz" +S="${WORKDIR}"/${PN}_beta SLOT="0" LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc x86 ~x64-macos" -S="${WORKDIR}"/${PN}_beta +RDEPEND="kernel_Darwin? ( app-shells/tcsh )" -src_prepare() { - epatch "${FILESDIR}"/${P}-conf.patch - epatch "${FILESDIR}"/${P}-config.h.patch - epatch "${FILESDIR}"/${P}-gcc.patch - epatch "${FILESDIR}"/${P}-ignore.csh.patch -} +PATCHES=( + "${FILESDIR}"/${P}-conf.patch + "${FILESDIR}"/${P}-config.h.patch + "${FILESDIR}"/${P}-gcc.patch + "${FILESDIR}"/${P}-ignore.csh.patch +) src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" linux + local target + + if use kernel_Darwin ; then + target="osx" + elif use kernel_linux ; then + target="linux" + elif use kernel_SunOS ; then + target="solaris" + fi + + if [[ -z "${target}" ]] ; then + elog "Using 'generic' target for your platform" + target="generic" + else + elog "Using '${target}' (detected) target for your platform" + fi + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" "${target}" } src_install() { diff --git a/net-analyzer/prelude-correlator/Manifest b/net-analyzer/prelude-correlator/Manifest deleted file mode 100644 index 0f892ef73352..000000000000 --- a/net-analyzer/prelude-correlator/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST prelude-correlator-4.0.0.tar.gz 347973 BLAKE2B 93f383d5d3ca3632f841b8523efa829f00ee36e4fdce76c982ef638f468dc574fa69452b4e9e5abcdaec87697a4a824faf543f0383756d15a72e99c0ac02cabe SHA512 aeeb5d1e29a464afa41b8a04f5324e0915b8450eceea68a07cb6d8bb61823ab8da8df51e1a331f5a66fd295bd2a514f484da5c396e0508c4fc5634c98382779b -DIST prelude-correlator-4.1.1.tar.gz 237036 BLAKE2B f3965b179d101450bd5b64805d0c982cc093de47fbbc4b4e0077f231cffcf152f3ace78cab5e96d7e18d8af0fae7de0fb5c70c17b8888245558ab091bee6438d SHA512 ac6eb554ab8d20325afbe49fcec9e238d84579cb68ee5731e6ec7d1da11c1b745e60117fade76d8747c93f57d4ae91461fd6e82160f659f88a0bb545e4990597 -DIST prelude-correlator-5.1.0.tar.gz 242620 BLAKE2B 70d4c4cc620fe4aa605812a83979b097e78ea97c5684d0d7ac8f0de2975f68d54f712f0d6dcd341f2928c846663fdf5182f8481fe6142de7648ba8fd2443d369 SHA512 db3a4cb1c4a8254270f63552ee2a959bc28cec8fdb48340f1c301fa65df73115292060067bed4b5945da4717a216313aa6eb2525bc02de4a6a45716b9827f5fd diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch b/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch deleted file mode 100644 index a671aa476585..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator-4.1.1-fix_python3.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/preludecorrelator/config.py -+++ b/preludecorrelator/config.py -@@ -19,7 +19,11 @@ - - import os - import glob --import StringIO -+import sys -+if sys.version_info >= (3, 0): -+ from io import StringIO -+else: -+ import StringIO - try: - import configparser - except: -@@ -77,5 +81,8 @@ - f = open(fname, 'r') - except IOError: - continue -- self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) -+ if sys.version_info >= (3, 0): -+ self.readfp(StringIO('[prelude]\n' + f.read())) -+ else: -+ self.readfp(StringIO.StringIO('[prelude]\n' + f.read())) - f.close() ---- a/preludecorrelator/context.py -+++ b/preludecorrelator/context.py -@@ -362,7 +362,7 @@ - - try: - _CONTEXT_TABLE.update(ContextUnpickler(fd).load()) -- except EOFError: -+ except: - return - - logger.debug("[load]: %d context loaded", len(_CONTEXT_TABLE)) diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.initd b/net-analyzer/prelude-correlator/files/prelude-correlator.initd deleted file mode 100644 index 6e75689ca03c..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -BIN_CORRELATOR=/usr/bin/prelude-correlator -PID_CORRELATOR=/run/prelude-correlator/prelude-correlator.pid - -depend() { - need net - after prelude-manager -} - -start() { - ebegin "Starting prelude-correlator" - checkpath -d -m 0755 -o root:root /run/prelude-correlator - start-stop-daemon --start --exec $BIN_CORRELATOR \ - --pidfile $PID_CORRELATOR -- -d -P $PID_CORRELATOR - eend $? -} - -stop() { - ebegin "Stopping prelude-correlator" - start-stop-daemon --stop --exec $BIN_CORRELATOR \ - --pidfile $PID_CORRELATOR - eend $? -} diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.run b/net-analyzer/prelude-correlator/files/prelude-correlator.run deleted file mode 100644 index 8bec03f78704..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.run +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/prelude-correlator directory -# Used as part of systemd's tmpfiles - -d /run/prelude-correlator 0755 root root diff --git a/net-analyzer/prelude-correlator/files/prelude-correlator.service b/net-analyzer/prelude-correlator/files/prelude-correlator.service deleted file mode 100644 index 7b763c30c13a..000000000000 --- a/net-analyzer/prelude-correlator/files/prelude-correlator.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Prelude-Correlator service -DefaultDependencies=no -After=remote_fs.target prelude-manager.service - -[Service] -ExecStart=/usr/bin/prelude-correlator -d -P /run/prelude-correlator/prelude-correlator.pid -Type=forking -PIDFile=/run/prelude-correlator/prelude-correlator.pid -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/prelude-correlator/metadata.xml b/net-analyzer/prelude-correlator/metadata.xml deleted file mode 100644 index fa977ec21f47..000000000000 --- a/net-analyzer/prelude-correlator/metadata.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Prelude-Correlator allows conducting multi-stream correlations - thanks to a powerful programming language for writing correlation - rules. With any type of alert able to be correlated, event - analysis becomes simpler, quicker and more incisive. This - correlation alert then appears within the Prewikka interface - and indicates the potential target information via the set of - correlation rules. - </longdescription> -</pkgmetadata> diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild deleted file mode 100644 index 147c825eb4c2..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-4.0.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 systemd - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}]" - -src_install() { - distutils-r1_src_install - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild deleted file mode 100644 index 384e4b199c8c..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-4.1.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 systemd - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-4.1.1-fix_python3.patch" -) - -src_install() { - distutils-r1_src_install - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild deleted file mode 100644 index 43aef1343542..000000000000 --- a/net-analyzer/prelude-correlator/prelude-correlator-5.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) - -inherit distutils-r1 systemd - -DESCRIPTION="Real time correlator of events received by Prelude Manager" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/5.1.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=dev-libs/libprelude-5.1.0[python,${PYTHON_USEDEP}] - <dev-libs/libprelude-6[python,${PYTHON_USEDEP}] - dev-python/netaddr[${PYTHON_USEDEP}]" - -src_install() { - distutils-r1_src_install - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml-rules/Manifest b/net-analyzer/prelude-lml-rules/Manifest deleted file mode 100644 index 4305eba2fe07..000000000000 --- a/net-analyzer/prelude-lml-rules/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST prelude-lml-rules-3.0.1.tar.gz 117551 BLAKE2B 65b4c5a03adf0cad2063463526165a3789ecffd15c75131acbbce6510e354e9e5ddb1575cc682b235e6833a16872889ce67c1557bbe19557e7f154b219c68b00 SHA512 fc3b35fcb6249b40e5f5fad6b22b238167f7039a48a3e7732110a77f23fd82d0f0150a891f83e07ab7e0ccd8b33cbcff5d8498f6f14f01248d87b8f37e6ea9a3 -DIST prelude-lml-rules-4.0.0.tar.gz 115058 BLAKE2B 93f3bc14f14a8aea70850b67a427f74818bd8119e7f54c66c3391a2e81656dd13462362a6e82d03997701cc8d8189b744922545c7e7463df79b0052e2449c302 SHA512 9244d7d5e4a7a64c10adc2f8bc0662e7ada2a367b6bf6b38292db3abab484bcb0bf3a26696576ecbb593a82de5e372ae3d381070af06a65ba03b01b9273a19f3 -DIST prelude-lml-rules-4.1.0.tar.gz 116148 BLAKE2B 0b24d5673a186f085935cd146dc27d38224736141ec480564e5be0bea7f6d624084e5bd2178453950a5ce57caf1b8ff6e3574d789b230ec07268559801856528 SHA512 a4752bb16a0b7d24f2a5d1ee62390d646778509e63dbdefa2419caca6d6251c429f18abf38dce7729cf185b9a3ef819de3fa75324e36787b984800a76c8dd3f7 -DIST prelude-lml-rules-5.1.0.tar.gz 117585 BLAKE2B 0df09a472cd5bd3306927e788b0fc5451d95bf200ec83f77cede2653c1e28da1c777b4bc6ed1232bbf82c06557bc77ece18c02843349c14a8e0bf453db5191d9 SHA512 ef31b7933a441efa43a994170d3cec377b211b55ee80abbbff7986474d58a1f7b780c717a6c364c9ae162d3a8830004a7dd5c43b5cd8df0e2d92a38ad312eadc diff --git a/net-analyzer/prelude-lml-rules/metadata.xml b/net-analyzer/prelude-lml-rules/metadata.xml deleted file mode 100644 index b02642a4a79c..000000000000 --- a/net-analyzer/prelude-lml-rules/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Rules for Prelude LML contributed by the community. - </longdescription> -</pkgmetadata> diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild deleted file mode 100644 index 2088e31212d2..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Prelude LML community ruleset" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND="net-analyzer/prelude-lml" - -RDEPEND="${DEPEND}" - -src_install() { - dodir "/etc/prelude-lml/ruleset" - insinto "/etc/prelude-lml/ruleset" - doins "ruleset/"*.rules -} diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild deleted file mode 100644 index 1c9aed51d8a2..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.0.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -DEPEND="~net-analyzer/prelude-lml-${PV}" - -RDEPEND="${DEPEND}" - -src_install() { - insinto "/etc/prelude-lml/ruleset" - doins ruleset/*.rules -} diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild deleted file mode 100644 index 59a9a724b22b..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-4.1.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" - -DEPEND="~net-analyzer/prelude-lml-${PV}" - -RDEPEND="${DEPEND}" - -src_install() { - insinto "/etc/prelude-lml/ruleset" - doins ruleset/*.rules -} diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild deleted file mode 100644 index 31c1829ee02f..000000000000 --- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-5.1.0.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Prelude LML community ruleset" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="~net-analyzer/prelude-lml-${PV}" - -DEPEND="${RDEPEND}" - -src_install() { - insinto "/etc/prelude-lml/ruleset" - doins ruleset/*.rules -} diff --git a/net-analyzer/prelude-lml/Manifest b/net-analyzer/prelude-lml/Manifest deleted file mode 100644 index 1bd2d6c0705f..000000000000 --- a/net-analyzer/prelude-lml/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST prelude-lml-3.0.0.tar.gz 1391203 BLAKE2B b3e4bfab596f869919c70dd7d2c3860bba33754970eff9b1a8c238f35cafec67601548985bd36244740062455a19fc816cbd7eb50bc6a3c4c97cf9da5b288dd3 SHA512 f206407f99df394186466566608b434a94d4fdce3e5e8991a4236f2ee670f6ae2573adea22bc248fdfea760588e94160faa7260257aeaeb35c938e1bb886ee6c -DIST prelude-lml-4.0.0.tar.gz 1435446 BLAKE2B 03231bfe4763bfbbc3256075f832a99f83c8e26221412f6b07ab7464d4d46b6abdad6dccdd3379927dbf05cfe808b31df57398f48bd794a311ced19f6e7fac67 SHA512 e2ae3a754f722b19110a32ae9ab7d0d9ce5ceb256c04a2b56f6549802d605cfa741cef4687c8883b585a0dd59f3507ee2d1275f4eb05050d10d24ad068522ef8 -DIST prelude-lml-4.1.0.tar.gz 1457294 BLAKE2B ec57e0e1d9048918c838965444888e80ee320882057dd3972c5da68402ca2443363dc26efc86e89916b1bc4e25d32c36aeac350ddf4aafb4598e8b3704e4f6e7 SHA512 e34d542e3b9e12873f9e2a19e2573b32e2b686574cbc8678cefbb198d7397695f8a2512effb58be9e6703663158c2294d741e0f6f8db23c5541e58bdd3c7f035 -DIST prelude-lml-5.1.0.tar.gz 1585080 BLAKE2B 572a3bf2b013dc3f427f7e3a4cc650219945a0e481e10f9f8f8e6afac75c86db5319fd16f1bf9157ede55ae511ce5151a0fe63694d0b8cc2becbd6430521fba3 SHA512 248434352c340d9979051897190fc7fbe835c7b1f2411ec98a04cbf0bebb6f115e80ca854d35ab2b2f50722c052eea10e088e4557ca4218f0dfed21ae21109ae diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch deleted file mode 100644 index dab4ea8a6bb1..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-conf.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/prelude-lml.conf -+++ b/prelude-lml.conf -@@ -92,7 +92,7 @@ - time-format = "%b %d %H:%M:%S" - prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" - file = /var/log/messages --file = /var/log/secure -+file = /var/log/auth.log - # udp-server = 0.0.0.0 - # tcp-server = 0.0.0.0 - # tcp-tls-server = 0.0.0.0 ---- a/prelude-lml.conf.in -+++ b/prelude-lml.conf.in -@@ -92,7 +92,7 @@ - time-format = "%b %d %H:%M:%S" - prefix-regex = "^(?P<timestamp>.{15}) (?P<hostname>\S+) (?:(?P<process>\S+?)(?:\[(?P<pid>[0-9]+)\])?: )?" - file = /var/log/messages --file = /var/log/secure -+file = /var/log/auth.log - # udp-server = 0.0.0.0 - # tcp-server = 0.0.0.0 - # tcp-tls-server = 0.0.0.0 diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch deleted file mode 100644 index 154a261eb5ad..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-configure.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -107,10 +107,13 @@ - dnl ************************************************** - GNUTLS_MIN_VERSION=1.0.17 - --PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [], -- [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)]) -- --AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no) -+AC_ARG_ENABLE(gnutls, AC_HELP_STRING(--enable-gnutls, Define whether GnuTLS provides gnutls_hash_get_len function), , enable_gnutls="yes") -+if test x$enable_gnutls = xyes; then -+ PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION], [], -+ [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, enable_gnutls=yes, enable_gnutls=no)]) -+ -+ AC_CHECK_HEADER(gnutls/gnutls.h, enable_gnutls=yes, enable_gnutls=no) -+fi - - if test x$enable_gnutls = xyes; then - AC_DEFINE_UNQUOTED(HAVE_GNUTLS, , Tell whether GnuTLS is available for TCP-TLS support) -@@ -125,8 +128,12 @@ - dnl * Check for libICU * - dnl ************************************************** - --PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes], -- [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)]) -+AC_ARG_ENABLE(icu, AC_HELP_STRING(--enable-icu, Tell whether libicu is available for encoding convertion), , enable_icu="yes") -+ -+if test x$enable_icu = xyes; then -+ PKG_CHECK_MODULES([ICU], [icu >= 3.0], [enable_icu=yes], -+ [AC_CHECK_ICU(3.8, enable_icu=yes, enable_icu=no)]) -+fi - if test x$enable_icu = xyes; then - AC_DEFINE_UNQUOTED(HAVE_LIBICU, , Tell whether libicu is available for encoding convertion) - fi diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch deleted file mode 100644 index 8b4e65216cca..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.0.0-run.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -187,9 +187,9 @@ - configdir=$SYSCONFDIR/prelude-lml - prelude_lml_conf=$configdir/prelude-lml.conf - regex_conf=$configdir/plugins.rules --metadata_dir=$LOCALSTATEDIR/lib/prelude-lml -+metadata_dir=$LOCALSTATEDIR/prelude-lml - plugindir=$LIBDIR/prelude-lml --lml_run_dir=$LOCALSTATEDIR/run/prelude-lml -+lml_run_dir=/run/prelude-lml - - AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file) - AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory) diff --git a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch b/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch deleted file mode 100644 index a9eba7760d36..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml-3.1.0-run.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -209,9 +209,9 @@ - configdir=$SYSCONFDIR/prelude-lml - prelude_lml_conf=$configdir/prelude-lml.conf - regex_conf=$configdir/plugins.rules --metadata_dir=$LOCALSTATEDIR/lib/prelude-lml -+metadata_dir=$LOCALSTATEDIR/prelude-lml - plugindir=$LIBDIR/prelude-lml --lml_run_dir=$LOCALSTATEDIR/run/prelude-lml -+lml_run_dir=/run/prelude-lml - - AC_DEFINE_UNQUOTED(PRELUDE_LML_CONF, "$prelude_lml_conf", Path to the LML configuration file) - AC_DEFINE_UNQUOTED(LOG_PLUGIN_DIR, "$plugindir", Prelude-LML report plugin directory) diff --git a/net-analyzer/prelude-lml/files/prelude-lml.initd b/net-analyzer/prelude-lml/files/prelude-lml.initd deleted file mode 100644 index 0e1dd2e0f4fc..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -BIN_LML=/usr/bin/prelude-lml -PID_LML=/run/prelude-lml/prelude-lml.pid - -depend() { - need net - after prelude-manager -} - -start() { - ebegin "Starting prelude-lml" - checkpath -d -m 0755 -o root:root /run/prelude-lml - start-stop-daemon --start --exec $BIN_LML \ - --pidfile $PID_LML -- -d -P $PID_LML - eend $? -} - -stop() { - ebegin "Stopping prelude-lml" - start-stop-daemon --stop --exec $BIN_LML \ - --pidfile $PID_LML - eend $? -} diff --git a/net-analyzer/prelude-lml/files/prelude-lml.run b/net-analyzer/prelude-lml/files/prelude-lml.run deleted file mode 100644 index 75f2ef89adda..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.run +++ /dev/null @@ -1,4 +0,0 @@ -# Configuration to create /run/prelude-lml directory -# Used as part of systemd's tmpfiles - -d /run/prelude-lml 0755 root root diff --git a/net-analyzer/prelude-lml/files/prelude-lml.service b/net-analyzer/prelude-lml/files/prelude-lml.service deleted file mode 100644 index 9d9230c6ff4c..000000000000 --- a/net-analyzer/prelude-lml/files/prelude-lml.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Prelude-LML service -DefaultDependencies=no -After=remote_fs.target prelude-manager.service - -[Service] -ExecStart=/usr/bin/prelude-lml -d -P /run/prelude-lml/prelude-lml.pid -Type=forking -PIDFile=/run/prelude-lml/prelude-lml.pid -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/prelude-lml/metadata.xml b/net-analyzer/prelude-lml/metadata.xml deleted file mode 100644 index 9aa90946ee78..000000000000 --- a/net-analyzer/prelude-lml/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>thomas.andrejak@gmail.com</email> - <name>Thomas Andrejak</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> - <longdescription lang="en"> - Prelude-LML is a log analyser that allows Prelude to collect and - analyze information from all kind of applications emitting logs or - syslog messages in order to detect suspicious activities and transform - them into Prelude-IDMEF alerts. Prelude-LML handles events generated - by a large set of applications - </longdescription> - <use> - <flag name="tls">Enables Prelude LML support Syslog through TLS - using <pkg>net-libs/gnutls</pkg>.</flag> - </use> -</pkgmetadata> diff --git a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild deleted file mode 100644 index d382e0286b29..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils ltprune systemd - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/3.0.0/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="tls icu" - -RDEPEND="dev-libs/libprelude - dev-libs/libpcre - icu? ( dev-libs/icu ) - tls? ( net-libs/gnutls )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-configure.patch" - "${FILESDIR}/${P}-conf.patch" - "${FILESDIR}/${P}-run.patch" -) - -src_prepare() { - default_src_prepare - - mv "${S}/configure.in" "${S}/configure.ac" || die "mv failed" - - eautoreconf -} - -src_configure() { - econf \ - --localstatedir=/var \ - $(use_enable icu) \ - $(use_enable tls gnutls) -} - -src_install() { - default_src_install - - rm -rv "${D}/run" || die "rm failed" - keepdir /var/${PN} - - prune_libtool_files --modules - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild deleted file mode 100644 index 89563e4bb103..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-4.0.0.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="icu ssl" - -RDEPEND="~dev-libs/libprelude-${PV} - dev-libs/libpcre - icu? ( dev-libs/icu ) - ssl? ( net-libs/gnutls:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-run.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - --localstatedir="${EPREFIX}/var" \ - $(use_with ssl libgnutls-prefix) -} - -src_install() { - default - - rm -rv "${ED%/}/run" || die "rm failed" - keepdir /var/${PN} - - find "${D}" -name '*.la' -delete || die - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild deleted file mode 100644 index 754a0268b461..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-4.1.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools systemd - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="icu ssl" - -RDEPEND="~dev-libs/libprelude-${PV} - dev-libs/libpcre - icu? ( dev-libs/icu:= ) - ssl? ( net-libs/gnutls:= )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-run.patch" - "${FILESDIR}/${PN}-3.0.0-conf.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - $(use_with ssl libgnutls-prefix) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - rm -rv "${ED%/}/run" || die "rm failed" - keepdir /var/${PN} - - find "${D}" -name '*.la' -delete || die - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild deleted file mode 100644 index 2d2d40b4db58..000000000000 --- a/net-analyzer/prelude-lml/prelude-lml-5.1.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools systemd - -DESCRIPTION="The prelude log analyzer" -HOMEPAGE="https://www.prelude-siem.org" -SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="icu ssl" - -RDEPEND="dev-libs/libpcre - >=dev-libs/libprelude-5.1.0 - <dev-libs/libprelude-6 - icu? ( dev-libs/icu:= ) - ssl? ( net-libs/gnutls:= )" - -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${PN}-3.1.0-run.patch" - "${FILESDIR}/${PN}-3.0.0-conf.patch" -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - local myconf=( - --localstatedir="${EPREFIX}/var" - $(use_with ssl libgnutls-prefix) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - rm -rv "${ED}/run" || die "rm failed" - keepdir /var/${PN} - - find "${D}" -name '*.la' -delete || die - - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.run" "${PN}.conf" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" -} diff --git a/net-analyzer/prettyping/metadata.xml b/net-analyzer/prettyping/metadata.xml index 5c168b379404..07495e084893 100644 --- a/net-analyzer/prettyping/metadata.xml +++ b/net-analyzer/prettyping/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo@seichter.de</email> - <name>Ralph Seichter</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <longdescription> 'prettyping' is a wrapper around the standard 'ping' tool, making the output prettier, more colorful, more compact, diff --git a/net-analyzer/prettyping/prettyping-1.0.1.ebuild b/net-analyzer/prettyping/prettyping-1.0.1.ebuild index 54c2c36beb32..284ed8a7c3b4 100644 --- a/net-analyzer/prettyping/prettyping-1.0.1.ebuild +++ b/net-analyzer/prettyping/prettyping-1.0.1.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -DESCRIPTION="Ping wrapper that produces coloured, easily readable output." -HOMEPAGE="http://denilson.sa.nom.br/prettyping/" +DESCRIPTION="Ping wrapper that produces coloured, easily readable output" +HOMEPAGE="https://denilson.sa.nom.br/prettyping/" SRC_URI="https://github.com/denilsonsa/prettyping/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64" +KEYWORDS="amd64 ~arm ~arm64 ~x86" RDEPEND="app-shells/bash net-misc/iputils - virtual/awk" + app-alternatives/awk" src_install() { dobin prettyping diff --git a/net-analyzer/pypacker/Manifest b/net-analyzer/pypacker/Manifest index 9447b134219d..f746ae904f44 100644 --- a/net-analyzer/pypacker/Manifest +++ b/net-analyzer/pypacker/Manifest @@ -1,5 +1 @@ -DIST pypacker-2.9.tar.gz 276080 BLAKE2B 3bab4b4c7879fea10accbd3fb2bcb4a8e27096a29240f6b8e4e06c3486ee0cb2b8fa1e83674dee759fafc85c2e182cb75e836c00dfe28c83c0bb2cecaed758cd SHA512 b7ca61948a55a37661fa402ebc5a9c2be456e8df14d1ee091a50ccd1362c7a7fa9224e1ae2b8ee8057f302ee9e0c61c06d07b627dde92947f8d22158ef3623b8 -DIST pypacker-4.6.tar.gz 592362 BLAKE2B 41fc63f1fc40ab1cfc007db9dfc6d18cedb51cc8525dc2b467bc03babe03c49f9f0771b8146aacf80f74c511619da85e1f7d56667bcda350710e4c0bafb89351 SHA512 c55205b35f653903149517aad0e2d055745edd6c1a28b1b49aeaa435ca327693b20ed6f851011fa80df1fcc5281ac8b92fbffa3b1381cb3d4507ef7d45d49545 -DIST pypacker-4.7.tar.gz 595975 BLAKE2B 95f29bf88347df5c4673a225049337c053cc4833a13767a3fce700a911fb7b744a61ea745f3d3ac4a14cc93288504e190c9cda228000b8a41b924b23805efcf3 SHA512 9c874af28887e942f62a7f540961f7e31af3b35e52f960ec99ed53e6a5ea29d36f20a6dbcf652125ac6b72849502a30e5d11ee1f795c90c7efd5702a0d34b2b3 -DIST pypacker-4.8.tar.gz 600508 BLAKE2B e9cdf07ed7d92aecad24e2bea9d18f67eca4477bccc273d77b82701f3110b7b71db5f35bc29ee45d33ac8ba02e8c8d1d36b31e326f21a443f6fc2b2375678330 SHA512 729a55e745f645b874bc6a868afcff543a26aae74b5241204c8e7103f754c296204c43b9db5b64b4a3423f735e2c658e9f0d97f7c84f0f8b134b29c5a2e55227 -DIST pypacker-4.9.tar.gz 602068 BLAKE2B 1ddc16e361ba0aa57b4dab62c38c37aabeffe2cab5cb819e627aeaac5452201117c2f806f2f443cad96d673f93bf0f0a159fa6a7d59564879d038524a2de1eb1 SHA512 804bb32eda76a00121c88d38722a6fb51a9fcff0a5625bd46bda68329e39139624c4fb8e2736208733a6b97ec0df02f173d304fcf3bb39549f3fa119fcf0ae2f +DIST pypacker-v5.2.tar.bz2 544026 BLAKE2B 3401b47a496e8c76d2b925e63c43838d2a05af01655a3e470ddfd0c2c57ab6b37ba1b9acd49386232b5c0fb4bc8d061f8992eac07f5729306502fa76413c51f5 SHA512 3ccb82ff2a352553819991c0e24fb6da8a26091f5cdced3d3358192ecf6598153fb3b36d48b1f51cdc1dd7f54e136c073e8e5a2f3fb050af24f83c77e1bda3b4 diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml index c3888efc00a8..61659fe10b68 100644 --- a/net-analyzer/pypacker/metadata.xml +++ b/net-analyzer/pypacker/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> <upstream> - <remote-id type="github">mike01/pypacker</remote-id> + <remote-id type="gitlab">mike01/pypacker</remote-id> <maintainer> <email>michael.stahn.42@googlemail.com</email> <name>Michael Stahn</name> diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild deleted file mode 100644 index 67f90fa81e25..000000000000 --- a/net-analyzer/pypacker/pypacker-2.9.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://github.com/mike01/pypacker" -SRC_URI="https://github.com/mike01/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${PYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-4.6.ebuild b/net-analyzer/pypacker/pypacker-4.6.ebuild deleted file mode 100644 index 4b7d4924659f..000000000000 --- a/net-analyzer/pypacker/pypacker-4.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${PYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-4.8.ebuild b/net-analyzer/pypacker/pypacker-4.8.ebuild deleted file mode 100644 index f10389269bce..000000000000 --- a/net-analyzer/pypacker/pypacker-4.8.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${EPYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-4.9.ebuild b/net-analyzer/pypacker/pypacker-4.9.ebuild deleted file mode 100644 index f10389269bce..000000000000 --- a/net-analyzer/pypacker/pypacker-4.9.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Fast and simple packet creation and parsing library for Python" -HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DOCS=( AUTHORS CHANGES HACKING README.md ) - -python_test() { - "${EPYTHON}" tests/test_pypacker.py || die -} - -python_install_all() { - distutils-r1_python_install_all - use examples && dodoc -r examples -} diff --git a/net-analyzer/pypacker/pypacker-4.7.ebuild b/net-analyzer/pypacker/pypacker-5.2.ebuild index 50dc293e909b..3de0dad76a97 100644 --- a/net-analyzer/pypacker/pypacker-4.7.ebuild +++ b/net-analyzer/pypacker/pypacker-5.2.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 vcs-snapshot +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{9..11} ) + +inherit distutils-r1 DESCRIPTION="Fast and simple packet creation and parsing library for Python" HOMEPAGE="https://gitlab.com/mike01/pypacker" -SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://gitlab.com/mike01/pypacker/-/archive/v${PV}/pypacker-v${PV}.tar.bz2" +S="${WORKDIR}"/${PN}-v${PV} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - DOCS=( AUTHORS CHANGES HACKING README.md ) python_test() { diff --git a/net-analyzer/python-gvm/Manifest b/net-analyzer/python-gvm/Manifest index 6f471dca1626..635607a85a25 100644 --- a/net-analyzer/python-gvm/Manifest +++ b/net-analyzer/python-gvm/Manifest @@ -1 +1,2 @@ -DIST python-gvm-1.1.0.tar.gz 160289 BLAKE2B 64dbf79f6749c50cddc2b908c45c6aea6c3793f0ddb10a98a96870636ee351f1a2e66227fbcc1383c63e0e015b4c05bf4c116ac80ef35f73f7e9057f9c8dd9b5 SHA512 dae04d42a14adde274c2148f7bd4b47b0ea02d6e249d6c23dfeb15f217f04ad9ff722f2e98d13e1a7add7b61d9dabfec623ab5b45087aaf5f480447fd31a8071 +DIST python-gvm-24.1.0.tar.gz 287497 BLAKE2B 049154d5a516c56885c06e2a83884736c9e4009e1e69a817e541f1317d4fe0cb886f98ed1572bcb55bcfdd40ed7da6639ba52cc89b113731f24d941de3f6195b SHA512 d70d3c654aefb6e5949e35f68fd1585c243988a41165c9fefb54c8fe6dd24694391553201a95558d3fd4a6e8c88783a1fc4d2205ce9ae1a7d2fc2dafdf19825b +DIST python-gvm-24.3.0.tar.gz 278134 BLAKE2B 0da2b7d33164f7db773b51d917755678639f58f63438c23fac95fc3ebeb0412e470ee834804d327b4b46b379672d8f3fd673e0cfdf93f7fc65fe31393a5f3509 SHA512 d6e9dcaf3e776309b18b11393049e2edd08884241a2d050806d9b82dcc91d12e2a121f532b311a83e8f9bf367694b41efe66a9a8eefbe1bfb7bb7453ce08715c diff --git a/net-analyzer/python-gvm/metadata.xml b/net-analyzer/python-gvm/metadata.xml index 92109f9a1354..fc9cf3041b5d 100644 --- a/net-analyzer/python-gvm/metadata.xml +++ b/net-analyzer/python-gvm/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> + <maintainer type="person" proxied="yes"> + <email>foti.giuseppe@gmail.com</email> + <name>Giuseppe Foti</name> </maintainer> - <maintainer type="project"> + <maintainer type="person" proxied="yes"> + <email>jonas.licht@gmail.com</email> + <name>Jonas Licht</name> + </maintainer> + <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> diff --git a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild deleted file mode 100644 index 9a52388287f5..000000000000 --- a/net-analyzer/python-gvm/python-gvm-1.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 - -DESCRIPTION="Greenbone Vulnerability Management Python Library" -HOMEPAGE="https://www.greenbone.net/en/" -SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-python/defusedxml[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/paramiko[${PYTHON_USEDEP}]" - -DEPEND=" - ${RDEPEND}" - -distutils_enable_tests unittest - -src_prepare() { - distutils-r1_python_prepare_all - # Exlude tests & docs to fix build issue - sed \ - -e "s/packages=find_packages(exclude=.*/packages=find_packages(exclude=['tests*', 'docs']),/g" \ - -i "$S"/setup.py || die -} diff --git a/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild b/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild new file mode 100644 index 000000000000..8ec792cbd495 --- /dev/null +++ b/net-analyzer/python-gvm/python-gvm-24.1.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Greenbone Vulnerability Management Python Library" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/python-gvm/" +SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3+" +KEYWORDS="amd64 ~x86" + +RDEPEND=" + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}] + test? ( + >=net-analyzer/pontos-22.7.2[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest + +src_prepare() { + distutils-r1_src_prepare + + # drop connection tests + rm -r tests/connections || die +} diff --git a/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild b/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild new file mode 100644 index 000000000000..1f81a8089e3f --- /dev/null +++ b/net-analyzer/python-gvm/python-gvm-24.3.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} pypy3 ) +DISTUTILS_USE_PEP517=poetry + +inherit distutils-r1 + +DESCRIPTION="Greenbone Vulnerability Management Python Library" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/python-gvm/" +SRC_URI="https://github.com/greenbone/python-gvm/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=dev-python/defusedxml-0.6[${PYTHON_USEDEP}] + >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.9.0[${PYTHON_USEDEP}] + test? ( + >=net-analyzer/pontos-22.7.2[${PYTHON_USEDEP}] + ) +" +DEPEND="${RDEPEND}" + +distutils_enable_tests unittest + +src_prepare() { + distutils-r1_src_prepare + + # drop connection tests + rm -r tests/connections || die +} diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest deleted file mode 100644 index 10c96375f852..000000000000 --- a/net-analyzer/quidscor/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST quidscor-1.2.48-src.tar.gz 77843 BLAKE2B 4f9feffb67acc8f32c4f922ce882a0799549ecce8e439dffeee5d0e4ec967739646a0ee4912a189e99c9f39743a74ae1f5528050daa82689f35ba498b2bad87f SHA512 8272a1a4ed406d3429f0438dabddd15092be0a33a8fce3c5b0af0ae13422c8918f1a5971b2c2ea639fb87ffdeb1bc89085f07f89856e732f0b270b57eabb7010 diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch deleted file mode 100644 index 5f1e035c81d6..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-curl-types.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libqg/libqg.h -+++ b/libqg/libqg.h -@@ -38,7 +38,6 @@ - #include <arpa/inet.h> - #include <dirent.h> - #include <curl/curl.h> --#include <curl/types.h> - #include <string.h> - #include <strings.h> - #include <libxml/xmlmemory.h> diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch deleted file mode 100644 index 6168720cbdf4..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/quidscor.conf -+++ b/quidscor.conf -@@ -15,9 +15,9 @@ - # Logdir: directory - LOGDIR /var/log/quidscor/ - # Cachedir: directory --CACHEDIR /var/run/quidscor/cache/ -+CACHEDIR /var/lib/quidscor - # Rulesdir: directory where .rules (for snort) live (.lib for dragon) --RULESDIR /usr/local/etc/snort-rules -+RULESDIR /etc/snort/rules - # Expiretime: time_in_seconds - EXPIRETIME 86400 - # File for custom mapping (must be absolute path) ---- a/quidscor.h -+++ b/quidscor.h -@@ -85,7 +85,7 @@ - #define AL_UNVER "alerts_unknown.log" - - // Directories --#define CACHE_DIR "run/quidscor/cache/" -+#define CACHE_DIR "/lib/quidscor" - #define LOG_DIR "log/quidscor/" - #define CREATE_MOD 0700 - #define MOD_PID 0640 ---- a/Makefile -+++ b/Makefile -@@ -84,8 +84,7 @@ - - install: - install -d -m 0700 $(IVARPREFIX)/log/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/ -- install -d -m 0700 $(IVARPREFIX)/run/$(PNAME)/cache/ -+ install -d -m 0700 $(IVARPREFIX)/lib/$(PNAME)/ - install -d -m 0755 $(IPREFIX)/sbin/ - install -m 0755 $(PNAME) $(IPREFIX)/sbin/$(PNAME) - install -d -m 0755 $(IPREFIX)/etc/ diff --git a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch b/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch deleted file mode 100644 index 9d169e619c0b..000000000000 --- a/net-analyzer/quidscor/files/quidscor-1.2.48-strip.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -69,7 +69,6 @@ - - $(PNAME): $(PNAME).debug - $(CP) $(PNAME).debug $@ -- $(STRIP) $@ - - $(PNAME).debug: libqg/libqg.a $(OFILES) Makefile - $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OFILES) $(LIBS) diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml deleted file mode 100644 index 2a7b2d66bb99..000000000000 --- a/net-analyzer/quidscor/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">quidscor</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild deleted file mode 100644 index 9c118b6762a3..000000000000 --- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Qualys IDS Correlation Daemon" -HOMEPAGE="http://quidscor.sourceforge.net/" -SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~ppc ~x86" - -DEPEND=" - >=dev-libs/libxml2-2.4 - >=net-misc/curl-7.10 - >=net-analyzer/snort-2.0 -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-curl-types.h.patch \ - "${FILESDIR}"/${P}-paths.patch \ - "${FILESDIR}"/${P}-strip.patch - - #yes, the fix below is as pathetic as it seems - echo "#define FALSE 0" >> libqg/libqg.h || die - echo "#define TRUE 1" >> libqg/libqg.h || die -} - -src_compile() { - emake EXTRA_CFLAGS="${CFLAGS}" CC="$(tc-getCC)" -} - -src_install() { - emake PREFIX=/usr STAGING_PREFIX="${D}" install - dodoc ChangeLog FAQ MANIFEST README TODO - # fix ugly install - cd "${D}"/usr || die - mv etc .. || die - rm -r doc || die -} diff --git a/net-analyzer/raddump/metadata.xml b/net-analyzer/raddump/metadata.xml index 031c18c54a9f..54b98d783bd3 100644 --- a/net-analyzer/raddump/metadata.xml +++ b/net-analyzer/raddump/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild index 84b83371d881..b6622a0152e5 100644 --- a/net-analyzer/raddump/raddump-0.3.1.ebuild +++ b/net-analyzer/raddump/raddump-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="RADIUS packet interpreter" HOMEPAGE="https://sourceforge.net/projects/raddump/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/rain/metadata.xml +++ b/net-analyzer/rain/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild index 84351e1ba87e..2021fcdea4ee 100644 --- a/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild +++ b/net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild @@ -10,7 +10,7 @@ DESCRIPTION="powerful tool for testing stability of utilizing IP protocols" HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +KEYWORDS="~amd64 ~ppc ~sparc x86" SRC_URI=" mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz diff --git a/net-analyzer/rain/rain-1.2.9_beta1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1.ebuild deleted file mode 100644 index 72284beaad76..000000000000 --- a/net-analyzer/rain/rain-1.2.9_beta1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -MY_P=${P/_/} -MY_P=${MY_P/-/_} -DESCRIPTION="powerful tool for testing stability of hardware and software utilizing IP protocols" -HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc x86" -SRC_URI=" - mirror://ubuntu/pool/universe/r/${PN}/${MY_P}.orig.tar.gz - mirror://ubuntu/pool/universe/r/${PN}/${MY_P}-1.diff.gz -" - -S="${WORKDIR}/${MY_P/_/-}" - -src_prepare() { - epatch "${WORKDIR}"/${MY_P}-1.diff - epatch "${FILESDIR}"/${P}-gentoo.patch - - eautoreconf -} - -DOCS=( BUGS CHANGES README TODO ) diff --git a/net-analyzer/ripe-atlas-tools/Manifest b/net-analyzer/ripe-atlas-tools/Manifest deleted file mode 100644 index ddad8ec9cfa1..000000000000 --- a/net-analyzer/ripe-atlas-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ripe.atlas.tools-1.2.3.tar.gz 86364 BLAKE2B de2aa0a57e135d463d1edb7e3277d21052353009d1dbcc2ead03d659c9736e61f36e95d102b5c3792448a1ea304e340f97856647f3c565fec9fcbbf0c414596a SHA512 f9e3b94ac9561faf0f6738099a0511b5aedb3b0d3230997a8033b8a1a804b885169891de8f408933ad90e3d4543375741657d9989fef09548d9cc8f0d9920e66 diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml deleted file mode 100644 index d68fdc3559c5..000000000000 --- a/net-analyzer/ripe-atlas-tools/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> - <upstream> - <remote-id type="pypi">ripe.atlas.tools</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild deleted file mode 100644 index 736af6b37ae0..000000000000 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) - -inherit distutils-r1 - -MY_PN=${PN//-/.} -DESCRIPTION="The official command-line client for RIPE Atlas" -HOMEPAGE="https://atlas.ripe.net/" -SRC_URI="mirror://pypi/${PN:0:1}/ripe.atlas.tools/ripe.atlas.tools-${PV}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -DOCS=( CHANGES.rst README.rst ) - -RDEPEND=" - >=net-libs/ripe-atlas-sagan-1.1.10[${PYTHON_USEDEP}] - >=www-client/ripe-atlas-cousteau-1.2[${PYTHON_USEDEP}] - >=dev-python/requests-2.7.0[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/tzlocal[${PYTHON_USEDEP}] - dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/ujson[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - dev-python/nose[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )" - -python_test() { - nosetests --verbose || die "Tests failed with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install - echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \ - ${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent -} diff --git a/net-analyzer/rrdcollect/Manifest b/net-analyzer/rrdcollect/Manifest index 12c93e9e1d5f..fd13c476d231 100644 --- a/net-analyzer/rrdcollect/Manifest +++ b/net-analyzer/rrdcollect/Manifest @@ -1 +1 @@ -DIST rrdcollect-0.2.9.tar.gz 137397 BLAKE2B 5fa7e3c90f168c4839227f4578c0bb309c9e1d5ac440026b10aa5ea9f62ed23db63f20cd506c87fb6bf4b969e9aaa0a0a33e882818bc558e1e99432ce3e6e855 SHA512 5f01b93a469d32f095b501c3611d4e31d354025848aeffd913db9625d0186a3e7d394dae1a2383449836c37e758a39a3473710a1855411288659fa6ac249e10f +DIST rrdcollect-0.2.10.tar.bz2 114312 BLAKE2B 8e75a44e6ea2dcf57eec7418912383fe1ed846eda5ac2e402b7ed3b0f47f3f169d84b563821380fcb1ee87b70fcdf881dd48763fbb4ab3c8ef301ca9ef5f2a74 SHA512 c926ccfdbf98a4de114b80012151bf6859644742a97e14ce06f3c44c3b48bb242d47fda54deef8069d57aa8d207389e788e6021ce337559c0185e7cdb680b26e diff --git a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch b/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch deleted file mode 100644 index 69827b28358f..000000000000 --- a/net-analyzer/rrdcollect/files/rrdcollect-0.2.9-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/checkpid.c -+++ b/src/checkpid.c -@@ -20,6 +20,7 @@ - - #include "rrdcollect.h" - #include <fcntl.h> -+#include <sys/file.h> /* flock() */ - - /* lockfile in rrdcollect.pid */ - /* five digits+"\n\0" */ diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml index 100eb9f44e4a..1eea9b19605b 100644 --- a/net-analyzer/rrdcollect/metadata.xml +++ b/net-analyzer/rrdcollect/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild index e8380ce1376f..7bd0e454f847 100644 --- a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild +++ b/net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 - -inherit eutils +EAPI=7 +inherit autotools DESCRIPTION="Read system statistical data and feed it to RRDtool" HOMEPAGE="http://rrdcollect.sourceforge.net/" -SRC_URI="mirror://sourceforge/rrdcollect/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/rrdcollect/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" @@ -19,9 +18,11 @@ DEPEND=" pcre? ( dev-libs/libpcre ) " RDEPEND="${DEPEND}" +DOCS=( AUTHORS ChangeLog NEWS TODO ) src_prepare() { - epatch "${FILESDIR}"/${P}-include.patch + default + eautoreconf } src_configure() { @@ -31,8 +32,6 @@ src_configure() { $(use_with pcre libpcre) } -DOCS=( AUTHORS ChangeLog NEWS TODO ) - src_install() { default docinto examples diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 2dca88add42c..457a1b51cd3a 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,3 +1,2 @@ -DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd -DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 -DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 +DIST rrdtool-1.8.0-gcc14.patch.gz 10775 BLAKE2B 9b8eeb829acec097bf06e3cad2fb4ca37a5d351fb3eca5767066d8cfb70c176c9d3b9265a721958b97e02f1c267b8b3a4b61ad35b0ca06199cc45c8c92f7dc09 SHA512 576be3d94a56edbc8738a32b934d30d8e45eb3e801854f73a3a77f5bd22bdd4618f68ea079f37992f38a9b756cac96e6cb48eeb5cceb4ff30139a2d77c9b0afe +DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd deleted file mode 100644 index 0463a7923461..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.confd +++ /dev/null @@ -1,8 +0,0 @@ -RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/rrdcached/db/ -B" - -USER="" -GROUP="" - -MODE="" - -MAXWAIT=30 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1 new file mode 100644 index 000000000000..99213acd1e1b --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1 @@ -0,0 +1,13 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default user and group for the rrdcached daemon +GROUP="rrdcached" +USER="root" + +# Default options for the rrdcached daemon +RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock" + +# Default path for database and journal +RRCACHE_DATABASE="/var/lib/rrdcached/db" +RRCACHE_JOURNAL="/var/lib/rrdcached/journal" diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init deleted file mode 100644 index 51c2cbb6e818..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.init +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/rrdcached" -command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid" -start_stop_daemon_args="--quiet" -description="RRDtool data caching daemon" - -depend() { - need localmount net - use logger -} diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1 new file mode 100644 index 000000000000..f7bdb0c68504 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.init-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +description="Data caching daemon for RRDTool" +rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}" +rrdcached_group="${GROUP:-rrdcached}" +rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}" +rrdcached_user="${USER:-rrdcached}" +pidfile="/run/rrdcached.pid" + +command="/usr/bin/rrdcached" +command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}" + +depend() { + need localmount + use logger +} + +start_pre() { + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}" + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}" +} diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch deleted file mode 100644 index 67f0ce2fb292..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/src/rrd_cgi.c -+++ b/src/rrd_cgi.c -@@ -56,6 +56,7 @@ - const char **); - - /* call rrd_graph and insert appropriate image tag */ -+#ifdef HAVE_RRD_GRAPH - char *drawgraph( - long, - const char **); -@@ -64,6 +65,7 @@ - char *drawprint( - long, - const char **); -+#endif /* HAVE_RRD_GRAPH */ - - /* pretty-print the <last></last> value for some.rrd via strftime() */ - char *printtimelast( -@@ -542,9 +544,13 @@ - } - parse(&buffer, i, "<RRD::GETVAR", rrdgetvar); - parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor); -+#ifdef HAVE_RRD_GRAPH - parse(&buffer, i, "<RRD::GRAPH", drawgraph); -+#endif /* HAVE_RRD_GRAPH */ - parse(&buffer, i, "<RRD::INCLUDE", includefile); -+#ifdef HAVE_RRD_GRAPH - parse(&buffer, i, "<RRD::PRINT", drawprint); -+#endif /* HAVE_RRD_GRAPH */ - parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst); - parse(&buffer, i, "<RRD::SETENV", rrdsetenv); - parse(&buffer, i, "<RRD::SETVAR", rrdsetvar); -@@ -929,7 +935,7 @@ - } - - -- -+#ifdef HAVE_RRD_GRAPH - char *drawgraph( - long argc, - const char **args) -@@ -961,6 +967,7 @@ - } - return NULL; - } -+#endif /* HAVE_RRD_GRAPH */ - - char *drawprint( - long argc, diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch deleted file mode 100644 index c68ca24a3e2f..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-perl.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- a/bindings/perl-shared/RRDs.xs -+++ b/bindings/perl-shared/RRDs.xs -@@ -189,6 +189,7 @@ - OUTPUT: - RETVAL - -+#ifdef HAVE_RRD_GRAPH - SV * - rrd_graph(...) - PROTOTYPE: @ -@@ -235,6 +236,8 @@ - PUSHs(sv_2mortal(newSViv(xsize))); - PUSHs(sv_2mortal(newSViv(ysize))); - -+#endif /* HAVE_RRD_GRAPH */ -+ - SV * - rrd_fetch(...) - PROTOTYPE: @ -@@ -313,6 +316,7 @@ - PUSHs(sv_2mortal(newSVuv(start_tmp))); - PUSHs(sv_2mortal(newSVuv(end_tmp))); - -+#ifdef HAVE_RRD_GRAPH - int - rrd_xport(...) - PROTOTYPE: @ -@@ -371,6 +375,8 @@ - PUSHs(sv_2mortal(newRV_noinc((SV*)names))); - PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); - -+#endif /* HAVE_RRD_GRAPH */ -+ - SV* - rrd_info(...) - PROTOTYPE: @ -@@ -397,6 +403,7 @@ - OUTPUT: - RETVAL - -+#ifdef HAVE_RRD_GRAPH - SV* - rrd_graphv(...) - PROTOTYPE: @ -@@ -410,6 +417,8 @@ - OUTPUT: - RETVAL - -+#endif /* HAVE_RRD_GRAPH */ -+ - int - rrd_dump(...) - PROTOTYPE: @ diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch deleted file mode 100644 index 6b3a3abf26bb..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/bindings/lua/rrdlua.c -+++ b/bindings/lua/rrdlua.c -@@ -367,7 +367,9 @@ - #if defined(DINF) - {"info", lua_rrd_info}, - {"updatev", lua_rrd_updatev}, -+#ifdef HAVE_RRD_GRAPH - {"graphv", lua_rrd_graphv}, -+#endif /* HAVE_RRD_GRAPH */ - #endif - {NULL, NULL} - }; diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch deleted file mode 100644 index db3daaf47345..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/bindings/python/rrdtoolmodule.c -+++ b/bindings/python/rrdtoolmodule.c -@@ -675,8 +676,6 @@ - return r; - } - --#endif -- - static char PyRRD_dump__doc__[] = - "dump - dump an RRD to XML\n" - "[--header|-h {none,xsd,dtd}] [--no-header]file.rrd [file.xml]"; -@@ -704,6 +703,7 @@ - destroy_args(&argv); - return r; - } -+#endif /* HAVE_RRD_GRAPH */ - - /* List of methods defined in the module */ - #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc} -@@ -717,14 +717,16 @@ - meth("last", PyRRD_last, PyRRD_last__doc__), - meth("resize", PyRRD_resize, PyRRD_resize__doc__), - meth("info", PyRRD_info, PyRRD_info__doc__), --#ifdef HAVE_RRD_GRAPH -+#ifdef HAVE_RRD_GRAPH - meth("graph", PyRRD_graph, PyRRD_graph__doc__), - meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__), - meth("xport", PyRRD_xport, PyRRD_xport__doc__), --#endif -+#endif /* HAVE_RRD_GRAPH */ - meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__), - meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__), -+#ifdef HAVE_RRD_GRAPH - meth("dump", PyRRD_dump, PyRRD_dump__doc__), -+#endif /* HAVE_RRD_GRAPH */ - {NULL, NULL, 0, NULL} - }; - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod deleted file mode 100644 index 0c645548a202..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod +++ /dev/null @@ -1,68 +0,0 @@ -=head1 NAME - -rrdrados - Creating, updating and retrieving RRD files from Ceph - -=head1 SYNOPSIS - -E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>> - - -=head1 DESCRIPTION - -This module adds support for creating, updating and retrieving RRD files -directly from a Ceph cluster using librados. - -It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to -operate on a file that is stored in Ceph. - -Currently the module expects to find the Ceph configuration file in the default -location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a -Ceph pool named "rrd". - - -=head1 ENVIRONMENT VARIABLES - -=over 4 - -=item B<CEPH_ID> - -Sets the Ceph Client ID to use when connecting. By default the client ID "admin" -is used. - -=item B<CEPH_POOL> - -Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is -used. - -=back - - -=head1 EXAMPLES - -B<Creating an RRD file on Ceph> - - rrdtool create ceph//temperature.rrd --step 300 \ - DS:temp:GAUGE:600:-273:5000 \ - RRA:AVERAGE:0.5:1:1200 \ - RRA:MIN:0.5:12:2400 \ - RRA:MAX:0.5:12:2400 \ - RRA:AVERAGE:0.5:12:2400 - - -B<Importing an existing RRD into Ceph> - - rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd - -Or you could also copy the RRD file directly into Ceph using the rados command -line utility. - - -B<Retrieving RRD data from Ceph> - - rrdtool fetch ceph//file.rrd AVERAGE - - -=head1 AUTHOR - -Simon Boulet E<lt>simon@nostalgeek.comE<gt> - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch deleted file mode 100644 index a0bee695b7ae..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -177,7 +177,7 @@ - AC_PROG_CPP - AC_PROG_CC - AM_PROG_CC_C_O --AC_PROG_LIBTOOL -+LT_INIT - - dnl Try to detect/use GNU features - CFLAGS="$CFLAGS -D_GNU_SOURCE" -@@ -239,13 +239,6 @@ - AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos)) - AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round)) - -- -- --dnl add pic flag in any case this makes sure all our code is relocatable --eval `./libtool --config | grep pic_flag=` --CFLAGS="$CFLAGS $pic_flag" -- -- - dnl Checks for library functions. - AC_FUNC_STRFTIME - AC_FUNC_VPRINTF diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch deleted file mode 100644 index 5dd214504419..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/etc/Makefile.am -+++ b/etc/Makefile.am -@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls - - if HAVE_SYSTEMD - systemdsystemunit_DATA = \ -- etc/rrdcached.socket \ -- etc/rrdcached.service -+ rrdcached.socket \ -+ rrdcached.service - endif -\ No newline at end of file ---- a/etc/Makefile.in -+++ b/etc/Makefile.in -@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls - rrdcached.socket.in rrdcached.service.in - - @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \ --@HAVE_SYSTEMD_TRUE@ etc/rrdcached.socket \ --@HAVE_SYSTEMD_TRUE@ etc/rrdcached.service -+@HAVE_SYSTEMD_TRUE@ rrdcached.socket \ -+@HAVE_SYSTEMD_TRUE@ rrdcached.service - - all: all-am - diff --git a/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch b/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch new file mode 100644 index 000000000000..355436cb82f2 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch @@ -0,0 +1,34 @@ +https://github.com/oetiker/rrdtool-1.x/commit/f3334fcbde0a77aa48938ba38602bff91c09cf85 + +From f3334fcbde0a77aa48938ba38602bff91c09cf85 Mon Sep 17 00:00:00 2001 +From: Ryan Schmidt <git@ryandesign.com> +Date: Sun, 20 Mar 2022 16:29:10 -0500 +Subject: [PATCH] acinclude.m4: Include <stdlib.h> when using exit + +Fixes: + +conftest.c:124:33: error: implicitly declaring library function 'exit' +with type 'void (int) __attribute__((noreturn))' +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -582,7 +582,8 @@ AC_DEFUN([GC_TIMEZONE], [ + AC_REQUIRE([AC_STRUCT_TM]) + AC_CACHE_CHECK([tm_gmtoff in struct tm], gq_cv_have_tm_gmtoff, + gq_cv_have_tm_gmtoff=no +- AC_TRY_COMPILE([#include <time.h> ++ AC_TRY_COMPILE([#include <stdlib.h> ++ #include <time.h> + #include <$ac_cv_struct_tm> + ], + [struct tm t; +@@ -595,7 +596,8 @@ AC_DEFUN([GC_TIMEZONE], [ + + AC_CACHE_CHECK([__tm_gmtoff in struct tm], gq_cv_have___tm_gmtoff, + gq_cv_have___tm_gmtoff=no +- AC_TRY_COMPILE([#include <time.h> ++ AC_TRY_COMPILE([#include <stdlib.h> ++ #include <time.h> + #include <$ac_cv_struct_tm> + ], + [struct tm t; + diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml index a6a291c9723d..7c83d2658e6f 100644 --- a/net-analyzer/rrdtool/metadata.xml +++ b/net-analyzer/rrdtool/metadata.xml @@ -1,13 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="graph">Enable support for graphing functions</flag> -<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag> -<flag name="rrdcgi">Build rrdcgi support</flag> -</use> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <use> + <flag name="graph">Enable support for graphing functions</flag> + <flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag> + <flag name="rrdcached">Build support for write-caching daemon</flag> + <flag name="rrdcgi">Build rrdcgi support</flag> + </use> + <upstream> + <remote-id type="github">oetiker/rrdtool-1.x</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild deleted file mode 100644 index fe2284a9133c..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python2_7 ) -inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:*[deprecated] ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # At the next version bump, please see if you actually still need this - # before adding versions - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod || die - - epatch \ - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \ - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \ - "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \ - "${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch \ - "${FILESDIR}"/${PN}-1.6.0-configure.ac.patch - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - tests/Makefile.am || die - fi - - echo ${PV/_rc*/} >> VERSION || die - - export rd_cv_gcc_flag__Werror=no - - eautoreconf -} - -src_configure() { - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild deleted file mode 100644 index ff22873538e5..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.1.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python{2_7,3_6} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:*[deprecated] ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch - "${FILESDIR}"/${PN}-1.7.1-rrdcached.socket.patch - -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - tests/Makefile.am || die - fi - - export rd_cv_gcc_flag__Werror=no - - eautoreconf -} - -src_configure() { - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild deleted file mode 100644 index 858ec12f8290..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -PYTHON_COMPAT=( python{2_7,3_6} ) -inherit autotools perl-module distutils-r1 flag-o-matic multilib - -MY_P=${P/_/-} - -DESCRIPTION="A system to store and display time-series data" -HOMEPAGE="https://oss.oetiker.ch/rrdtool/" -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -CDEPEND=" - >=dev-libs/glib-2.28.7:2[static-libs(+)?] - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] - dbi? ( dev-db/libdbi[static-libs(+)?] ) - graph? ( - >=media-libs/libpng-1.5.10:0=[static-libs(+)?] - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] - >=x11-libs/pango-1.28 - ) - lua? ( dev-lang/lua:*[deprecated] ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - tcl? ( dev-lang/tcl:0= ) - tcpd? ( sys-apps/tcp-wrappers ) -" - -DEPEND=" - ${CDEPEND} - sys-apps/groff - virtual/pkgconfig - virtual/awk -" -RDEPEND=" - ${CDEPEND} -" -PDEPEND=" - ruby? ( ~dev-ruby/rrdtool-bindings-${PV} ) -" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch -) -S=${WORKDIR}/${MY_P} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - # At the next version bump, please see if you actually still need this - # before adding versions - if ! [ -f doc/rrdrados.pod ]; then - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod - else - die "File already exists: doc/rrdrados.pod. Remove this code!" - fi - - # bug 456810 - # no time to sleep - sed -i \ - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \ - -e 's|^sleep 1$||g' \ - -e '/^dnl.*png/s|^dnl||g' \ - configure.ac || die - - # Python bindings are built/installed manually - sed -i \ - -e '/^all-local:/s| @COMP_PYTHON@||' \ - bindings/Makefile.am || die - - if ! use graph; then - sed -i \ - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \ - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \ - tests/Makefile.am || die - fi - - export rd_cv_gcc_flag__Werror=no - - eautoreconf -} - -src_configure() { - filter-flags -ffast-math - - export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF} - - # to solve bug #260380 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ - - # Stub configure.ac - local myconf=() - if ! use tcpd; then - myconf+=( "--disable-libwrap" ) - fi - if ! use dbi; then - myconf+=( "--disable-libdbi" ) - fi - if ! use rados; then - myconf+=( "--disable-librados" ) - fi - - econf \ - $(use_enable graph rrd_graph) \ - $(use_enable lua lua-site-install) \ - $(use_enable lua) \ - $(use_enable perl perl-site-install) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable rrdcgi) \ - $(use_enable static-libs static) \ - $(use_enable tcl) \ - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \ - --with-perl-options=INSTALLDIRS=vendor \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -src_compile() { - default - - use python && distutils-r1_src_compile -} - -src_test() { - export LC_ALL=C - default -} - -src_install() { - default - - if ! use doc ; then - rm -rf "${ED}"usr/share/doc/${PF}/{html,txt} - fi - - if use !rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi - fi - - if use perl ; then - perl_delete_localpod - perl_delete_packlist - fi - - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO - - find "${ED}"usr -name '*.la' -exec rm -f {} + - - keepdir /var/lib/rrdcached/journal/ - keepdir /var/lib/rrdcached/db/ - - newconfd "${FILESDIR}"/rrdcached.confd rrdcached - newinitd "${FILESDIR}"/rrdcached.init rrdcached - - use python && distutils-r1_src_install -} diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild new file mode 100644 index 000000000000..73d95f65962c --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_EXT=1 +DISTUTILS_OPTIONAL="true" +DISTUTILS_SINGLE_IMPL="true" +DISTUTILS_USE_PEP517="setuptools" +GENTOO_DEPEND_ON_PERL="no" +MY_P="${P/_/-}" + +inherit autotools lua perl-module distutils-r1 flag-o-matic + +DESCRIPTION="A data logging and graphing system for time series data" +HOMEPAGE="https://oss.oetiker.ch/rrdtool/" +SRC_URI=" + https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz + https://dev.gentoo.org/~conikost/distfiles/patches/${PN}-1.8.0-gcc14.patch.gz +" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0/8.0.0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + lua? ( + ${LUA_REQUIRED_USE} + test? ( graph ) + ) + test? ( graph rrdcached ) +" + +PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )" + +RDEPEND=" + dev-libs/glib:2[static-libs(+)?] + dev-libs/libxml2:2[static-libs(+)?] + dbi? ( dev-db/libdbi[static-libs(+)?] ) + graph? ( + media-libs/libpng:0=[static-libs(+)?] + x11-libs/cairo[svg(+),static-libs(+)?] + x11-libs/pango + ) + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + rados? ( sys-cluster/ceph ) + rrdcached? ( + acct-group/rrdcached + acct-user/rrdcached + ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + ${DISTUTILS_DEPS} + sys-apps/groff + virtual/pkgconfig + app-alternatives/awk + python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) + test? ( + app-alternatives/bc + lua? ( ${LUA_DEPS} ) + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch + "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch + "${FILESDIR}"/${PN}-1.8.0-configure-clang16.patch + "${WORKDIR}"/${PN}-1.8.0-gcc14.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #456810 + local mysedargs=( + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' + -e 's|^sleep 1$||g' + -e '/^dnl.*png/s|^dnl||g' + -i configure.ac + ) + + sed "${mysedargs[@]}" || die + + # Python bindings are built and installed manually + local mysedargs=( + -e '/^all-local:/s| @COMP_PYTHON@||' + -i bindings/Makefile.am + ) + + sed "${mysedargs[@]}" || die + + # Makefile needs to be adjusted for disabling 'graph' feature + if ! use graph ; then + local mysedargs=( + -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' + -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' + -e 's|graph1||g' + -i tests/Makefile.am + ) + + sed "${mysedargs[@]}" || die + fi + + # Temporarily disable rpn test, will be enabled with > 1.8.0 release. + sed -e 's/rpn2//' -i tests/Makefile.am || die + + eautoreconf +} + +src_configure() { + export rd_cv_gcc_flag__Werror=no + export rd_cv_ms_async=ok + export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + # Bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + # Enabling '-ffast-math' is known to cause problems. + filter-flags -ffast-math + + # We will handle Lua bindings ourselves, upstream is not multi-impl-ready + # and their Lua-detection logic depends on having the right version of the Lua + # interpreter available at build time. + local myeconfargs=( + --disable-lua + --disable-ruby + --disable-ruby-site-install + $(usex !dbi '--disable-libdbi' '') + $(usex !examples '--disable-examples' '') + $(use_enable graph rrd_graph) + $(use_enable perl perl-site-install) + $(use_enable perl) + $(use_enable python) + $(usex !rados '--disable-librados' '') + $(usex !rrdcached '--disable-rrdcached' '') + $(use_enable rrdcgi) + $(use_enable static-libs static) + $(usex !tcpd '--disable-libwrap' '') + $(use_enable tcl) + $(use_enable tcl tcl-site) + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) + --with-perl-options="INSTALLDIRS=vendor" + ) + + econf "${myeconfargs[@]}" +} + +lua_src_compile() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # We do need the CMOD-dir path here, otherwise libtool complains. + # Use the real one (i.e. not within ${ED}) just in case. + local myemakeargs=( + LUA_CFLAGS="$(lua_get_CFLAGS)" + LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" + + popd || die +} + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +src_compile() { + default + + # Only copy sources now so that we do not + # trigger librrd compilation multiple times. + if use lua; then + lua_copy_sources + lua_foreach_impl lua_src_compile + fi + + use python && distutils-r1_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}"/bindings/lua || die + LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test + popd || die +} + +src_test() { + export LC_ALL=C + default + + if use lua; then + lua_foreach_impl lua_src_test + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # This time we must prefix the CMOD-dir path with ${ED}, + # so that make does not try to violate the sandbox. + local myemakeargs=( + LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +src_install() { + default + + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use perl; then + perl_delete_localpod + perl_delete_packlist + fi + + use python && distutils-r1_src_install + + if use rrdcached; then + newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached + newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-analyzer/rtpbreak/metadata.xml b/net-analyzer/rtpbreak/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/rtpbreak/metadata.xml +++ b/net-analyzer/rtpbreak/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild index c10b7bd76cc0..bdd5d139be1b 100644 --- a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild +++ b/net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit eutils toolchain-funcs +inherit toolchain-funcs DESCRIPTION="Analyze any RTP session through heuristics over UDP network traffic" HOMEPAGE="http://xenion.reactive-search.com/?page_id=7" @@ -12,18 +12,15 @@ SRC_URI="http://xenion.antifork.org/rtpbreak/${P}.tgz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" DEPEND="net-libs/libnet:1.1 >=net-libs/libpcap-0.7" - RDEPEND="${DEPEND}" -src_prepare() { - # Use limits.h PATH_MAX - epatch "${FILESDIR}"/${P}-limits.patch \ - "${FILESDIR}"/${P}-missing-headers.patch -} +PATCHES=( + "${FILESDIR}"/${P}-limits.patch + "${FILESDIR}"/${P}-missing-headers.patch +) src_compile() { emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" @@ -31,6 +28,6 @@ src_compile() { src_install() { dobin src/rtpbreak - dodoc CHANGELOG THANKS - dohtml -r doc + einstalldocs + dodoc -r doc } diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest index 5334b6da520f..82188b274820 100644 --- a/net-analyzer/sancp/Manifest +++ b/net-analyzer/sancp/Manifest @@ -1,3 +1,4 @@ +DIST sancp-1.6.1-musl.patch.bz2 7013 BLAKE2B a54c3a3c45b1029a95451a21de2b42497434dff6715cb173db5f04293740f3e03869900e23c571dae97a563a9b7fdce76c4295f3267857a77a074a65e79f3b53 SHA512 3310577acef1d16b87b51924ed6fbb82b491afc5646555667fcd2430aef1b0dd5f0ee510c6356eebd32402b79eb8e9f5032955b5194517acc0c055da8dd74fc2 DIST sancp-1.6.1.fix200511.a.patch 662 BLAKE2B d3d5114662f3904db4052d581b3a95f07f5a492b439958bd64149ca6f9aaf48f2d2d9cf2094500b9ab829b3a06358180893637ed6d3f502ef46f87dfe8527ccc SHA512 87662d9ea863a3a2468b7b64c81a191d34c81348eab9374245a73d3ed63cf2f25df54561f092f3713d516d9cc4eb553d4d7286fd920676a301e61669a023142e DIST sancp-1.6.1.fix200511.b.patch 870 BLAKE2B 18ad38c37f11aa1c4804400db5475323db25e0c135d3478e9c81af3a0a3885f397521fdf9b58825216fdd16ec2e2616584f3dc9e175e76d64c7125a767b2c029 SHA512 a54bbec1ce3799f83c006f7375297bafee85b12a90361f1f5dbbf46c936193c7e0f1196483a2bdf560019e93ceffe9129b3c01322eedc397e5dfa3a1a6b76b81 DIST sancp-1.6.1.fix200601.c.patch 3578 BLAKE2B 7c7e5ef0e1967d41f731d3c79f4273a4ebfc922159ada1940ba4635f6f82e63ed55faeffe53636d2c8fd96d57e1516211fff8852c73876d019fc13d59f4ace9d SHA512 3d15028d33e7dbddc74d8c6eefac6d66e357f024dca15afdfb8156b0cf969ab093c26baa43ebf7c1ac88f4275ef4bdc91c1cc69c5aa7b439a042ed966edea30f diff --git a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch index d7816cbdd5de..5b4391d79ddc 100644 --- a/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch +++ b/net-analyzer/sancp/files/sancp-1.6.1-compiler.patch @@ -1,5 +1,5 @@ ---- a/Makefile 2004-01-19 23:04:56.000000000 +0100 -+++ b/Makefile 2010-09-15 02:02:26.000000000 +0200 +--- a/Makefile ++++ b/Makefile @@ -1,26 +1,26 @@ # !!! Uncomment this CFLAGS for a small binary !!! diff --git a/net-analyzer/sancp/files/sancp-1.6.1-extern.patch b/net-analyzer/sancp/files/sancp-1.6.1-extern.patch new file mode 100644 index 000000000000..c046f1eb4971 --- /dev/null +++ b/net-analyzer/sancp/files/sancp-1.6.1-extern.patch @@ -0,0 +1,18 @@ +--- a/sancp.cc ++++ b/sancp.cc +@@ -54,7 +54,6 @@ + *************/ + + int main(int argc, char *argv[]) { +- extern struct gvars gVars; + int cKey; + pid_t pid=0; + +@@ -274,7 +273,6 @@ + + extern "C" void ProcessMyPacket(char *user, struct pcap_pkthdr * pkthdr, u_char * pkt) + { +- extern struct gvars gVars; + CBuffer *buffer; + struct cnx *new_cnx=0; + gVars.timeptr.tv_sec=pkthdr->ts.tv_sec; diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml index 3f2ab8cd615e..a0b410674454 100644 --- a/net-analyzer/sancp/metadata.xml +++ b/net-analyzer/sancp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild index 4f1bfd0b4e9f..f3ea7b0a3461 100644 --- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild +++ b/net-analyzer/sancp/sancp-1.6.1-r7.ebuild @@ -1,45 +1,45 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs user +inherit toolchain-funcs DESCRIPTION="collect network traffic statistics and store them in pcap format" -HOMEPAGE="http://www.metre.net/sancp.html" -SRC_URI=" - http://www.metre.net/files/${P}.tar.gz +HOMEPAGE="https://sourceforge.net/projects/sancp/" +SRC_URI="http://www.metre.net/files/${P}.tar.gz http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch http://sancp.sourceforge.net/${PN}-1.6.1.fix200601.c.patch http://sancp.sourceforge.net/${PN}-1.6.1.fix200606.d.patch -" - -LICENSE="QPL GPL-2" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.6.1-musl.patch.bz2" +LICENSE="QPL-1.0 GPL-2" # GPL-2 for init script SLOT="0" KEYWORDS="~amd64 ~x86" - IUSE="sguil" -RDEPEND="net-libs/libpcap" +RDEPEND=" + acct-group/sancp + acct-user/sancp + net-libs/libpcap" DEPEND="${RDEPEND}" -pkg_setup() { - enewgroup sancp - enewuser sancp -1 -1 /dev/null sancp -} - -src_prepare() { - epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch - epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch +PATCHES=( + "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch + "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch # bug 138337 - epatch "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch - epatch "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch - epatch "${FILESDIR}"/${P}-compiler.patch - epatch "${FILESDIR}"/${P}-gcc6.patch + "${DISTDIR}"/${PN}-1.6.1.fix200601.c.patch + "${DISTDIR}"/${PN}-1.6.1.fix200606.d.patch + "${FILESDIR}"/${PN}-1.6.1-compiler.patch + "${FILESDIR}"/${PN}-1.6.1-gcc6.patch + "${FILESDIR}"/${PN}-1.6.1-extern.patch + "${WORKDIR}"/${PN}-1.6.1-musl.patch +) - tc-export CXX CC +src_compile() { + tc-export CC CXX + emake CFLAGS="${CXXFLAGS}" } src_install() { diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest index 2594fe485a81..46ce89cb0525 100644 --- a/net-analyzer/sarg/Manifest +++ b/net-analyzer/sarg/Manifest @@ -1,2 +1 @@ -DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6 DIST sarg-2.4.0.tar.gz 1371812 BLAKE2B 4a07e97f5bdf36dc9ea867517f511dff4e2b501c01231c523778b283000bcf8e6eeb26e219c3d710551ad31f939a47453341b6a8a5575df1d8f3957461326675 SHA512 cb314c15379b01c1ad874e473fcc41664ed5a0dd492b8537d5f375e2c00d9e083679a01da5e3506775b7d66f2d43ba698864ffbd36f5e5e512ef58882148739b diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch deleted file mode 100644 index cfbf103d5b2a..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.10-config.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/log.c -+++ b/log.c -@@ -241,7 +241,7 @@ - strcpy(LogoTextColor,"#006699"); - strcpy(FontSize,"9px"); - strcpy(TempDir,"/tmp"); -- strcpy(OutputDir,"/var/www/html/squid-reports"); -+ strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports"); - AnonymousOutputFiles=false; - Ip2Name=false; - strcpy(DateFormat,"u"); ---- a/sarg-php/sarg-squidguard-block.php -+++ b/sarg-php/sarg-squidguard-block.php -@@ -26,8 +26,8 @@ - */ - - // Change to squidGuard and sarg config file paths --$SargConf = "/usr/local/sarg/sarg.conf"; --$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf"; -+$SargConf = "/etc/sarg/sarg.conf"; -+$squidGuardConf = "/etc/squidGuard/squidGuard.conf"; - - global $SargConf; - global $dbhome; -@@ -37,7 +37,7 @@ - include_once("style.php"); - - $url = $_GET['url']; --$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf'; -+$squidGuard_conf = '/etc/squidGuard/squidGuard.conf'; - - function parse_config($line,$clave) { - if (preg_match("/dbhome/i", $line)) { ---- a/sarg-php/sarg-block-it.php -+++ b/sarg-php/sarg-block-it.php -@@ -25,7 +25,7 @@ - * - */ - --$filename = "/usr/local/squid/etc/block.txt"; -+$filename = "/etc/squid/etc/block.txt"; - - $url = $_GET['url']; - $url = $url."\n"; ---- a/htaccess -+++ b/htaccess -@@ -1,4 +1,4 @@ --AuthUserFile /usr/local/sarg/passwd -+AuthUserFile /etc/sarg/passwd - AuthName "SARG, Squid Analysis Report Generator" - AuthType Basic - <Limit GET POST> ---- a/sarg.conf -+++ b/sarg.conf -@@ -4,7 +4,7 @@ - # Where is the access.log file - # sarg -l file - # --#access_log /usr/local/squid/var/logs/access.log -+#access_log /var/log/squid/access.log - - # TAG: graphs yes|no - # Use graphics where is possible. -@@ -117,7 +117,7 @@ - # The reports will be saved in that directory - # sarg -o dir - # --#output_dir /var/www/html/squid-reports -+#output_dir /var/www/localhost/htdocs/squid-reports - - # TAG: anonymous_output_files yes/no - # Use anonymous file and directory names in the report. If it is set to -@@ -545,7 +545,7 @@ - # Generate reports from SquidGuard logs. - # Use 'none' to disable. - # You can use sarg -L filename to use an alternate squidGuard log. --# squidguard_conf /usr/local/squidGuard/squidGuard.conf -+# squidguard_conf /etc/squidGuard/squidGuard.conf - # - #squidguard_conf none - ---- a/user_limit_block -+++ b/user_limit_block -@@ -24,8 +24,8 @@ - # - # - --conf="/usr/local/sarg/sarg.conf" --squid_password_file="/usr/local/squid/etc/passwd" -+conf="/etc/sarg/sarg.conf" -+squid_password_file="/etc/squid/passwd" - tmp="/tmp/sarg_limit.$$" - - limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'` diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch deleted file mode 100644 index 035578793934..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -46,18 +46,18 @@ - CFLAGS="${saved_CFLAGS}" - fi - --AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC]) -+AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC]) - saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" -+CFLAGS="${CFLAGS} -Wimplicit-function-declaration" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"]) - AC_MSG_RESULT($have_implicit_function_declaration) - if test "$have_implicit_function_declaration" = "no" ; then - CFLAGS="${saved_CFLAGS}" - fi - --AC_MSG_CHECKING([for format error flag in $CC]) -+AC_MSG_CHECKING([for format warning flag in $CC]) - saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=format" -+CFLAGS="${CFLAGS} -Wformat" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"]) - AC_MSG_RESULT($have_error_format) - if test "$have_error_format" = "no" ; then diff --git a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch deleted file mode 100644 index 583bfeb0e8e1..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -2,6 +2,7 @@ - AC_INIT([sarg],[2.3.9]) - AC_CONFIG_SRCDIR([log.c]) - AC_CONFIG_AUX_DIR(cfgaux) -+AC_CONFIG_MACRO_DIR(m4) - - AC_CANONICAL_HOST - -@@ -26,6 +27,11 @@ - dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7) - AC_PROG_CC_C99 - -+dnl mkdir_p / MKDIR_P -+AC_PROG_MKDIR_P -+mkdir_p="$MKDIR_P" -+AC_SUBST(mkdir_p) -+ - # Report more warnings to improve code quality. - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare" - -@@ -60,7 +66,7 @@ - - case "$host" in - *-solaris*) -- LDFLAGS="${LDFLAGS} -lsocket -lnsl" -+ LIBS="${LIBS} -lsocket -lnsl" - CFLAGS="-DSOLARIS ${CFLAGS}" - ;; - esac diff --git a/net-analyzer/sarg/files/sarg-2.3.11-format.patch b/net-analyzer/sarg/files/sarg-2.3.11-format.patch deleted file mode 100644 index f2dc7d39b1e8..000000000000 --- a/net-analyzer/sarg/files/sarg-2.3.11-format.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/report.c -+++ b/report.c -@@ -54,7 +54,7 @@ - char accsmart[MAXLEN]; - char crc2[MAXLEN/2 -1]; - char siteind[MAX_TRUNCATED_URL]; -- char arqtt[256]; -+ char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10]; - char *oldurltt=NULL; - char oldaccdiatt[11],oldacchoratt[9]; - char tmp3[MAXLEN]; ---- a/index.c -+++ b/index.c -@@ -89,9 +89,9 @@ - char monthdir[MAXLEN]; - char monthname1[9], monthname2[9]; - char nmonth[30]; -- char monthnum[10]; -+ char monthnum[15]; - char dayindex[MAXLEN]; -- char daynum[10]; -+ char daynum[15]; - char title[80]; - int yearsort[150]; - int nyears; ---- a/userinfo.c -+++ b/userinfo.c -@@ -67,7 +67,7 @@ - int skip; - int flen; - int count, clen; -- char cstr[9]; -+ char cstr[10]; - - last=NULL; - for (group=first_user_group ; group ; group=group->next) { diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml index 774ea9db6563..3f683ef50e06 100644 --- a/net-analyzer/sarg/metadata.xml +++ b/net-analyzer/sarg/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild b/net-analyzer/sarg/sarg-2.3.11-r1.ebuild deleted file mode 100644 index 88f7c507e91e..000000000000 --- a/net-analyzer/sarg/sarg-2.3.11-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Squid Analysis Report Generator" -HOMEPAGE="http://sarg.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -SLOT="0" -IUSE="+gd ldap pcre" - -DEPEND=" - gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) -" -RDEPEND=" - ${DEPEND} -" -DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) -PATCHES=( - "${FILESDIR}"/${PN}-2.3.10-config.patch - "${FILESDIR}"/${PN}-2.3.11-configure.patch - "${FILESDIR}"/${PN}-2.3.11-format.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gd) \ - $(use_with ldap) \ - $(use_with pcre) \ - --sysconfdir="${EPREFIX}/etc/sarg/" -} diff --git a/net-analyzer/sarg/sarg-2.3.11-r2.ebuild b/net-analyzer/sarg/sarg-2.3.11-r2.ebuild deleted file mode 100644 index c8afb3c48d45..000000000000 --- a/net-analyzer/sarg/sarg-2.3.11-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 -inherit autotools - -DESCRIPTION="Squid Analysis Report Generator" -HOMEPAGE="https://sourceforge.net/projects/sarg/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" -SLOT="0" -IUSE="+gd ldap pcre" - -DEPEND=" - gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) - pcre? ( dev-libs/libpcre ) -" -RDEPEND=" - ${DEPEND} -" -DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess ) -PATCHES=( - "${FILESDIR}"/${PN}-2.3.10-config.patch - "${FILESDIR}"/${PN}-2.3.11-configure.patch - "${FILESDIR}"/${PN}-2.3.11-format.patch - "${FILESDIR}"/${PN}-2.3.11-Werror.patch -) - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - econf \ - $(use_with gd) \ - $(use_with ldap) \ - $(use_with pcre) \ - --sysconfdir="${EPREFIX}/etc/sarg/" -} diff --git a/net-analyzer/sarg/sarg-2.4.0.ebuild b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild index 6fbc48405afe..bd534e774632 100644 --- a/net-analyzer/sarg/sarg-2.4.0.ebuild +++ b/net-analyzer/sarg/sarg-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,17 +6,17 @@ inherit autotools flag-o-matic DESCRIPTION="Squid Analysis Report Generator" HOMEPAGE="https://sourceforge.net/projects/sarg/" -SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/-}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" SLOT="0" IUSE="bzip2 doublecheck +gd +glob ldap lzma pcre zlib" RDEPEND=" bzip2? ( app-arch/bzip2 ) gd? ( media-libs/gd[png,truetype] ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre ) zlib? ( sys-libs/zlib ) diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml index 38408b55071e..35230ab450dd 100644 --- a/net-analyzer/sbd/metadata.xml +++ b/net-analyzer/sbd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild index 514310c7e942..6b87335cd5a6 100644 --- a/net-analyzer/sbd/sbd-1.37-r1.ebuild +++ b/net-analyzer/sbd/sbd-1.37-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 inherit toolchain-funcs @@ -9,11 +9,12 @@ DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption" HOMEPAGE="http://tigerteam.se/dl/sbd/" SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~hppa ~ppc x86" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" src_prepare() { + default sed -i \ -e '/ -o /{ s| $(UNIX_LDFLAGS) $(LDFLAGS)||g;s|$(CFLAGS)|& $(LDFLAGS)|g }' \ Makefile || die diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest index a9a4cbfaab64..132bd95b882c 100644 --- a/net-analyzer/scanlogd/Manifest +++ b/net-analyzer/scanlogd/Manifest @@ -1 +1 @@ -DIST scanlogd-2.2.7.tar.gz 11352 BLAKE2B 480e1ef78ac35ff04fb44961aa501f997786e20a3501f54f74b9e5761edba4736341d364a9a10772d795cb6025b88399bf3b56b0a980a0d2d0787f7a66eeeb22 SHA512 56238cb91a33524a9512914568984ed0d066eb84bea1c08551fbc4e02c9643a3f9535d59b364db00d538e4d9bcd9650ac24f2042584d3a9c639f99eb77ba1a7b +DIST scanlogd-2.2.8.tar.gz 12190 BLAKE2B 26396c3174de3d3cceed9833354cae7d7bbcf3078a81472ae1fa28856f011e6984fa8182a994d5a10632c19f15f86e31f1ee73309273cad04e05fec942afa0a4 SHA512 92f7a28dd40593dad6afae4fd0572efeceea3f43f334ff82c349538d4a28e9ab624912f82fc5c102a4a9937009bbf7b76a81029588e2815ff9b305144143572a diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml index 23b1ab5a12ae..9898ab6d729c 100644 --- a/net-analyzer/scanlogd/metadata.xml +++ b/net-analyzer/scanlogd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild index b7c18a9d4cd0..c4c0611a002a 100644 --- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild +++ b/net-analyzer/scanlogd/scanlogd-2.2.8-r1.ebuild @@ -1,16 +1,17 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils savedconfig toolchain-funcs user +EAPI=7 -DESCRIPTION="a port scan detection tool" -SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz" -HOMEPAGE="http://www.openwall.com/scanlogd/" +inherit savedconfig toolchain-funcs + +DESCRIPTION="A port scan detection tool" +SRC_URI="https://www.openwall.com/scanlogd/${P}.tar.gz" +HOMEPAGE="https://www.openwall.com/scanlogd/" LICENSE="scanlogd GPL-2" # GPL-2 for initscript SLOT="0" -KEYWORDS="~amd64 ppc x86" +KEYWORDS="~amd64 ~ppc x86" IUSE="+nids pcap" REQUIRED_USE="?? ( nids pcap )" @@ -18,16 +19,27 @@ DEPEND=" nids? ( net-libs/libnids ) pcap? ( net-libs/libpcap ) " -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + acct-group/scanlogd + acct-user/scanlogd +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.2.7-gentoo.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + default + restore_config params.h + tc-export CC } src_compile() { local target=linux + use nids && target=libnids use pcap && target=libpcap emake ${target} @@ -35,12 +47,9 @@ src_compile() { src_install() { dosbin scanlogd + doman scanlogd.8 newinitd "${FILESDIR}"/scanlogd.rc scanlogd - save_config params.h -} -pkg_preinst() { - enewgroup scanlogd - enewuser scanlogd -1 -1 /dev/null scanlogd + save_config params.h } diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest index c1452b7f0090..7ff0d095f83b 100644 --- a/net-analyzer/scanssh/Manifest +++ b/net-analyzer/scanssh/Manifest @@ -1 +1 @@ -DIST scanssh-2.1.tar.gz 111481 BLAKE2B 08ba8439cd02d597647f865fed68ef9eb32d63726f8d14bebe3b58a067b56eee70e01a1a7911ce69cf4466c0863d92d5d22e0202bb1cc60426ac283855438079 SHA512 1ddff6f8e51735bab28032c8d7cbb641ff0cd19a404a27ab489589ef1e30e3721dd486854eb4fef15368cc53f10c9c2650ffaf7fa7f767dc2202fcc5540ae59c +DIST scanssh-2.1.2.tar.gz 147470 BLAKE2B 4cb31a27dd925f071bcb958fc72bef7b7f0455b7d718a15536dae40cee969739628da64a3972e2c5cc9813ef24c5634ca019571783ea20df87c7df80f32da876 SHA512 af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453 diff --git a/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff b/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff new file mode 100644 index 000000000000..23cb3c722717 --- /dev/null +++ b/net-analyzer/scanssh/files/scanssh-2.0-libdir.diff @@ -0,0 +1,177 @@ +--- a/configure.in ++++ b/configure.in +@@ -20,8 +20,8 @@ + AC_PROG_INSTALL + + dnl XXX - Solaris sux. +-AC_CHECK_LIB(socket, socket) +-AC_CHECK_LIB(nsl, gethostbyname) ++AC_SEARCH_LIBS(socket, socket) ++AC_SEARCH_LIBS(gethostbyname, nsl) + + dnl XXX - we need WinPcap developer's pack under Cygwin for win32 + AC_CYGWIN +@@ -77,92 +77,9 @@ + AC_LIBOBJ(err) + fi + +-dnl Checks for libpcap +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, +-[ --with-libpcap=DIR use libpcap build directory], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- else +- AC_ERROR(pcap.h or libpcap.a not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/pcap.h; then +- PCAPINC="-I${prefix}/include" +- PCAPLIB="-L${prefix}/lib -lpcap" +- elif test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- PCAPLIB="-lpcap" +- elif test -f /usr/include/pcap.h; then +- PCAPLIB="-lpcap" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libpcap not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(PCAPINC) + AC_SUBST(PCAPLIB) + +-dnl Checks for (installed) libdnet +-AC_ARG_WITH(libdnet, +-[ --with-libdnet=DIR use libdnet in DIR], +-[ case "$withval" in +- yes|no) +- AC_ERROR([Please specify directory containing dnet-config when using --with-libdnet]) +- ;; +- *) +- AC_MSG_CHECKING(for libdnet) +- AC_MSG_RESULT($withval) +- if test -f $withval/src/libdnet.a; then +- DNETINC="-I$withval/include" +- DNETLIB="-L$withval/src -ldnet `$withval/dnet-config --libs`" +- elif test -x $withval/bin/dnet-config; then +- DNETINC="`$withval/bin/dnet-config --cflags`" +- DNETLIB="`$withval/bin/dnet-config --libs`" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(dnet-config not found in $withval/bin) +- fi +- ;; +- esac +- AC_MSG_RESULT(yes) ], +-[ dnl This is the default case so let's just use AC_PATH_PROG! --CPK. +- AC_PATH_PROG(dnetconfig, dnet-config, "no") +- if test "$dnetconfig" = "no"; then +- AC_ERROR(dnet-config not found) +- else +- DNETINC="`$dnetconfig --cflags`" +- DNETLIB="`$dnetconfig --libs`" +- fi] +-) +- +-dnl We still need to check whether it's dnet or dumbnet as +-dnl for example on Debian. We test by looking at the content +-dnl of DNETLIB and derive from the library name what version +-dnl we're dealing with. If we find a libdumbnet, we prefix +-dnl compat/libdnet to our inclusion path. It provides a dnet.h +-dnl that transparently includes dumbnet.h for those systems. --CPK. +-AC_MSG_CHECKING([whether libdnet is a libdumbnet]) +-if test `echo $DNETLIB | sed -e '/dumb/=;d'`; then +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_DUMBNET, 1, +- [Define if our libdnet is a libdumbnet]) +- DNETCOMPAT="compat/libdnet" +-else +- AC_MSG_RESULT(no) +-fi +- + AC_SUBST(DNETCOMPAT) + AC_SUBST(DNETINC) + AC_SUBST(DNETLIB) +@@ -173,6 +90,7 @@ + else + CFLAGS="-I$DNETCOMPAT $DNETINC" + fi ++save_LIBS=$LIBS + LIBS=$DNETLIB + + AC_MSG_CHECKING(for working addr_pton in libdnet) +@@ -190,61 +108,10 @@ + exit(a1.addr_bits != 0); + }, AC_MSG_RESULT(yes), AC_WARNING(your version of libdnet is buggy - working around it), AC_MSG_RESULT(yes)) + +-dnl Checks for libevent +-AC_MSG_CHECKING(for libevent) +-AC_ARG_WITH(libevent, +-[ --with-libevent=DIR use libevent build directory], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/event.h -a -f $withval/libevent.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- EVENTINC="-I$withval" +- EVENTLIB="-L$withval -levent" +- else +- AC_ERROR(event.h or libevent.a not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/event.h; then +- EVENTINC="-I${prefix}/include" +- EVENTLIB="-L${prefix}/lib -levent" +- elif test -f /usr/include/event/event.h; then +- EVENTINC="-I/usr/include/event" +- EVENTLIB="-levent" +- elif test -f /usr/include/event.h; then +- EVENTLIB="-levent" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libevent not found) +- fi +- AC_MSG_RESULT(yes) ] +-) + AC_SUBST(EVENTINC) + AC_SUBST(EVENTLIB) + +-CFLAGS=$EVENTINC +-LIBS=$EVENTLIB +- +- AC_MSG_CHECKING(for bufferevent in libevent) +- AC_TRY_LINK([ +-#include <sys/types.h> +-#include <sys/time.h> +-#include <stdlib.h> +-#include <event.h>],[ +- struct bufferevent bev; +- bufferevent_settimeout(&bev, 1, 1); +-], AC_MSG_RESULT(yes), [ +- AC_ERROR([you need to install a more recent version of libevent, +- check http://www.monkey.org/~provos/libevent/]) +-], AC_MSG_RESULT(yes)) +- +-CFLAGS="" +-LIBS="" ++LIBS=$save_LIBS + + dnl Checks for header files. + AC_HEADER_STDC diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml index afd56fd6df8d..0bfdf7f5bb7f 100644 --- a/net-analyzer/scanssh/metadata.xml +++ b/net-analyzer/scanssh/metadata.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">ofalk/scanssh</remote-id> +</upstream> <longdescription>Scanssh protocol scanner - scans a list of addresses an networks for running SSH protocol servers and their version numbers.</longdescription> </pkgmetadata> diff --git a/net-analyzer/scanssh/scanssh-2.1-r1.ebuild b/net-analyzer/scanssh/scanssh-2.1.2.ebuild index 0aa7c1f944ad..02520623012d 100644 --- a/net-analyzer/scanssh/scanssh-2.1-r1.ebuild +++ b/net-analyzer/scanssh/scanssh-2.1.2.ebuild @@ -1,15 +1,16 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +inherit autotools DESCRIPTION="network scanner that gathers info on SSH protocols and versions" -HOMEPAGE="https://monkey.org/~provos/scanssh/" -SRC_URI="https://monkey.org/~provos/${P}.tar.gz" +HOMEPAGE="https://github.com/ofalk/scanssh/" +SRC_URI="https://github.com/ofalk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~hppa ppc ~ppc64 ~riscv sparc x86" DEPEND=" dev-libs/libdnet @@ -21,11 +22,22 @@ RDEPEND=" " PATCHES=( "${FILESDIR}"/${PN}-2.0-fix-warnings.diff + "${FILESDIR}"/${PN}-2.0-libdir.diff ) src_prepare() { default - touch configure + eautoreconf +} + +src_configure() { + econf \ + DNETINC='' \ + DNETLIB=-ldnet \ + EVENTINC='' \ + EVENTLIB=-levent \ + PCAPINC='' \ + PCAPLIB=-lpcap } src_compile() { diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild deleted file mode 100644 index d154e29437a3..000000000000 --- a/net-analyzer/scanssh/scanssh-2.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils - -DESCRIPTION="network scanner that gathers info on SSH protocols and versions" -HOMEPAGE="https://monkey.org/~provos/scanssh/" -SRC_URI="https://monkey.org/~provos/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86" - -DEPEND=" - dev-libs/libdnet - dev-libs/libevent - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0-fix-warnings.diff - touch configure -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} - -src_install() { - dobin scanssh - doman scanssh.1 -} diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest index 386ca2e9f88a..db24ef0d9d37 100644 --- a/net-analyzer/scapy/Manifest +++ b/net-analyzer/scapy/Manifest @@ -1,2 +1 @@ -DIST scapy-2.4.2.tar.gz 3330071 BLAKE2B a40074594cd561b33d04364fba743fa5fe741b06b2ad8f8f9ebe9dfb0b9a3bc4f641cd16d99a4ba070fc0763d7cfeb8d3ecd056f162d509070cdd57d55d6ad9c SHA512 980f708a849ae26edca3eb6618a41668818c5883bca699f347f47a8964b3ee44a6ceefe4a12cb7d5fe6c13f5cbe2b7547938e53139f4ec9e6ef384e30c9bb6db -DIST scapy-2.4.3.tar.gz 2969754 BLAKE2B 83ab6500dbc0424b728253661f03391d450f77b19c0059b8a605a19f48b4ddd7344743310a5cb7c741fcf750876ba125daf883d04714981ff81ef4db97519ae0 SHA512 579e3f326f90e10b2839aee805949e14ecab9431f360ef75e60080a971653e1f48a240d812b8ace77754b01b07a2ddb8533d1e6b18ee8804280bf9b2c237cede +DIST scapy-2.5.0.tar.gz 6082895 BLAKE2B 2673de913d46532760dce93914916b909a4706d846e1e699c16f35b738cac8a073e23b194f9ed4647ade41170a04849ebd33ab3d0ba5b7f09fea8fa527e14c5d SHA512 4e5cacff0bbf6fd991ea24f4680049d042082fae4b349c8082078e6f01b38c09bb5c8276bfba15d4a88a1eb5af92c505848ec98556b10eecbd803f134a5b244a diff --git a/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch new file mode 100644 index 000000000000..be6d8fbd638a --- /dev/null +++ b/net-analyzer/scapy/files/scapy-2.5.0-no-install-tests.patch @@ -0,0 +1,11 @@ +--- a/setup.py ++++ b/setup.py +@@ -33,7 +33,7 @@ def get_long_description(): + setup( + name='scapy', + version=__import__('scapy').VERSION, +- packages=find_packages(), ++ packages=find_packages(exclude=["test", "test.*"]), + data_files=[('share/man/man1', ["doc/scapy.1"])], + package_data={ + 'scapy': ['VERSION'], diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml index a7791d1ecc1b..13a3ea6fdea1 100644 --- a/net-analyzer/scapy/metadata.xml +++ b/net-analyzer/scapy/metadata.xml @@ -1,14 +1,15 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>ikelos@gentoo.org</email> - <name>Mike Auty</name> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <!-- no ALLARCHES: uses ctypes --> <upstream> <remote-id type="github">secdev/scapy</remote-id> </upstream> diff --git a/net-analyzer/scapy/scapy-2.4.2.ebuild b/net-analyzer/scapy/scapy-2.4.2.ebuild deleted file mode 100644 index a9ccc7667e9d..000000000000 --- a/net-analyzer/scapy/scapy-2.4.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -inherit distutils-r1 readme.gentoo-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -RDEPEND=" - net-analyzer/tcpdump -" -S=${WORKDIR}/${P/_/} -DOC_CONTENTS=" -Scapy has optional support for the following packages: - - dev-python/cryptography - dev-python/gnuplot-py - dev-python/ipython - dev-python/pyx - media-gfx/graphviz - net-analyzer/tcpreplay - virtual/imagemagick-tools - - See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" -" - -src_prepare() { - echo ${PV/_/} > ${PN}/VERSION - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - dodoc -r doc/${PN}/* - DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc -} diff --git a/net-analyzer/scapy/scapy-2.4.3.ebuild b/net-analyzer/scapy/scapy-2.4.3.ebuild deleted file mode 100644 index 2b9cea9f0d1f..000000000000 --- a/net-analyzer/scapy/scapy-2.4.3.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 readme.gentoo-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -SRC_URI="https://github.com/secdev/${PN}/archive/v${PV/_/}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -RDEPEND=" - net-analyzer/tcpdump -" -S=${WORKDIR}/${P/_/} -DOC_CONTENTS=" -Scapy has optional support for the following packages: - - dev-python/cryptography - dev-python/ipython - dev-python/matplotlib - dev-python/pyx - media-gfx/graphviz - net-analyzer/tcpreplay - virtual/imagemagick-tools - - See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" -" - -src_prepare() { - echo ${PV/_/} > ${PN}/VERSION - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - dodoc -r doc/${PN}/* - DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc -} diff --git a/net-analyzer/scapy/scapy-2.5.0.ebuild b/net-analyzer/scapy/scapy-2.5.0.ebuild new file mode 100644 index 000000000000..34e252955a74 --- /dev/null +++ b/net-analyzer/scapy/scapy-2.5.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# See https://github.com/secdev/scapy/pull/3958#discussion_r1161302244 on next +# bump (>2.5.0)! + +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 readme.gentoo-r1 + +DESCRIPTION="A Python interactive packet manipulation program for mastering the network" +HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" +SRC_URI="https://github.com/secdev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/zstandard[${PYTHON_USEDEP}] + ) +" + +DOC_CONTENTS=" +Scapy has optional support for the following packages: + + dev-python/cryptography + dev-python/ipython + dev-python/matplotlib + dev-python/pyx + media-gfx/graphviz + net-analyzer/tcpdump + net-analyzer/tcpreplay + net-libs/libpcap + virtual/imagemagick-tools + + See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.0-no-install-tests.patch +) + +src_prepare() { + if ! [[ -f ${PN}/VERSION ]]; then + echo ${PV} > ${PN}/VERSION || die + else + die + fi + + # Drop tests which need network + rm \ + test/nmap.uts \ + test/p0f.uts \ + test/p0fv2.uts \ + test/regression.uts \ + test/scapy/layers/inet6.uts || die + # Timed out + rm test/tftp.uts || die + # Needs ipython + rm test/scapy/layers/dhcp.uts || die + # Import failure? + rm test/contrib/isotp_native_socket.uts test/contrib/isotpscan.uts || die + + distutils-r1_src_prepare +} + +python_test() { + # https://github.com/secdev/scapy/blob/master/tox.ini + "${EPYTHON}" -m scapy.tools.UTscapy -c ./test/configs/linux.utsc -N || die +} + +src_install() { + distutils-r1_src_install + + dodoc -r doc/${PN}/* + DISABLE_AUTOFORMATTING=1 readme.gentoo_create_doc +} diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild deleted file mode 100644 index 3ed8c5033ab1..000000000000 --- a/net-analyzer/scapy/scapy-9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 git-r3 readme.gentoo-r1 - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="https://scapy.net/ https://github.com/secdev/scapy" -EGIT_REPO_URI="https://github.com/secdev/${PN}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -RDEPEND=" - net-analyzer/tcpdump -" -S=${WORKDIR}/${P/_/} -DOC_CONTENTS=" -Scapy has optional support for the following packages: - - dev-python/cryptography - dev-python/ipython - dev-python/matplotlib - dev-python/pyx - media-gfx/graphviz - net-analyzer/tcpreplay - virtual/imagemagick-tools - - See also ""${EPREFIX}/usr/share/doc/${PF}/installation.rst"" -" - -src_prepare() { - echo ${PV/_/} > ${PN}/VERSION - distutils-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - dodoc -r doc/${PN}/* - DISABLE_AUTOFORMATTING=plz readme.gentoo_create_doc -} diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest deleted file mode 100644 index e4f019d7f606..000000000000 --- a/net-analyzer/scli/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scli-0.4.0.tar.gz 953401 BLAKE2B b6f3ccd1dbc69df882e3dbd73f8a686af76e370a5785cb475b9122a200cc9a01ae364d50fd391499cd88856ebb1e1a1869c8545b36eaecf73b45d46d47282b9b SHA512 ceb81e51049def64cb6f2428263709802380f7f712575e327a71d8cc120d284a7d9c57679d76e22cfcaf5b160d0d46af0cefa1133c56972b43002cb94f120dcc diff --git a/net-analyzer/scli/files/scli-0.4.0-configure.patch b/net-analyzer/scli/files/scli-0.4.0-configure.patch deleted file mode 100644 index d942da0adcc5..000000000000 --- a/net-analyzer/scli/files/scli-0.4.0-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -20,6 +20,8 @@ - AC_CHECK_PROG(SMIDUMP, smidump, smidump) - AC_SUBST(SMIDUMP) - -+PKG_PROG_PKG_CONFIG -+ - AC_DEFINE_UNQUOTED(SCLI_PLUGIN_PATH, "${pkglibdir}") - - AC_MSG_CHECKING([whether to enable -Wall]) -@@ -33,19 +35,24 @@ - - dnl Checks for libraries. - --AM_PATH_GLIB_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) --AM_PATH_GNET_2_0(2.0.0, [], AC_MSG_ERROR(scli needs GNET)) -+PKG_CHECK_MODULES(GLIB, glib-2.0 gmodule-2.0 gthread-2.0,[ -+ LIBS="$LIBS $GLIB_LIBS" -+ CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS" -+ ], AC_MSG_ERROR(scli needs GLIB)) -+PKG_CHECK_MODULES(GNET, gnet-2.0 >= 2.0.0,[ -+ LIBS="$LIBS $GNET_LIBS" -+ CPPFLAGS="$CPPFLAGS $GNET_CFLAGS" -+ ], AC_MSG_ERROR(scli needs GNET)) - dnl AM_PATH_GLIB(1.2.0, [], AC_MSG_ERROR(scli needs GLIB), gmodule) - dnl AM_PATH_GTK(1.2.0, [], AC_MSG_ERROR(scli needs GTK)) --AM_PATH_XML2(2.0.0, [], AC_MSG_ERROR(scli needs libxml2)) -+PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.0.0,[ -+ LIBS="$LIBS $XML2_LIBS" -+ CPPFLAGS="$CPPFLAGS $XML2_CFLAGS" -+ ], AC_MSG_ERROR(scli needs libxml2)) - PKG_CHECK_MODULES(GSNMP, gsnmp, have_gsnmp=true, have_gsnmp=false) - AC_SUBST(GSNMP_CFLAGS) - AC_SUBST(GSNMP_LIBS) --AC_CHECK_LIB(ncurses, initscr, [], -- AC_CHECK_LIB(curses, initscr, [], -- AC_MSG_ERROR([scli requires curses functions; install curses first]) -- ) --) -+PKG_CHECK_MODULES(ncurses,ncurses,LIBS="$LIBS $ncurses_LIBS",AC_MSG_ERROR([ncurses is required])) - AC_CHECK_LIB(readline, readline, [], - AC_MSG_ERROR([scli requires readline functions; install libreadline first]) - ) diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml deleted file mode 100644 index 2c2a7923cfc8..000000000000 --- a/net-analyzer/scli/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild deleted file mode 100644 index 200f73836851..000000000000 --- a/net-analyzer/scli/scli-0.4.0-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="SNMP Command Line Interface" -HOMEPAGE="https://github.com/schoenw/scli" -SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/libxml2 - net-libs/gnet - net-libs/gsnmp - sys-libs/ncurses - sys-libs/readline - sys-libs/zlib -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -DOCS=( AUTHORS ChangeLog NEWS PORTING README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${P}-configure.patch - - eautoreconf -} diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest index bae3d2ceddf4..8f748aa1a964 100644 --- a/net-analyzer/sec/Manifest +++ b/net-analyzer/sec/Manifest @@ -1,3 +1,2 @@ -DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5 -DIST sec-2.8.1.tar.gz 143700 BLAKE2B 4101883ccd947140546659c799f9641d496912f22e08debbae5bc9b8b65301ddfeb4c005a9885063c6381383d1f0581a7b96f56cf53bf2401438cfa6cf1755f0 SHA512 03c7acd1e1cfd6dc11143e0ff35758925ddc75e460987a91d5606564f0caa45afade497b8653ec2d8865cfcfab4d87743777eb104e1a16f79069cf61e17d0661 -DIST sec-2.8.2.tar.gz 144131 BLAKE2B d2c9e33be815c1e2321e94e2f679ca6eb6d272b4f68bbf575508c916293c39a36bb4e675a09986395fb34dcc04e356a0dcbf88d076f4c27f532337b4493138d9 SHA512 846a0671d5d774f74645e5e4f6d7a01c04079be19ea9b2ec9cb862fb48173dac0e1131981bb6e1fae525c74610dfdabc1535ff5818ae893bec35daab46e05c07 +DIST sec-2.9.1.tar.gz 153305 BLAKE2B 0bbc70f786badb24153f4f124aaedbf6f34970556630ee3e8763e7854dc1765d0eb8f7d10efce119ca936eade2af8064188f3372e63f7977240a0b10327269a3 SHA512 c6764cf660ad969d260e4993c38809580e448a9d941d1a763c1b70630c5d55a7f215feb6b0fa50cbf23d68fb442e34f0d270d03e1172850d63d64042a689ac90 +DIST sec-2.9.2.tar.gz 153482 BLAKE2B d2f099b034b2ab59b4abdea0d824fc63e2d340d56b4f43324e2e477e0f33b433b5f54e4172c873e1579b544504a2a5f1ba20a3c8468eab43e4587c9efc54446b SHA512 441c543f9abcfff46c5cd86c9be8fd5c57fef988519f2c9f431b715717e0500ce1b89365e16c0d3b6e76369cf5ee5f6d5318b32e4374c614ec0083833021f17c diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml index 2d02138ee2cb..99534773d99e 100644 --- a/net-analyzer/sec/metadata.xml +++ b/net-analyzer/sec/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sec/sec-2.7.6-r1.ebuild b/net-analyzer/sec/sec-2.7.6-r1.ebuild deleted file mode 100644 index 9d01d54b1552..000000000000 --- a/net-analyzer/sec/sec-2.7.6-r1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Simple Event Correlator" -HOMEPAGE="http://simple-evcorr.sourceforge.net/" -SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux" - -RDEPEND=">=dev-lang/perl-5.8.0" - -src_install() { - dobin sec - - dodoc ChangeLog README - docinto contrib - dodoc contrib/{itostream.c,convert.pl,swatch2sec.pl} - - newman sec.man sec.1 - - newinitd "${FILESDIR}"/sec.init.d sec - newconfd "${FILESDIR}"/sec.conf.d sec -} diff --git a/net-analyzer/sec/sec-2.8.1.ebuild b/net-analyzer/sec/sec-2.9.1.ebuild index 8d81eebd4d02..3236d9d01b2f 100644 --- a/net-analyzer/sec/sec-2.8.1.ebuild +++ b/net-analyzer/sec/sec-2.9.1.ebuild @@ -1,17 +1,18 @@ -# 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="Simple Event Correlator" -HOMEPAGE="https://github.com/simple-evcorr/sec" +HOMEPAGE="https://simple-evcorr.github.io/ https://github.com/simple-evcorr/sec" SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux" -RDEPEND=">=dev-lang/perl-5.8.0" +RDEPEND=">=dev-lang/perl-5.8.0 + virtual/perl-JSON-PP" src_install() { dobin sec diff --git a/net-analyzer/sec/sec-2.8.2.ebuild b/net-analyzer/sec/sec-2.9.2.ebuild index 89e843baa33a..58956cadc373 100644 --- a/net-analyzer/sec/sec-2.8.2.ebuild +++ b/net-analyzer/sec/sec-2.9.2.ebuild @@ -1,17 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Simple Event Correlator" -HOMEPAGE="https://github.com/simple-evcorr/sec" +HOMEPAGE="https://simple-evcorr.github.io/ https://github.com/simple-evcorr/sec" SRC_URI="https://github.com/simple-evcorr/sec/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux" -RDEPEND=">=dev-lang/perl-5.8.0" +RDEPEND=" + >=dev-lang/perl-5.8.0 + virtual/perl-JSON-PP +" src_install() { dobin sec diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest index 9814189753f5..6f5c278eb1ff 100644 --- a/net-analyzer/sflowtool/Manifest +++ b/net-analyzer/sflowtool/Manifest @@ -1,4 +1 @@ -DIST sflowtool-3.34.tar.gz 171613 BLAKE2B 70e55777253af2055f7de57da53bde8f63b6ee79fcd0db7545bbaabf024ea3baf933beb0a62c9a29b073b34f3471faf47ceaca6664d873fe5d91a3fe73b76f54 SHA512 4fd551fc1e03f68c886bf3effaab466c4470f1e3878ed5b94fd5152e81c076b56a6901df878edc95850522cf70458c6c9c4130c12ff071739b1da4725ae1e777 -DIST sflowtool-3.41.tar.gz 187119 BLAKE2B 3ba9d1baf8da4be14361ce82f7a783d7d1dde10264f123688703c4a41eb316d8d917f98150bb64562c3398f49a4a083e35b56402e8e8ea0a140406923bfe0519 SHA512 8758bb7f2ad17db1c8d8c943093edde72efbd4411f8acbba2b97717e447df0b9e771a33307b9fa090da6ca12ba2dac69fd72787795aa878ad3c5d4148100c57d -DIST sflowtool-5.02.tar.gz 192907 BLAKE2B 100745fb7f4eb4e40edf93e66a0f3fb26e2cdc26d2d3808d6bf5fa4a92d2b973e6fd8947f39a1695898abf647f4012cbb1577af281f8b51fc6d008ed4643986e SHA512 9b2369c8d30b9cdcd1cdfca29e2f8405ac8ea3bba22243ce62d708f943b726865fbf6ba2eee2f0e00e5df1d1b6fd4977f636bbdbe9676424183e1f973bd64dde -DIST sflowtool-5.04.tar.gz 187733 BLAKE2B 8298bbbf23d2ce30b5954a73fc8fed9e9e3510e77d80e02cff9fdab2330260cd3960db76ed7c1e9266b47f964e5724eb2fef9dd89514d9abbbf050df28e1e133 SHA512 611c3c23ed7a586997b1622b4d1c48eb0e0784a0667e5f7d17f2862c071ff5a34a55c6e537eba99e1c281d9ab870c95c805b764122b623520c81870d730b1688 +DIST sflowtool-5.06.tar.gz 78044 BLAKE2B db4a14d3e94660c803399f99b486bc04579b8dacf4e01f484ebeb31cbeec0ad279efdbd85b5a242a4dd9016e36428992344af50275dfd15c89b3337351d5fdb0 SHA512 365922e09544928bbf5893c04e05bc5b3d632290804711cc248d6bbd52c8ed30646bb9bdfd7b231a357f88bd5592473b95edff6ab3b50121809f909b4b65c7a2 diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml index 66b83a2d79ef..84b04c0dc7f1 100644 --- a/net-analyzer/sflowtool/metadata.xml +++ b/net-analyzer/sflowtool/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sflowtool/sflowtool-3.34.ebuild b/net-analyzer/sflowtool/sflowtool-3.34.ebuild deleted file mode 100644 index 96c9498e8607..000000000000 --- a/net-analyzer/sflowtool/sflowtool-3.34.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic - -DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data" -HOMEPAGE="http://www.inmon.com/technology/sflowTools.php" -SRC_URI="http://www.inmon.com/bin/${P}.tar.gz" - -LICENSE="inmon-sflow" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug" - -src_prepare() { - append-cppflags -DSPOOFSOURCE - use debug && append-cppflags -DDEBUG -} diff --git a/net-analyzer/sflowtool/sflowtool-3.41.ebuild b/net-analyzer/sflowtool/sflowtool-3.41.ebuild deleted file mode 100644 index 91200811c1aa..000000000000 --- a/net-analyzer/sflowtool/sflowtool-3.41.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic - -DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data" -HOMEPAGE=" - http://www.inmon.com/technology/sflowTools.php - https://github.com/sflow/sflowtool -" -SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="inmon-sflow" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug" - -src_prepare() { - default - - append-cppflags -DSPOOFSOURCE - - use debug && append-cppflags -DDEBUG -} diff --git a/net-analyzer/sflowtool/sflowtool-5.04.ebuild b/net-analyzer/sflowtool/sflowtool-5.04.ebuild deleted file mode 100644 index 820030971af1..000000000000 --- a/net-analyzer/sflowtool/sflowtool-5.04.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit flag-o-matic - -DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data" -HOMEPAGE=" - https://inmon.com/technology/sflowTools.php - https://github.com/sflow/sflowtool -" -SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="inmon-sflow" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug" - -src_configure() { - append-cppflags -DSPOOFSOURCE - use debug && append-cppflags -DDEBUG - - default -} diff --git a/net-analyzer/sflowtool/sflowtool-5.02.ebuild b/net-analyzer/sflowtool/sflowtool-5.06.ebuild index 820030971af1..52d33b52709c 100644 --- a/net-analyzer/sflowtool/sflowtool-5.02.ebuild +++ b/net-analyzer/sflowtool/sflowtool-5.06.ebuild @@ -1,24 +1,33 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit flag-o-matic +inherit autotools flag-o-matic DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data" HOMEPAGE=" https://inmon.com/technology/sflowTools.php https://github.com/sflow/sflowtool " -SRC_URI="https://github.com/sflow/${PN}/releases/download/v${PV}/${P}.tar.gz" +SRC_URI="https://github.com/sflow/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="inmon-sflow" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="debug" +src_prepare() { + default + eautoreconf +} src_configure() { append-cppflags -DSPOOFSOURCE use debug && append-cppflags -DDEBUG default } + +src_install() { + default + dobin scripts/sflowenable +} diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest index 469b080b1947..6a6586972b73 100644 --- a/net-analyzer/sguil-client/Manifest +++ b/net-analyzer/sguil-client/Manifest @@ -1,3 +1 @@ -DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab -DIST sguil-client-0.8.0.tar.gz 216433 BLAKE2B 65403d7c0de38fd4c010129ee692ab4af6853299566e3ffc6ac9a7f4e64b781830dad41f76dcaf4567bf5f217c5bd59396040cf36017b0ecdac733bc02c179db SHA512 44e14273cb7506b89d3138a1c50160de99576e77d6d18e3cdab9f257a1d00d5a100c8d9790f6e93aea8312fab51d52260aedfaa00facf54107249686d93e09b3 diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml index ca324d618d91..e0c75486e6c0 100644 --- a/net-analyzer/sguil-client/metadata.xml +++ b/net-analyzer/sguil-client/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild deleted file mode 100644 index 486064c7fd78..000000000000 --- a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib - -MY_PV="${PV/_p/p}" -DESCRIPTION="GUI Console for sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sf.net" -SRC_URI="mirror://sourceforge/sguil/sguil-client-${MY_PV}.tar.gz" - -LICENSE="QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-lang/tk-8.3:0= - >=dev-tcltk/itcl-3.2 - >=dev-tcltk/tclx-8.3 - dev-tcltk/itk - dev-tcltk/iwidgets - dev-tcltk/tcllib - net-analyzer/wireshark - ssl? ( >=dev-tcltk/tls-1.4.1 ) -" - -S=${WORKDIR}/sguil-${MY_PV} - -src_prepare() { - sed -i \ - -e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \ - -e '/^set ETHEREAL_PATH /s:/usr/sbin/ethereal:/usr/bin/wireshark:' \ - -e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \ - -e '/^set MAILSERVER /s:mail.example.com:localhost:' \ - -e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \ - client/sguil.conf || die -} - -src_install() { - dobin client/sguil.tk - insinto /etc/sguil - doins client/sguil.conf - insinto "/usr/$(get_libdir)/sguil" - doins -r "${S}"/client/lib/* - dodoc doc/* -} diff --git a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild deleted file mode 100644 index 0eff0c582b96..000000000000 --- a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit multilib - -MY_PV="${PV/_p/p}" -DESCRIPTION="GUI Console for sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sf.net" -SRC_URI="https://github.com/bammv/${PN/-client}/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz" - -LICENSE="QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-lang/tk-8.3:0= - >=dev-tcltk/itcl-3.2 - >=dev-tcltk/tclx-8.3 - dev-tcltk/itk - dev-tcltk/iwidgets - dev-tcltk/tcllib - net-analyzer/wireshark - ssl? ( >=dev-tcltk/tls-1.4.1 ) -" - -S=${WORKDIR}/sguil-${MY_PV} - -src_prepare() { - sed -i \ - -e "/^set SGUILLIB /s:./lib:/usr/$(get_libdir)/sguil:" \ - -e '/^set SERVERHOST /s:demo.sguil.net:localhost:' \ - -e '/^set MAILSERVER /s:mail.example.com:localhost:' \ - -e '/^set GPG_PATH /s:/usr/local/bin/gpg:/usr/bin/gpg:' \ - client/sguil.conf || die -} - -src_install() { - dobin client/sguil.tk - insinto /etc/sguil - doins client/sguil.conf - insinto "/usr/$(get_libdir)/sguil" - doins -r "${S}"/client/lib/* - dodoc doc/* -} diff --git a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild index 992c2a582baa..a0b8868ce81c 100644 --- a/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild +++ b/net-analyzer/sguil-client/sguil-client-1.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,7 +8,7 @@ DESCRIPTION="GUI Console for sguil Network Security Monitoring" HOMEPAGE="https://github.com/bammv/sguil" SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-client}.tar.gz" -LICENSE="QPL" +LICENSE="GPL-3 GPL-2+ QPL-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="ssl" diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest deleted file mode 100644 index c9b086c62dca..000000000000 --- a/net-analyzer/sguil-sensor/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 -DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab -DIST sguil-sensor-0.8.0.tar.gz 142829 BLAKE2B f753c1bf6a95ba7b12d3a91d2d6ddf506b9dfb09208d08ad5ffcea95210525f014c3807d3e79df10739b00466e5e10e88d2e2494cfbbbb7c7145f2800df62600 SHA512 9b90598f2a3fdcf8652ccb92123944ffbda61c00f131bc951b12a95002f84f555f8c63cc1235fd7bb90875d00edbecbda02750bcca3bba7d16e1b1a150eb74ae diff --git a/net-analyzer/sguil-sensor/files/log_packets.confd b/net-analyzer/sguil-sensor/files/log_packets.confd deleted file mode 100644 index 93bdc772bff7..000000000000 --- a/net-analyzer/sguil-sensor/files/log_packets.confd +++ /dev/null @@ -1,18 +0,0 @@ -# Config file for /etc/init.d/log_packets -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# This tell snort which interface to listen on (any for every interface) -IFACE=eth1 - -# Make sure this matches your IFACE -PIDFILE=/run/sguil-log_packets_$IFACE.pid - -# You probably don't want to change this, but in case you do -LOGDIR="/var/lib/sguil" - -# Percentage of disk to try and maintain -MAX_DISK_USE=95 - -# This pulls in the options above -OPTIONS="-m 122 -u sguil -g sguil" diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd deleted file mode 100644 index f372c82c905b..000000000000 --- a/net-analyzer/sguil-sensor/files/log_packets.initd +++ /dev/null @@ -1,91 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="cleandisk" - -LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs" - -start() { - ebegin "Starting Log_packest" - if [ ! -x /usr/bin/snort ] - then - eerror "No snort - cannot start" - eend 1 - return 1 - fi - - if [ ! -d ${LOG_DIR} ] - then - mkdir -p ${LOG_DIR} - chmod 770 ${LOG_DIR} - fi - - today=$(date '+%Y-%m-%d') - - if [ ! -d "${LOG_DIR}/${today}" ] - then - mkdir "${LOG_DIR}/${today}" - chmod 770 "${LOG_DIR}/${today}" - chown root:sguil "${LOG_DIR}/${today}" - fi - start-stop-daemon --start --quiet -b -m --pidfile "${PIDFILE}" \ - --exec /usr/bin/snort \ - -- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}" - real_cleandisk - eend $? -} - -stop() { - ebegin "Stopping Sensor Agent" - start-stop-daemon --stop --quiet --pidfile "${PIDFILE}" - eend $? -} - -cleandisk() { - ebegin "Cleaning Disk" - real_cleandisk - eend $? -} - -# This func checks the current space being used by LOG_DIR -# and rm's data as necessary. -real_cleandisk() { - einfo "Checking disk space (limited to ${MAX_DISK_USE}%)..." - # grep, awk, tr...woohoo! - CUR_USE=$(df -P ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %) - einfo " Current Disk Use: ${CUR_USE}%" - - if [ ${CUR_USE} -gt ${MAX_DISK_USE} ] - then - # If we are here then we passed our disk limit - # First find the oldest DIR - cd "${LOG_DIR}" - # Can't use -t on the ls since the mod time changes each time we - # delete a file. Good thing we use YYYY-MM-DD so we can sort. - OLDEST_DIR=$(ls | sort | head -n 1) - cd "${OLDEST_DIR}" - - OLDEST_FILE=$(ls -t | tail -n 1) - - if [ -f "${OLDEST_FILE}" ] - then - einfo " Removing file: ${OLDEST_DIR}/${OLDEST_FILE}" - rm -f "${OLDEST_FILE}" - else - einfo " Removing empty dir: ${OLDEST_DIR}" - cd .. - rm -rf "${OLDEST_DIR}" - fi - - # Run cleandisk again as rm'ing one file might been enough - # but we wait 5 secs in hopes any open writes are done. - sync - einfo " Waiting 5 secs for disk to sync..." - sleep 5 - real_cleandisk - else - einfo "Done." - fi -} - diff --git a/net-analyzer/sguil-sensor/files/sensor_agent.initd b/net-analyzer/sguil-sensor/files/sensor_agent.initd deleted file mode 100644 index 08b45e511f8c..000000000000 --- a/net-analyzer/sguil-sensor/files/sensor_agent.initd +++ /dev/null @@ -1,29 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -checkconfig() { - if [ ! -e /etc/sguil/sensor_agent.conf ] ; then - eerror "You need an /etc/snort/sensor_agent.conf to run the Sensor Agent" - return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting Sensor Agent" - start-stop-daemon --start -c sguil --quiet --exec /usr/bin/sensor_agent.tcl \ - -- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping Sensor Agent" - start-stop-daemon --stop --quiet --pidfile /run/sguil-sensor.pid - eend $? -} - diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml deleted file mode 100644 index ca324d618d91..000000000000 --- a/net-analyzer/sguil-sensor/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="github">bammv/sguil</remote-id> - <remote-id type="sourceforge">sguil</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild deleted file mode 100644 index 2589f9861647..000000000000 --- a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Sensor part of sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sourceforge.net" -SRC_URI="mirror://sourceforge/sguil/sguil-sensor-${MY_PV}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - >=net-analyzer/barnyard-0.2.0-r1 - >=net-analyzer/snort-2.4.1-r1 - dev-ml/pcre-ocaml - net-analyzer/sancp -" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare() { - sed -i \ - -e "s:gateway:${HOSTNAME}:" \ - -e 's:/snort_data:/var/lib/sguil:' \ - -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:DEBUG 1:DEBUG 0:g' \ - sensor/sensor_agent.conf || die - sed -i \ - -e 's:/run/sensor_agent.pid:/run/sguil-sensor.pid:' \ - sensor/sensor_agent.tcl || die -} - -src_install() { - dodoc doc/* - - dobin sensor/sensor_agent.tcl - - newinitd "${FILESDIR}/log_packets.initd" log_packets - newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent - newconfd "${FILESDIR}/log_packets.confd" log_packets - insinto /etc/sguil - doins sensor/sensor_agent.conf - - # Create the directory structure - diropts -g sguil -o sguil - keepdir /var/lib/sguil /var/lib/sguil/archive \ - "/var/lib/sguil/${HOSTNAME}" \ - "/var/lib/sguil/${HOSTNAME}/portscans" \ - "/var/lib/sguil/${HOSTNAME}/ssn_logs" \ - "/var/lib/sguil/${HOSTNAME}/dailylogs" \ - "/var/lib/sguil/${HOSTNAME}/sancp" - -} - -pkg_postinst() { - elog - elog "You should check /etc/sguil/sensor_agent.conf and" - elog "/etc/init.d/logpackets and ensure that they are accurate" - elog "for your environment. They should work providing that you" - elog "are running the sensor on the same machine as the server." - elog "This ebuild assumes that you are running a single sensor" - elog "environment, if this is not the case then you must make sure" - elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable." - elog "You should crontab the /etc/init.d/log_packets script to restart" - elog "each hour." - elog -} diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild deleted file mode 100644 index 3235c34d475a..000000000000 --- a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Sensor part of sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sourceforge.net" -SRC_URI="https://github.com/bammv/${PN/-sensor}/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - >=net-analyzer/barnyard-0.2.0-r1 - >=net-analyzer/snort-2.4.1-r1 - dev-ml/pcre-ocaml - net-analyzer/sancp -" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare() { - sed -i \ - -e "s:gateway:${HOSTNAME}:" \ - -e 's:/snort_data:/var/lib/sguil:' \ - -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:DEBUG 1:DEBUG 0:g' \ - sensor/sensor_agent.conf || die - sed -i \ - -e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \ - sensor/sensor_agent.tcl || die -} - -src_install() { - dodoc doc/* - - dobin sensor/sensor_agent.tcl - - newinitd "${FILESDIR}/log_packets.initd" log_packets - newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent - newconfd "${FILESDIR}/log_packets.confd" log_packets - insinto /etc/sguil - doins sensor/sensor_agent.conf - - # Create the directory structure - diropts -g sguil -o sguil - keepdir /var/lib/sguil /var/lib/sguil/archive \ - "/var/lib/sguil/${HOSTNAME}" \ - "/var/lib/sguil/${HOSTNAME}/portscans" \ - "/var/lib/sguil/${HOSTNAME}/ssn_logs" \ - "/var/lib/sguil/${HOSTNAME}/dailylogs" \ - "/var/lib/sguil/${HOSTNAME}/sancp" - -} - -pkg_postinst() { - elog - elog "You should check /etc/sguil/sensor_agent.conf and" - elog "/etc/init.d/logpackets and ensure that they are accurate" - elog "for your environment. They should work providing that you" - elog "are running the sensor on the same machine as the server." - elog "This ebuild assumes that you are running a single sensor" - elog "environment, if this is not the case then you must make sure" - elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable." - elog "You should crontab the /etc/init.d/log_packets script to restart" - elog "each hour." - elog -} diff --git a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild deleted file mode 100644 index f8dd087562e0..000000000000 --- a/net-analyzer/sguil-sensor/sguil-sensor-1.0.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Sensor part of sguil Network Security Monitoring" -HOMEPAGE="https://github.com/bammv/sguil" -SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-sensor}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - >=net-analyzer/barnyard-0.2.0-r1 - >=net-analyzer/snort-2.4.1-r1 - dev-ml/pcre-ocaml - net-analyzer/sancp -" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare() { - default - sed -i \ - -e "s:gateway:${HOSTNAME}:" \ - -e 's:/snort_data:/var/lib/sguil:' \ - -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:DEBUG 1:DEBUG 0:g' \ - sensor/sensor_agent.conf || die - sed -i \ - -e 's:/var/run/sensor_agent.pid:/run/sguil-sensor.pid:' \ - sensor/sensor_agent.tcl || die -} - -src_install() { - dodoc doc/* - - dobin sensor/sensor_agent.tcl - - newinitd "${FILESDIR}/log_packets.initd" log_packets - newinitd "${FILESDIR}/sensor_agent.initd" sensor_agent - newconfd "${FILESDIR}/log_packets.confd" log_packets - insinto /etc/sguil - doins sensor/sensor_agent.conf - - # Create the directory structure - diropts -g sguil -o sguil - keepdir /var/lib/sguil /var/lib/sguil/archive \ - "/var/lib/sguil/${HOSTNAME}" \ - "/var/lib/sguil/${HOSTNAME}/portscans" \ - "/var/lib/sguil/${HOSTNAME}/ssn_logs" \ - "/var/lib/sguil/${HOSTNAME}/dailylogs" \ - "/var/lib/sguil/${HOSTNAME}/sancp" - -} - -pkg_postinst() { - elog - elog "You should check /etc/sguil/sensor_agent.conf and" - elog "/etc/init.d/logpackets and ensure that they are accurate" - elog "for your environment. They should work providing that you" - elog "are running the sensor on the same machine as the server." - elog "This ebuild assumes that you are running a single sensor" - elog "environment, if this is not the case then you must make sure" - elog "to modify /etc/sguil/sensor_agent.conf and change the HOSTNAME variable." - elog "You should crontab the /etc/init.d/log_packets script to restart" - elog "each hour." - elog -} diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest deleted file mode 100644 index d7423a16252d..000000000000 --- a/net-analyzer/sguil-server/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST sguil-0.9.0.tar.gz 464204 BLAKE2B 147b743fd8f70969ee560a3f6995775c40cfbaf543d8292f16aa6f02289edde54207a3cddb4969229e0a123dad2fb589eaef3bddb016e6ff408a3d9be4c7820d SHA512 3f300901d0f0260fbc950b4c7604e3dc3eeb2d088ff45171db84e2d58e281242bf3582eac51162968f1f3766961aec4d0a7af54e85773102ee643a52e879cfa6 -DIST sguil-1.0.0.tar.gz 892934 BLAKE2B 69459eed682d91a1b57ba08c141dd655dbbfaa0d9d2956e6a26065f1b6820307b0e0e4dcbcad89537eba7499aea38f81739c351246e3dd6c46cab46bdf0d054f SHA512 fc3007383f90c99a0ace3eeebac75864f9aa549676e784c7bf1d81222282e3a5a3d5290b121097ae3c027dee3dd35bbe8ac9dfede04dbd561edfd3948a0465ab -DIST sguil-server-0.8.0.tar.gz 102236 BLAKE2B 15dfe03f79bba92486e12fa85a368e01005c8587abd7119ef5264c14efaf8f8861346c1744590316a2a40160d11b3042abe8456f911fee677d83846561a8ee70 SHA512 84161365579e3b4227314d9f61afad6ad220261525d7fc8016210a13ee607815eb33178bab026f8a217c43a42f2e623c41d579c5898f58207a18e31685426710 diff --git a/net-analyzer/sguil-server/files/sguild.confd b/net-analyzer/sguil-server/files/sguild.confd deleted file mode 100644 index 216f6e60ad87..000000000000 --- a/net-analyzer/sguil-server/files/sguild.confd +++ /dev/null @@ -1,25 +0,0 @@ -# Config file for /etc/init.d/sguild -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -#PATH to the sguild config (sguild.conf) file. -CONF=/etc/sguil/sguild.conf - -#PATH to the sguild config (autocat.conf) file. -AUTOCAT=/etc/sguil/autocat.conf - -#PATH to the sguild global queries (sguild.queries) file. -QUERIES=/etc/sguil/sguild.queries - -#PATH to the sguild users (sguild.users) file. -USERS=/etc/sguil/sguild.users - -#PATH to the sguild access file -ACCESS=/etc/sguil/sguild.access - -#Directory that contains sguild.pem and sguild.key -#Uncomment to enable openssl connectivity -#OPENSSLPATH="/etc/sguil/" - -#For any other options you wish to add -#EXTRA_SGUILD_OPTS= diff --git a/net-analyzer/sguil-server/files/sguild.initd b/net-analyzer/sguil-server/files/sguild.initd deleted file mode 100644 index e4fec500feb9..000000000000 --- a/net-analyzer/sguil-server/files/sguild.initd +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -[ -z "${CONF}" ] && CONF="/etc/sguil/sguild.conf" -[ -z "${AUTOCAT}" ] && AUTOCAT="/etc/sguil/autocat.conf" -[ -z "${QUERIES}" ] && QUERIES="/etc/sguil/sguild.queries" -[ -z "${USERS}" ] && USERS="/etc/sguil/sguild.users" -[ -z "${ACCESS}" ] && AUTOCAT="/etc/sguil/sguild.access" - -SGUILD_OPTS="-D -c ${CONF} -u ${USERS} -A ${ACCESS}" - -[ -n "${OPENSSLPATH}" ] && SGUILD_OPTS="${SGUILD_OPTS} -o -C ${OPENSSLPATH}" - -depend() { - need net - use mysql -} - -checkconfig() { - [ -f "${CONF}" ] || return 1 - [ -f "${AUTOCAT}" ] || return 1 - [ -f "${QUERIES}" ] || return 1 - [ -f "${USERS}" ] || return 1 - [ -f "${ACCESS}" ] || return 1 - if [ -n "${OPENSSLPATH}" ]; then - [ -f "${OPENSSLPATH}/sguild.key" ] || return 1 - [ -f "${OPENSSLPATH}/sguild.pem" ] || return 1 - fi -} - -start() { - checkconfig || return 1 - ebegin "Starting sguild" - start-stop-daemon --start --quiet -c sguil --exec /usr/bin/sguild \ - -- ${SGUILD_OPTS} ${EXTRA_SGUILD_OPTS} -D -P /run/sguild.pid - eend $? -} - -stop() { - ebegin "Stopping sguild" - start-stop-daemon --stop --quiet --pidfile /run/sguild.pid - eend $? -} diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml deleted file mode 100644 index ca324d618d91..000000000000 --- a/net-analyzer/sguil-server/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="github">bammv/sguil</remote-id> - <remote-id type="sourceforge">sguil</remote-id> - </upstream> -</pkgmetadata> diff --git a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild deleted file mode 100644 index f6727a2fe11c..000000000000 --- a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib ssl-cert user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Daemon for Sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sourceforge.net" -SRC_URI="mirror://sourceforge/sguil/sguil-server-${MY_PV}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - dev-tcltk/tcllib - dev-tcltk/mysqltcl - ssl? ( >=dev-tcltk/tls-1.4.1 )" -RDEPEND="${DEPEND} - net-analyzer/p0f - net-analyzer/tcpflow - net-misc/openssh" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare(){ - sed -i \ - -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \ - -e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \ - -e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \ - -e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \ - server/sguild.conf || die -} - -src_install(){ - dodoc server/sql_scripts/* - dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ - doc/TODO doc/sguildb.dia - - insopts -m640 - insinto /etc/sguil - doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf} - - insinto /usr/$(get_libdir)/sguild - doins server/lib/* - dobin server/sguild - newinitd "${FILESDIR}/sguild.initd" sguild - newconfd "${FILESDIR}/sguild.confd" sguild - - if use ssl; then - sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild" - fi - - diropts -g sguil -o sguil - keepdir \ - /var/lib/sguil \ - /var/lib/sguil/archive \ - /var/lib/sguil/rules - -} - -pkg_postinst(){ - if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then - install_cert /etc/sguil/sguild - fi - - chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.* - chown -R sguil:sguil "${ROOT}"/usr/lib/sguild - - if [ -d "${ROOT}"/etc/snort/rules ] ; then - ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME} - fi - - elog - elog "Please customize the sguild configuration files in /etc/sguild before" - elog "trying to run the daemon. Additionally you will need to setup the" - elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information." - elog "Please note that it is STRONGLY recommended to mount a separate" - elog "filesystem at /var/lib/sguil for both space and performance reasons" - elog "as a large amount of data will be kept in the directory structure" - elog "underneath that top directory." - elog - elog "You should create the sguild db as per the install instructions in" - elog "/usr/share/doc/${PF}/ and use the appropriate" - elog "database setup script located in the same directory." - - elog -} diff --git a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild deleted file mode 100644 index 22db45ec08fd..000000000000 --- a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib ssl-cert user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Daemon for Sguil Network Security Monitoring" -HOMEPAGE="http://sguil.sourceforge.net" -SRC_URI="https://github.com/bammv/${PN/-server}/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - dev-tcltk/tcllib - dev-tcltk/mysqltcl - ssl? ( >=dev-tcltk/tls-1.4.1 )" -RDEPEND="${DEPEND} - net-analyzer/p0f - net-analyzer/tcpflow - net-misc/openssh" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare(){ - sed -i \ - -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/lib/sguild:g' \ - -e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \ - -e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \ - -e 's:/usr/lib/sguild:/usr/'$(get_libdir)'/sguild:g' \ - server/sguild.conf || die -} - -src_install(){ - dodoc server/sql_scripts/* - dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ - doc/TODO doc/sguildb.dia - - insopts -m640 - insinto /etc/sguil - doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf} - - insinto /usr/$(get_libdir)/sguild - doins server/lib/* - dobin server/sguild - newinitd "${FILESDIR}/sguild.initd" sguild - newconfd "${FILESDIR}/sguild.confd" sguild - - if use ssl; then - sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild" - fi - - diropts -g sguil -o sguil - keepdir \ - /var/lib/sguil \ - /var/lib/sguil/archive \ - /var/lib/sguil/rules - -} - -pkg_postinst(){ - if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then - install_cert /etc/sguil/sguild - fi - - chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.* - chown -R sguil:sguil "${ROOT}"/usr/lib/sguild - - if [ -d "${ROOT}"/etc/snort/rules ] ; then - ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME} - fi - - elog - elog "Please customize the sguild configuration files in /etc/sguild before" - elog "trying to run the daemon. Additionally you will need to setup the" - elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information." - elog "Please note that it is STRONGLY recommended to mount a separate" - elog "filesystem at /var/lib/sguil for both space and performance reasons" - elog "as a large amount of data will be kept in the directory structure" - elog "underneath that top directory." - elog - elog "You should create the sguild db as per the install instructions in" - elog "/usr/share/doc/${PF}/ and use the appropriate" - elog "database setup script located in the same directory." - - elog -} diff --git a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild b/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild deleted file mode 100644 index 98fc91963aac..000000000000 --- a/net-analyzer/sguil-server/sguil-server-1.0.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit ssl-cert user - -MY_PV="${PV/_p/p}" -DESCRIPTION="Daemon for Sguil Network Security Monitoring" -HOMEPAGE="https://github.com/bammv/sguil" -SRC_URI="https://github.com/bammv/sguil/archive/v${PV}.tar.gz -> ${P/-server}.tar.gz" - -LICENSE="GPL-2 QPL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ssl" - -DEPEND=" - >=dev-lang/tcl-8.3:0=[-threads] - >=dev-tcltk/tclx-8.3 - dev-tcltk/tcllib - dev-tcltk/mysqltcl - ssl? ( >=dev-tcltk/tls-1.4.1 ) -" -RDEPEND=" - ${DEPEND} - net-analyzer/p0f - net-analyzer/tcpflow - net-misc/openssh -" - -S="${WORKDIR}/sguil-${MY_PV}" - -pkg_setup() { - enewgroup sguil - enewuser sguil -1 -1 /var/lib/sguil sguil -} - -src_prepare(){ - default - sed -i \ - -e 's:DEBUG 2:DEBUG 1:' -e 's:DAEMON 0:DAEMON 1:' \ - -e 's:SGUILD_LIB_PATH ./lib:SGUILD_LIB_PATH /usr/'$(get_libdir)'/sguild:g' \ - -e 's:/sguild_data/rules:/var/lib/sguil/rules:g' \ - -e 's:/sguild_data/archive:/var/lib/sguil/archive:g' \ - server/sguild.conf || die -} - -src_install(){ - dodoc server/sql_scripts/* - dodoc doc/CHANGES doc/OPENSSL.README doc/USAGE doc/INSTALL \ - doc/TODO doc/sguildb.dia - - insopts -m640 - insinto /etc/sguil - doins server/{sguild.email,sguild.users,sguild.conf,sguild.queries,sguild.access,autocat.conf} - - insinto /usr/$(get_libdir)/sguild - doins server/lib/* - dobin server/sguild - newinitd "${FILESDIR}/sguild.initd" sguild - newconfd "${FILESDIR}/sguild.confd" sguild - - if use ssl; then - sed -i -e "s/#OPENSSL/OPENSSL/" "${D}/etc/conf.d/sguild" - fi - - diropts -g sguil -o sguil - keepdir \ - /var/lib/sguil \ - /var/lib/sguil/archive \ - /var/lib/sguil/rules - -} - -pkg_postinst(){ - if use ssl && ! [ -f "${ROOT}"/etc/sguil/sguild.key ]; then - install_cert /etc/sguil/sguild - fi - - chown -R sguil:sguil "${ROOT}"/etc/sguil/sguild.* - chown -R sguil:sguil "${ROOT}"/usr/lib/sguild - - if [ -d "${ROOT}"/etc/snort/rules ] ; then - ln -s /etc/snort/rules "${ROOT}"/var/lib/sguil/rules/${HOSTNAME} - fi - - elog - elog "Please customize the sguild configuration files in /etc/sguild before" - elog "trying to run the daemon. Additionally you will need to setup the" - elog "mysql database. See /usr/share/doc/${PF}/INSTALL.gz for information." - elog "Please note that it is STRONGLY recommended to mount a separate" - elog "filesystem at /var/lib/sguil for both space and performance reasons" - elog "as a large amount of data will be kept in the directory structure" - elog "underneath that top directory." - elog - elog "You should create the sguild db as per the install instructions in" - elog "/usr/share/doc/${PF}/ and use the appropriate" - elog "database setup script located in the same directory." - - elog -} diff --git a/net-analyzer/shodan/Manifest b/net-analyzer/shodan/Manifest new file mode 100644 index 000000000000..bf9c67712bf3 --- /dev/null +++ b/net-analyzer/shodan/Manifest @@ -0,0 +1,3 @@ +DIST shodan-1.30.0.tar.gz 57790 BLAKE2B 1c3c030e84d31dc79ad737b71e63ce6c9218441be04ec94b4144013545e0d7dd79f1e25e51af1811cdd624f2f32b128e5aeb7dbc8d71b21741712733ca4b6d39 SHA512 996555945f4d874cb0fa3c596e6fad9298f7af396c0e94d75b8e9e103d4a2d7dd33ed8af24a218c753117231a0713caa971106f2152bc429d7c8b5c07b00dbc6 +DIST shodan-1.30.1.tar.gz 57908 BLAKE2B 21ef6f4ae2fd6a487e478627f8623dde4e2092fe9dec893e443fc27e94dc3e65a3483317c6819c947f053542414babcfa57ddb82c40f8a83d43bd9e2d9e84d44 SHA512 498d9057271e112940f00dda76a0ecb80a30ea66df84cfecb6e4b77197225714dc1a22d848e6b14a71a48bb4ded5e77a0924bc3915b552acb4ee35f3444cf558 +DIST shodan-1.31.0.tar.gz 57939 BLAKE2B 7d22e8ec9e32669494838ddef76115ce80ba4600ca71e5c7e9e6c91d82bbf2a55e5e754d7fd4018545c9dbba01fd21bd9fd444d4f2090938f09c7b1610b98100 SHA512 fe66fdd4ae1088d165a2acd67f85a54a9fcbed8130ee5e2a5764d318fa0c50fb472fd5a76ce72f84fcfdb4c74c29ae2e14881f86468fb177ddc3191cb95d3b67 diff --git a/net-analyzer/shodan/metadata.xml b/net-analyzer/shodan/metadata.xml new file mode 100644 index 000000000000..506479336f85 --- /dev/null +++ b/net-analyzer/shodan/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + Shodan is a search engine for Internet-connected devices. Google lets + you search for websites, Shodan lets you search for devices. This + library provides developers easy access to all of the data stored in + Shodan in order to automate tasks and integrate into existing tools. + </longdescription> + <upstream> + <remote-id type="github">achillean/shodan-python</remote-id> + <remote-id type="pypi">shodan</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/shodan/shodan-1.30.0.ebuild b/net-analyzer/shodan/shodan-1.30.0.ebuild new file mode 100644 index 000000000000..e934d6ec63e7 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.30.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-1.30.1.ebuild b/net-analyzer/shodan/shodan-1.30.1.ebuild new file mode 100644 index 000000000000..bc9092e7acc5 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.30.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-1.31.0.ebuild b/net-analyzer/shodan/shodan-1.31.0.ebuild new file mode 100644 index 000000000000..be21ef2b1735 --- /dev/null +++ b/net-analyzer/shodan/shodan-1.31.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/shodan/shodan-9999.ebuild b/net-analyzer/shodan/shodan-9999.ebuild new file mode 100644 index 000000000000..bc9092e7acc5 --- /dev/null +++ b/net-analyzer/shodan/shodan-9999.ebuild @@ -0,0 +1,36 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="The official Python library for Shodan" +HOMEPAGE="https://github.com/achillean/shodan-python" + +MY_PN="${PN}-python" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/achillean/shodan-python.git" +else + inherit pypi + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-python/click[${PYTHON_USEDEP}] + dev-python/click-plugins[${PYTHON_USEDEP}] + dev-python/colorama[${PYTHON_USEDEP}] + >=dev-python/requests-2.2.1[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + dev-python/xlsxwriter[${PYTHON_USEDEP}] +" + +# Test requires API key +RESTRICT="test" diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/sinfo/metadata.xml +++ b/net-analyzer/sinfo/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild index 441f23d854dd..ebc65efd14bf 100644 --- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild +++ b/net-analyzer/sinfo/sinfo-0.0.48-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A monitoring tool for networked computers" HOMEPAGE="http://www.ant.uni-bremen.de/whomes/rinas/sinfo/" @@ -18,15 +19,18 @@ RDEPEND=" dev-libs/boost sys-libs/ncurses:= " -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-0.0.47-tinfo.patch + "${FILESDIR}"/${P}-gcc6.patch +) src_prepare() { + default + cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die - epatch "${FILESDIR}"/${PN}-0.0.47-tinfo.patch - epatch "${FILESDIR}"/${P}-gcc6.patch eautoreconf } diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/siphon/metadata.xml +++ b/net-analyzer/siphon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild deleted file mode 100644 index dc691089fca8..000000000000 --- a/net-analyzer/siphon/siphon-666-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -MY_P=${PN}-v.${PV} - -DESCRIPTION="A portable passive network mapping suite" -HOMEPAGE="http://siphon.datanerds.net/" -SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc x86" - -DEPEND="net-libs/libpcap" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-log.patch -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - dobin ${PN} - insinto /etc - doins osprints.conf - dodoc README -} diff --git a/net-analyzer/siphon/siphon-666-r2.ebuild b/net-analyzer/siphon/siphon-666-r2.ebuild index 7921c66b9a14..ccd6f70e0ef3 100644 --- a/net-analyzer/siphon/siphon-666-r2.ebuild +++ b/net-analyzer/siphon/siphon-666-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="http://siphon.datanerds.net/" SRC_URI="http://siphon.datanerds.net/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest index 33fb3260e5f1..8e2229e19e23 100644 --- a/net-analyzer/slurm/Manifest +++ b/net-analyzer/slurm/Manifest @@ -1,2 +1 @@ -DIST slurm-0.3.3.tar.gz 122839 BLAKE2B 2633ab72c6fa32c66a6573937241a3053644ea33ad43d6646a1f0b54e34367254f3185fea5ea7cd31fbd09d640bc56033e6b74ac74817ee4262511ee90a262f0 SHA512 67ffef9d0fc6239e2a742b2020a2a1fa913a6f0d681ffb7fd00611265e60b39f83b18cbd782ce841b6b39ed0db2c40cd6410d7f5d9408bf0eb0361b95949a8a3 DIST slurm-0.4.3.tar.gz 36076 BLAKE2B 468dadfb7e338a7b11a2db8501763fa75e9f82af1c7411d132c6aec2e8426cbd1170fb9657a661dde35c77d6ad23497599affc9b36e583772950a2bf30715c20 SHA512 f55005e2e2acebf1b7be0f7106511f83123f4df30305d00495940220f99394ddd48193ee4985c91604f294487c181f6efebe9452137f7df5b9675d2c3388892f diff --git a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch b/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch deleted file mode 100644 index bd97a10c1e81..000000000000 --- a/net-analyzer/slurm/files/slurm-0.3.3-gentoo.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -40,31 +40,6 @@ - fi - AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for]) - --for cursespath in /usr/include/ncurses.h /usr/local/include/ncurses.h /usr/local/include/ncurses/ncurses.h /opt/include/ncurses.h /opt/include/curses.h /usr/include/curses.h /usr/local/include/curses.h /dev/null --do -- test -f "${cursespath}" && break --done --case ${cursespath} in -- /usr/include/*) -- CFLAGS="$CFLAGS -I/usr/include" -- LDFLAGS="" -- ;; -- /usr/local/include/ncurses/*) -- CFLAGS="${CFLAGS} -I/usr/local/include/ncurses" -- LDFLAGS="-L/usr/local/lib" -- SOLLDFLAGS="-R/usr/local/lib" -- ;; -- /usr/local/include/*) -- CFLAGS="${CFLAGS} -I/usr/local/include" -- LDFLAGS="-L/usr/local/lib" -- SOLLDFLAGS="-R/usr/local/lib" -- ;; -- /opt/include/*) -- CFLAGS="${CFLAGS} -I/opt/include" -- LDFLAGS="-L/opt/lib" -- SOLLDFLAGS="-R/opt/lib" -- ;; --esac - # add Slowlaris -R and libraries to LDFLAGS - if test ${OSTYPE} = "solaris" ; then - LDFLAGS="${LDFLAGS} ${SOLLDFLAGS} -lnsl -lsocket -lkstat" -@@ -74,7 +49,12 @@ - ncurses_support="no" - curses_support="no" - color_support="no" --AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES -D_HAVE_NCURSES_COLOR"; color_support="yes"; ncurses_support="yes", AC_CHECK_LIB(ncurses, use_default_colors, LDFLAGS="$LDFLAGS -lncurses"; CFLAGS="$CFLAGS -D_HAVE_NCURSES"; ncurses_support="yes"; echo "NO TRANSPARENCY SUPPORT in this ncurses lib", AC_CHECK_LIB(curses, initscr, LDFLAGS="$LDFLAGS -lcurses"; CFLAGS="$CFLAGS -D_HAVE_CURSES"; curses_support="yes"; echo "NO TRANSPARENCY SUPPORT in curses lib"))) -+PKG_CHECK_MODULES(ncurses,ncurses, -+ LIBS="$LIBS $ncurses_LIBS" -+ AC_DEFINE(HAVE_NCURSES, 1, [Define if we have ncurses]) -+ AC_DEFINE(HAVE_NCURSES_COLOR, 1, [We want color]) -+ color_support="yes"; ncurses_support="yes" -+ ,AC_MSG_ERROR([ncurses not found])) - - # disable color support on Solaris for now - if test ${OSTYPE} = "solaris" ; then diff --git a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch b/net-analyzer/slurm/files/slurm-0.3.3-theme.patch deleted file mode 100644 index 131554ee57f7..000000000000 --- a/net-analyzer/slurm/files/slurm-0.3.3-theme.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/theme.c -+++ b/theme.c -@@ -70,13 +70,7 @@ - if ((f = fopen(filename, "r")) == NULL) - { - bzero(&filename, BUFSIZ); --#ifdef __NetBSD__ -- snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name); --#elif __Debian__ - snprintf(filename, BUFSIZ, "/usr/share/slurm/%s.theme", name); --#else -- snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name); --#endif - if ((f = fopen(filename, "r")) == NULL) - error(ERR_FATAL, "cannot find theme '%s'", name); - } diff --git a/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch new file mode 100644 index 000000000000..a421c0aa1fa0 --- /dev/null +++ b/net-analyzer/slurm/files/slurm-0.4.3-fix-includes.patch @@ -0,0 +1,23 @@ +https://github.com/mattthias/slurm/pull/39 +--- a/os.h ++++ b/os.h +@@ -177,7 +177,7 @@ + #elif defined (__linux__) /* L I N U X */ + #include <stdio.h> + #include <sys/param.h> +-#include <sys/sysctl.h> ++#include <linux/sysctl.h> + #include <stdlib.h> + #include <stdarg.h> + #include <unistd.h> +@@ -195,8 +195,8 @@ + #include <netinet/in.h> + #include <net/if.h> + #include <arpa/inet.h> +-#include <net/ppp_defs.h> +-#include <net/if_ppp.h> ++#include <linux/ppp_defs.h> ++#include <linux/if_ppp.h> + #elif defined (__Solaris__) /* S O L A R I S */ + #include <stdio.h> + #define NO_CURSES_E 1 diff --git a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch index c1a1233f177b..ccb00fbeb094 100644 --- a/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch +++ b/net-analyzer/slurm/files/slurm-0.4.3-tinfo.patch @@ -1,3 +1,4 @@ +https://github.com/mattthias/slurm/pull/38 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml index 7312d8a52540..84a3b8b8bd3d 100644 --- a/net-analyzer/slurm/metadata.xml +++ b/net-analyzer/slurm/metadata.xml @@ -1,5 +1,5 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild deleted file mode 100644 index b8f2e06dde3e..000000000000 --- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus" -HOMEPAGE="http://www.wormulon.net/projects/slurm" -SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~sparc x86" - -RDEPEND="sys-libs/ncurses" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-overflow.patch \ - "${FILESDIR}"/${P}-theme.patch - eautoreconf -} - -src_install() { - dobin slurm - - insinto /usr/share/${PN} - doins themes/*.theme - - doman slurm.1 - dodoc AUTHORS ChangeLog FAQ KEYS README THANKS THEMES.txt TODO -} diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild index 95641beb1b22..5dd5798c2f8b 100644 --- a/net-analyzer/slurm/slurm-0.4.3.ebuild +++ b/net-analyzer/slurm/slurm-0.4.3.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils +EAPI=7 + +inherit cmake DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus" HOMEPAGE="https://github.com/mattthias/slurm" @@ -10,28 +11,21 @@ SRC_URI="https://github.com/mattthias/slurm/archive/upstream/${PN}.tar.gz -> ${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -RDEPEND=" - sys-libs/ncurses:* -" -DEPEND=" - ${RDEPEND} -" +KEYWORDS="amd64 ~ppc ~sparc x86" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-upstream" + PATCHES=( "${FILESDIR}"/${PN}-0.3.3-overflow.patch "${FILESDIR}"/${P}-tinfo.patch "${FILESDIR}"/${P}-version.patch -) -DOCS=( - AUTHORS - ChangeLog - FAQ - KEYS - README - THANKS - THEMES.txt - TODO + "${FILESDIR}"/${P}-fix-includes.patch ) -S=${WORKDIR}/${PN}-upstream +src_install() { + cmake_src_install + dodoc KEYS THEMES.txt +} diff --git a/net-analyzer/smokeping/Manifest b/net-analyzer/smokeping/Manifest deleted file mode 100644 index 518a916d5582..000000000000 --- a/net-analyzer/smokeping/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST smokeping-2.6.9.tar.gz 427185 BLAKE2B 3b626d852542f5e9e616ce88a8fd2fd773036822f10f548a1cec242f5d420ec67d940ee49c08da99f7e0815921251cb474b103c8c12c364f90651a4e74e9abf3 SHA512 ab3cec15fd9f90510f902da7ce5bac5915558cac198cc88f0ce193a53a0158c9055e28c8c6671cc6653ac42ab51346e1eb19e537f1ab5c234fd498c6b777499d -DIST smokeping-2.7.2.tar.gz 4614968 BLAKE2B 7cf9f4bd47f3a5419549b0a62fbaca664b70d73af0d57dc005d32030e1e86556f5100d00ed43743aa2a3dffa59bbe00129309b473fc261a7dcdc6225d80a8921 SHA512 e912cdf7ec9af871b9a4a90d787bae04feb21e40c1259bb835eb25b098e03023d7424e53d344ed459f8423260b0eb311f4dd12824195da9647554943685f4d07 -DIST smokeping-2.7.3.tar.gz 6614710 BLAKE2B 7fa10c19487427a3092a1e5591422cb37f66a6eab86b8b43eebbc8af441d5426b99f3c7b54040660f6f150ade99b1ea2555b4fcd6f80d8306d6f86ac9f95974e SHA512 d46d61539ffdd9cac41391aa813364260f90f84443c328b1c9233ab6ba3a0c157861694614e6c33e18b153f6a6afc0769c5fc7752b3ab52f114d984e53232830 diff --git a/net-analyzer/smokeping/files/79_smokeping.conf b/net-analyzer/smokeping/files/79_smokeping.conf deleted file mode 100644 index 1e9361ba501a..000000000000 --- a/net-analyzer/smokeping/files/79_smokeping.conf +++ /dev/null @@ -1,15 +0,0 @@ -### -### Setup the smokeping image cache and perl cgi script -### -<IfModule mod_alias.c> - Alias "/.simg/" "/var/lib/smokeping/.simg/" - <IfModule mod_perl.c> - <Directory "/var/lib/smokeping/.simg/"> - Options -Indexes MultiViews - AllowOverride None - Order deny,allow - Deny from all - Allow from 127.0.0.1 - </Directory> - </IfModule> -</IfModule> diff --git a/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch b/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch deleted file mode 100644 index 81a1e053b4f8..000000000000 --- a/net-analyzer/smokeping/files/smokeping-2.6.9-pod.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/Smokeping.pm -+++ b/lib/Smokeping.pm -@@ -2631,7 +2631,7 @@ - The base directory where SmokePing keeps the files related to the DYNAMIC function. - This directory must be writeable by the WWW server. It is also used for temporary - storage of slave polling results by the master in --L<the master/slave mode|smokeping_master_slave>. -+L<the masterE<sol>slave mode|smokeping_master_slave>. - - If this variable is not specified, the value of C<datadir> will be used instead. - DOC diff --git a/net-analyzer/smokeping/files/smokeping.conf b/net-analyzer/smokeping/files/smokeping.conf deleted file mode 100644 index 729726316fbd..000000000000 --- a/net-analyzer/smokeping/files/smokeping.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/smokeping 0755 root root diff --git a/net-analyzer/smokeping/files/smokeping.init.3 b/net-analyzer/smokeping/files/smokeping.init.3 deleted file mode 100644 index 2e5e35795b91..000000000000 --- a/net-analyzer/smokeping/files/smokeping.init.3 +++ /dev/null @@ -1,77 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="${opts} dump reload restore" - -depend() { - need net - use dns -} - -checkconfig() { - if [ ! -f "/etc/smokeping/config" ] ; then - eerror "You need /etc/smokeping/config to run smokeping!" - return 1 - fi -} - -start() { - checkconfig || return 1 - - if [ ! -d /run/smokeping/ ]; then - mkdir /run/smokeping/ - fi - chown smokeping:smokeping /run/smokeping/ - - ebegin "Starting smokeping" - LC_ALL=C \ - start-stop-daemon --start --name smokeping \ - --pidfile /run/smokeping/smokeping.pid \ - --exec /usr/bin/smokeping \ - --user smokeping:smokeping - eend $? -} - -stop() { - ebegin "Stopping smokeping" - start-stop-daemon --stop \ - --pidfile /run/smokeping/smokeping.pid - eend $? -} - -reload() { - ebegin "Reloading smokeping" - /usr/bin/smokeping --reload 1>/dev/null 2>&1 - eend $? -} - -dump() { - ebegin "Dumping smokeping rrd files to XML for backup or upgrade use" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before dumping files!" - return 1 - fi - for f in `find /var/lib/smokeping -name '*.rrd' -print` ; do - f_xml=`dirname $f`/`basename $f .rrd`.xml - rrdtool dump "$f" > "${f_xml}" - chown root:0 "${f_xml}" - done - eend $? -} - -restore() { - ebegin "Restoring smokeping rrd files from XML dump files" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before restoring files!" - return 1 - fi - for f in `find /var/lib/smokeping -name '*.xml' -print` ; do - f_rrd=`dirname $f`/`basename $f .xml`.rrd - mv -f "${f_rrd}" "${f_rrd}.bak" - chown root:0 "${f_rrd}.bak" - rrdtool restore "$f" "${f_rrd}" - chown smokeping:smokeping "${f_rrd}" - done - eend $? -} diff --git a/net-analyzer/smokeping/files/smokeping.init.5 b/net-analyzer/smokeping/files/smokeping.init.5 deleted file mode 100644 index 3c08c3fdc65e..000000000000 --- a/net-analyzer/smokeping/files/smokeping.init.5 +++ /dev/null @@ -1,56 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/smokeping" -command_args="--nodaemon" -command_background="true" -command_user="smokeping:smokeping" -pidfile="/run/${RC_SVCNAME}.pid" -extra_started_commands="dump reload restore" -required_files="/etc/smokeping/config" - -depend() { - need net - use dns -} - -start_pre() { - export LC_ALL=C -} - -reload() { - ebegin "Reloading smokeping" - "${command}" --reload 2>&1 >/dev/null - eend $? -} - -dump() { - ebegin "Dumping smokeping rrd files to XML for backup or upgrade use" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before dumping files!" - return 1 - fi - for f in $(find /var/lib/smokeping -name '*.rrd' -print) ; do - f_xml=$(dirname $f)/$(basename $f .rrd).xml - rrdtool dump "$f" > "${f_xml}" - chown root:0 "${f_xml}" - done - eend $? -} - -restore() { - ebegin "Restoring smokeping rrd files from XML dump files" - if service_started "${myservice}" ; then - eerror "You need to stop smokeping before restoring files!" - return 1 - fi - for f in $(find /var/lib/smokeping -name '*.xml' -print) ; do - f_rrd=$(dirname $f)/$(basename $f .xml).rrd - mv -f "${f_rrd}" "${f_rrd}.bak" - chown root:0 "${f_rrd}.bak" - rrdtool restore "$f" "${f_rrd}" - chown smokeping:smokeping "${f_rrd}" - done - eend $? -} diff --git a/net-analyzer/smokeping/files/smokeping.service b/net-analyzer/smokeping/files/smokeping.service deleted file mode 100644 index 2130aca23627..000000000000 --- a/net-analyzer/smokeping/files/smokeping.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Latency Logging and Graphing System -After=network.target - -[Service] -ExecStart=/usr/bin/smokeping --nodaemon -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml deleted file mode 100644 index e445720edf9f..000000000000 --- a/net-analyzer/smokeping/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<use> -<flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag> -<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag> -<flag name="telnet">Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag> -<flag name="ssh">Install ssh functionality</flag> -</use> -</pkgmetadata> diff --git a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild b/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild deleted file mode 100644 index 7a4eb1a16840..000000000000 --- a/net-analyzer/smokeping/smokeping-2.6.9-r1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils user systemd - -DESCRIPTION="A powerful latency measurement tool" -HOMEPAGE="https://oss.oetiker.ch/smokeping/" -SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -# dropping hppa and sparc because of way too may dependencies not having -# keywords in those architectures. -KEYWORDS="amd64 x86" - -# removing fcgi useflag as the configure script can't avoid it without patching -IUSE="apache2 curl dig echoping ipv6 ldap radius ssh telnet" - -DEPEND=" - !apache2? ( virtual/httpd-cgi ) - apache2? ( - >=www-apache/mod_perl-2.0.1 - www-apache/mod_fcgid - ) - curl? ( >=net-misc/curl-7.21.4 ) - dig? ( net-dns/bind-tools ) - echoping? ( >=net-analyzer/echoping-6.0.2 ) - ipv6? ( >=dev-perl/Socket6-0.20 ) - ldap? ( dev-perl/perl-ldap ) - radius? ( dev-perl/Authen-Radius ) - ssh? ( dev-perl/Net-OpenSSH ) - telnet? ( dev-perl/Net-Telnet ) - dev-perl/CGI-Fast - >=dev-lang/perl-5.8.8-r8 - >=dev-perl/SNMP_Session-1.13 - >=net-analyzer/fping-2.4_beta2-r2[suid] - >=net-analyzer/rrdtool-1.2[graph,perl] - dev-perl/CGI-Session - dev-perl/Config-Grammar - dev-perl/Digest-HMAC - dev-perl/FCGI - dev-perl/IO-Socket-SSL - dev-perl/Net-DNS - dev-perl/libwww-perl - virtual/perl-libnet -" - -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup smokeping - enewuser smokeping -1 -1 /var/lib/smokeping smokeping -} - -src_prepare() { - rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} # dev-perl/SNMP_Session - - epatch "${FILESDIR}"/${P}-pod.patch -} - -src_configure() { - econf \ - --sysconfdir=/etc/smokeping \ - --with-htdocs-dir=/var/www/localhost/smokeping -} - -src_compile() { - LC_ALL=C emake -} - -src_install() { - default - - newinitd "${FILESDIR}/${PN}.init.3" ${PN} - systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf - systemd_dounit "${FILESDIR}"/"${PN}".service - - mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" - mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" - mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" - mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" - mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" - - sed -i \ - -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ - -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ - -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ - -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \ - -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ - -e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \ - -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ - -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ - -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ - "${D}/etc/${PN}/config" || die - - sed -i \ - -e '/^<script/{s:cropper/:/cropper/:}' \ - "${D}/etc/${PN}/basepage.html" || die - - sed -i \ - -e 's/$FindBin::Bin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ - "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die - - sed -i \ - -e 's:etc/config.dist:/etc/smokeping/config:' \ - "${D}/usr/bin/tSmoke" || die - - sed -i \ - -e 's:/usr/etc/config:/etc/smokeping/config:' \ - "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die - - dodir /var/www/localhost/cgi-bin - mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ - "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" - - fperms 700 /etc/${PN}/smokeping_secrets - - if use apache2 ; then - insinto /etc/apache2/modules.d - doins "${FILESDIR}/79_${PN}.conf" - fi - - dodir /var/cache/smokeping - keepdir /var/cache/smokeping - - # Create the files in /var for rrd file storage - keepdir /var/lib/${PN}/.simg - fowners smokeping:smokeping /var/lib/${PN} - - if use apache2 ; then - fowners apache:apache /var/lib/${PN}/.simg - fowners -R apache:apache /var/www - else - fowners smokeping:smokeping /var/lib/${PN}/.simg - fi - - fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg -} - -pkg_postinst() { - chown smokeping:smokeping "${ROOT}/var/lib/${PN}" - chmod 755 "${ROOT}/var/lib/${PN}" -} diff --git a/net-analyzer/smokeping/smokeping-2.7.2.ebuild b/net-analyzer/smokeping/smokeping-2.7.2.ebuild deleted file mode 100644 index 973327b4df83..000000000000 --- a/net-analyzer/smokeping/smokeping-2.7.2.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils multilib user systemd - -DESCRIPTION="A powerful latency measurement tool" -HOMEPAGE="https://oss.oetiker.ch/smokeping/" -SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="apache2 curl dig echoping ipv6 radius" - -DEPEND=" - >=dev-lang/perl-5.8.8-r8 - >=dev-perl/SNMP_Session-1.13 - >=net-analyzer/fping-2.4_beta2-r2[suid] - >=net-analyzer/rrdtool-1.2[graph,perl] - dev-perl/CGI - dev-perl/CGI-Session - dev-perl/Config-Grammar - dev-perl/Digest-HMAC - dev-perl/FCGI - dev-perl/IO-Socket-SSL - dev-perl/IO-Tty - dev-perl/Net-DNS - dev-perl/Net-OpenSSH - dev-perl/Net-SNMP - dev-perl/Net-Telnet - dev-perl/libwww-perl - dev-perl/perl-ldap - virtual/perl-libnet - dev-perl/CGI-Fast - !apache2? ( virtual/httpd-cgi ) - apache2? ( - >=www-apache/mod_perl-2.0.1 - www-apache/mod_fcgid - ) - curl? ( >=net-misc/curl-7.21.4 ) - dig? ( net-dns/bind-tools ) - echoping? ( >=net-analyzer/echoping-6.0.2 ) - ipv6? ( >=dev-perl/Socket6-0.20 ) - radius? ( dev-perl/Authen-Radius ) -" - -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup smokeping - enewuser smokeping -1 -1 /var/lib/smokeping smokeping -} - -src_prepare() { - default - - sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die - sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die - rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session - echo ${PV} > VERSION - - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/smokeping \ - --with-htdocs-dir=/var/www/localhost/smokeping -} - -src_compile() { - LC_ALL=C emake -} - -src_install() { - dodir /usr/$(get_libdir) - default - - newinitd "${FILESDIR}"/${PN}.init.5 ${PN} - systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf - systemd_dounit "${FILESDIR}"/"${PN}".service - - mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" - mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" - mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" - mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" - mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" - - sed -i \ - -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ - -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ - -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ - -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \ - -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ - -e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \ - -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ - -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ - -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ - "${D}/etc/${PN}/config" || die - - sed -i \ - -e '/^<script/{s:cropper/:/cropper/:}' \ - "${D}/etc/${PN}/basepage.html" || die - - sed -i \ - -e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ - "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die - - sed -i \ - -e 's:etc/config.dist:/etc/smokeping/config:' \ - "${D}/usr/bin/tSmoke" || die - - sed -i \ - -e 's:/usr/etc/config:/etc/smokeping/config:' \ - "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die - - dodir /var/www/localhost/cgi-bin - mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ - "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" - - fperms 700 /etc/${PN}/smokeping_secrets - - if use apache2 ; then - insinto /etc/apache2/modules.d - doins "${FILESDIR}/79_${PN}.conf" - fi - - # Create the files in /var for rrd file storage - keepdir /var/lib/${PN}/.simg - fowners smokeping:smokeping /var/lib/${PN} - - if use apache2 ; then - fowners apache:apache /var/lib/${PN}/.simg - fowners -R apache:apache /var/www - else - fowners smokeping:smokeping /var/lib/${PN}/.simg - fi - - fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg -} - -pkg_postinst() { - chown smokeping:smokeping "${ROOT}/var/lib/${PN}" - chmod 755 "${ROOT}/var/lib/${PN}" -} diff --git a/net-analyzer/smokeping/smokeping-2.7.3.ebuild b/net-analyzer/smokeping/smokeping-2.7.3.ebuild deleted file mode 100644 index 9dd531b20e11..000000000000 --- a/net-analyzer/smokeping/smokeping-2.7.3.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools eutils multilib user systemd - -DESCRIPTION="A powerful latency measurement tool" -HOMEPAGE="https://oss.oetiker.ch/smokeping/" -SRC_URI="https://oss.oetiker.ch/smokeping/pub/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="apache2 curl dig echoping ipv6 radius" - -DEPEND=" - >=dev-lang/perl-5.8.8-r8 - >=dev-perl/SNMP_Session-1.13 - >=net-analyzer/fping-2.4_beta2-r2[suid] - >=net-analyzer/rrdtool-1.2[graph,perl] - dev-perl/CGI - dev-perl/CGI-Session - dev-perl/Config-Grammar - dev-perl/Digest-HMAC - dev-perl/FCGI - dev-perl/IO-Socket-SSL - dev-perl/IO-Tty - dev-perl/Net-DNS - dev-perl/Net-OpenSSH - dev-perl/Net-SNMP - dev-perl/Net-Telnet - dev-perl/libwww-perl - dev-perl/perl-ldap - virtual/perl-libnet - dev-perl/CGI-Fast - !apache2? ( virtual/httpd-cgi ) - apache2? ( - >=www-apache/mod_perl-2.0.1 - www-apache/mod_fcgid - ) - curl? ( >=net-misc/curl-7.21.4 ) - dig? ( net-dns/bind-tools ) - echoping? ( >=net-analyzer/echoping-6.0.2 ) - ipv6? ( >=dev-perl/Socket6-0.20 ) - radius? ( dev-perl/Authen-Radius ) -" - -RDEPEND="${DEPEND}" - -pkg_setup() { - enewgroup smokeping - enewuser smokeping -1 -1 /var/lib/smokeping smokeping -} - -src_prepare() { - default - - sed -i -e '/^SUBDIRS = / s|thirdparty||g' Makefile.am || die - sed -i -e '/^perllibdir = / s|= .*|= $(libdir)|g' lib/Makefile.am || die - rm -r lib/{BER.pm,SNMP_Session.pm,SNMP_util.pm} || die # dev-perl/SNMP_Session - echo ${PV} > VERSION - - eautoreconf -} - -src_configure() { - econf \ - --sysconfdir=/etc/smokeping \ - --with-htdocs-dir=/var/www/localhost/smokeping -} - -src_compile() { - LC_ALL=C emake -} - -src_install() { - dodir /usr/$(get_libdir) - default - - newinitd "${FILESDIR}"/${PN}.init.5 ${PN} - systemd_dotmpfilesd "${FILESDIR}"/"${PN}".conf - systemd_dounit "${FILESDIR}"/"${PN}".service - - mv "${D}/etc/smokeping/basepage.html.dist" "${D}/etc/smokeping/basepage.html" - mv "${D}/etc/smokeping/config.dist" "${D}/etc/smokeping/config" - mv "${D}/etc/smokeping/smokemail.dist" "${D}/etc/smokeping/smokemail" - mv "${D}/etc/smokeping/smokeping_secrets.dist" "${D}/etc/smokeping/smokeping_secrets" - mv "${D}/etc/smokeping/tmail.dist" "${D}/etc/smokeping/tmail" - - sed -i \ - -e '/^imgcache/{s:\(^imgcache[ \t]*=\).*:\1 /var/lib/smokeping/.simg:}' \ - -e '/^imgurl/{s:\(^imgurl[ \t]*=\).*:\1 ../.simg:}' \ - -e '/^datadir/{s:\(^datadir[ \t]*=\).*:\1 /var/lib/smokeping:}' \ - -e '/^piddir/{s:\(^piddir[ \t]*=\).*:\1 /run/smokeping:}' \ - -e '/^cgiurl/{s#\(^cgiurl[ \t]*=\).*#\1 http://some.place.xyz/perl/smokeping.pl#}' \ - -e '/^smokemail/{s:\(^smokemail[ \t]*=\).*:\1 /etc/smokeping/smokemail:}' \ - -e '/^tmail/{s:\(^tmail[ \t]*=\).*:\1 /etc/smokeping/tmail:}' \ - -e '/^secrets/{s:\(^secrets[ \t]*=\).*:\1 /etc/smokeping/smokeping_secrets:}' \ - -e '/^template/{s:\(^template[ \t]*=\).*:\1 /etc/smokeping/basepage.html:}' \ - "${D}/etc/${PN}/config" || die - - sed -i \ - -e '/^<script/{s:cropper/:/cropper/:}' \ - "${D}/etc/${PN}/basepage.html" || die - - sed -i \ - -e 's/$FindBin::RealBin\/..\/etc\/config/\/etc\/smokeping\/config/g' \ - "${D}/usr/bin/smokeping" "${D}/usr/bin/smokeping_cgi" || die - - sed -i \ - -e 's:etc/config.dist:/etc/smokeping/config:' \ - "${D}/usr/bin/tSmoke" || die - - sed -i \ - -e 's:/usr/etc/config:/etc/smokeping/config:' \ - "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" || die - - dodir /var/www/localhost/cgi-bin - mv "${D}/var/www/localhost/smokeping/smokeping.fcgi.dist" \ - "${D}/var/www/localhost/cgi-bin/smokeping.fcgi" - - fperms 700 /etc/${PN}/smokeping_secrets - - if use apache2 ; then - insinto /etc/apache2/modules.d - doins "${FILESDIR}/79_${PN}.conf" - fi - - # Create the files in /var for rrd file storage - keepdir /var/lib/${PN}/.simg - fowners smokeping:smokeping /var/lib/${PN} - - if use apache2 ; then - fowners apache:apache /var/lib/${PN}/.simg - fowners -R apache:apache /var/www - else - fowners smokeping:smokeping /var/lib/${PN}/.simg - fi - - fperms 775 /var/lib/${PN} /var/lib/${PN}/.simg -} - -pkg_postinst() { - chown smokeping:smokeping "${ROOT}/var/lib/${PN}" - chmod 755 "${ROOT}/var/lib/${PN}" -} diff --git a/net-analyzer/snallygaster/Manifest b/net-analyzer/snallygaster/Manifest new file mode 100644 index 000000000000..b772d52adb82 --- /dev/null +++ b/net-analyzer/snallygaster/Manifest @@ -0,0 +1 @@ +DIST snallygaster-0.0.12.tar.gz 25234 BLAKE2B 69082fe94fc65d78b99519511b6850d569401d326788448dffac2baca3e359e166b161e69b5169dc0772c4eba5e3cf70968ed75fe09efad7924869971a0869c8 SHA512 507b5bbaa8a013bbbb18b53778781e1e212e295f113ea91b1b73d5162f93d35be74780fa0cba7499d62f40c8cd27b4cdfd79526bd0ab07018090460ca937eb48 diff --git a/net-analyzer/snallygaster/metadata.xml b/net-analyzer/snallygaster/metadata.xml new file mode 100644 index 000000000000..f8aae7b5d9a4 --- /dev/null +++ b/net-analyzer/snallygaster/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer type="person"><email>hanno@gentoo.org</email></maintainer> +<upstream> +<remote-id type="github">hannob/snallygaster</remote-id> +<remote-id type="pypi">snallygaster</remote-id> +</upstream> +</pkgmetadata> diff --git a/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild new file mode 100644 index 000000000000..2e4e6ae2913c --- /dev/null +++ b/net-analyzer/snallygaster/snallygaster-0.0.12-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9,10,11} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Finds file leaks and other security problems on HTTP servers" +HOMEPAGE="https://github.com/hannob/snallygaster" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-python/dnspython + dev-python/urllib3 + dev-python/beautifulsoup4" +RDEPEND="${DEPEND}" +DOCS=( README.md TESTS.md ) + +# Only codingstyle and similar tests, require dependencies +# not packaged in Gentoo +RESTRICT="test" diff --git a/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild b/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild new file mode 100644 index 000000000000..d9c89cabbb3b --- /dev/null +++ b/net-analyzer/snallygaster/snallygaster-0.0.12-r2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9,10,11,12} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 pypi + +DESCRIPTION="Finds file leaks and other security problems on HTTP servers" +HOMEPAGE="https://github.com/hannob/snallygaster" + +LICENSE="CC0-1.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND="dev-python/dnspython + dev-python/urllib3 + dev-python/beautifulsoup4" +RDEPEND="${DEPEND}" +DOCS=( README.md TESTS.md ) + +# Only codingstyle and similar tests, require dependencies +# not packaged in Gentoo +RESTRICT="test" diff --git a/net-analyzer/sngrep/Manifest b/net-analyzer/sngrep/Manifest index d5c0aba6419b..f8a03b85593f 100644 --- a/net-analyzer/sngrep/Manifest +++ b/net-analyzer/sngrep/Manifest @@ -1 +1,2 @@ -DIST sngrep-1.4.6.tar.gz 235721 BLAKE2B e01f2a1d83b9147b99196f7ff2e5562552b16badc2ca634e63b2e2f5955a5d0328c9fcdb841f42a950899511a81fffd8eb64169758dc319875e3052d4359de93 SHA512 25c67e26158b140bded775b217f313ad5a6268684f03d0b9875ddd423d7548b50fa9c358346330d3873984f456aefa9401c2b0fdd136dd95061e34da6530bcc3 +DIST sngrep-1.6.0.tar.gz 248091 BLAKE2B a08c50d87d43f49f24494a85b8f4d72f24a649050ab696cabd087a39bd64532a9e7ed137ccaacecddce8ef22c960fc43f5372c9b13817eae26dd06b711363e3b SHA512 bca3192e1aacf4152f566925fd075dfd957cbe87017c8258303c8689f1221ea082f337866db45cb5ada0629f7cc4b66ce73b74a911d230c63d10fefa19aaebe3 +DIST sngrep-1.7.0.tar.gz 248947 BLAKE2B 39a5d9bc71df9fb5bd4abadadf3f8fc8a680dd06eb4a7f06bb597a70215854d0ee4b93b39cfff67e2b15b6fed4ffac2865741af31b21a7ba8a91f9c01c4c750a SHA512 ecf31d61643ecc9ba1a9fe7759ae8c2c65fcbf6886ed263def2993dd6900eb9aeaddce8ebbde71e1ec57fbdc11a388de05f7c13f4587714e3b3e33689cf591b0 diff --git a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch b/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch deleted file mode 100644 index f3829560264d..000000000000 --- a/net-analyzer/sngrep/files/sngrep-1.4.5-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -98,6 +98,10 @@ - ]) - ]) - -+AC_SEARCH_LIBS([keyname], [tinfo], [], [ -+ AC_MSG_ERROR([ You need to have ncurses panelw library installed to compile sngrep.]) -+]) -+ - #### - #### GnuTLS Support - #### diff --git a/net-analyzer/sngrep/metadata.xml b/net-analyzer/sngrep/metadata.xml index eeb043ad62b3..6891786f5ba3 100644 --- a/net-analyzer/sngrep/metadata.xml +++ b/net-analyzer/sngrep/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -</maintainer> -<use> -<flag name='eep'>Enable EEP packet send/receive support</flag> -<flag name='gnutls'>Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag> -<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> to parse captured TLS packets</flag> -</use> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + </maintainer> + <use> + <flag name="eep">Enable EEP packet send/receive support</flag> + <flag name="gnutls">Use <pkg>net-libs/gnutls</pkg> to parse captured TLS packets</flag> + </use> + <upstream> + <remote-id type="github">irontec/sngrep</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild b/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild deleted file mode 100644 index f11852bc421e..000000000000 --- a/net-analyzer/sngrep/sngrep-1.4.6-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Ncurses SIP Messages flow viewer" -HOMEPAGE="https://github.com/irontec/sngrep" -SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="eep gnutls ipv6 openssl pcre unicode" -REQUIRED_USE=" - gnutls? ( !openssl ) -" - -DEPEND=" - net-libs/libpcap - sys-libs/ncurses:0=[unicode?] - openssl? ( dev-libs/openssl:0= ) - gnutls? ( net-libs/gnutls ) -" -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-1.4.5-tinfo.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_enable eep) \ - $(use_enable ipv6) \ - $(use_enable unicode) \ - $(use_with gnutls) \ - $(use_with openssl) \ - $(use_with pcre) -} diff --git a/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild new file mode 100644 index 000000000000..89771013483f --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.6.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Ncurses SIP Messages flow viewer" +HOMEPAGE="https://github.com/irontec/sngrep" +SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="eep gnutls pcre ssl zlib" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses:=[unicode(+)] + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + pcre? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + --enable-unicode + --without-pcre + $(use_enable eep) + $(use_with pcre pcre2) + $(use_with ssl $(usex gnutls gnutls openssl)) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/sngrep/sngrep-1.7.0.ebuild b/net-analyzer/sngrep/sngrep-1.7.0.ebuild new file mode 100644 index 000000000000..4ec90e3677e8 --- /dev/null +++ b/net-analyzer/sngrep/sngrep-1.7.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Ncurses SIP Messages flow viewer" +HOMEPAGE="https://github.com/irontec/sngrep" +SRC_URI="https://github.com/irontec/sngrep/releases/download/v${PV}/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="eep gnutls pcre ssl zlib" + +DEPEND=" + net-libs/libpcap + sys-libs/ncurses:=[unicode(+)] + ssl? ( + !gnutls? ( dev-libs/openssl:= ) + gnutls? ( net-libs/gnutls:= ) + ) + pcre? ( dev-libs/libpcre2 ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + local myeconfargs=( + --enable-ipv6 + --enable-unicode + --without-pcre + $(use_enable eep) + $(use_with pcre pcre2) + $(use_with ssl $(usex gnutls gnutls openssl)) + $(use_with zlib) + ) + + econf "${myeconfargs[@]}" +} diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest index ff9839984826..1e4cd2eaede8 100644 --- a/net-analyzer/sniffit/Manifest +++ b/net-analyzer/sniffit/Manifest @@ -1,2 +1 @@ -DIST sniffit-0.4.0.tar.gz 59640 BLAKE2B 0cb335e7fc308155d0b3b3163695745ba1b0b71f212341238074d80782d99b12ed3f4991eed766161bfb65aeffe8bbf5e8e71a987b431fd414ac34ab0be416ab SHA512 a31c39859ab308f3ad4bf2f32a61d0f419ed6ad5d1668efc79e996c4a99557e511fc0b36c21e30316cfa82217fb10fd16d4e3473f5f1fdd70cdeba959d643aab -DIST sniffit.0.3.7.beta.tar.gz 212419 BLAKE2B 938f4eb775cfd0c604ec107573b8e4bba93fc60b40428ae3894b008fa4eaee3c9bf1ef29daf28caef4f22c4574faf2c6a8e3e8c32b7f84d643b8364ab31412ab SHA512 b32d1f17d589ee1d1afc7986640a2b9f451cdb26ee2d077db1eaec1bb77ed353bbbb6a79bd25f915b3a40b7a279f9fc7855706150ec3a24f8937a152ac91b8d1 +DIST sniffit-0.5.tar.gz 60074 BLAKE2B 55d2a65da3801cab4e612a8d1a1770c00abfa44555779ee29dc7358d9636e0b2a3f1e291bc64234588089967510bff99f5a9831d8acc01dacb080d7341081372 SHA512 cf6f4a1d396d47e0fa51cb527e8f64cc4f9af5f83121728ce6cbfb6a11509899e52a6c01f0dd20b0d3b92a567991390d9a616151c9496d4f2d764608ef3542bc diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch deleted file mode 100644 index c226b6f00d45..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-gentoo.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -10,13 +10,13 @@ - LIBS = @LIBS@ - DEFS = @DEFS@ - OS_OPT = @OS_OPT@ --OBJ_FLAG = -w -O2 -c --OBJ_OPT = -I./libpcap -L./libpcap --EXE_FLAG = -w -O2 -o sniffit --EXE_OPT = -I./libpcap -L./libpcap -lpcap -+OBJ_FLAG = $(CFLAGS) -c -+OBJ_OPT = -I/usr/include/pcap -L/usr/lib -+EXE_FLAG = $(CFLAGS) $(LDFLAGS) -o sniffit -+EXE_OPT = -I/usr/include/pcap -lpcap - EXE_OBJ = sn_packets.o sn_generation.o sn_interface.o sn_cfgfile.o \ - sn_logfile.o sn_resolv.o --DEP_FILES = sn_config.h ./libpcap/pcap.h sn_data.h sn_defines.h sn_plugins.h \ -+DEP_FILES = sn_config.h sn_data.h sn_defines.h sn_plugins.h \ - sn_analyse.c sn_conn_desc.c \ - sn_packets.o \ - sn_generation.o sn_interface.o sn_cfgfile.o sn_logfile.o \ -@@ -26,9 +26,7 @@ - @echo "Succesfull compilation..." - - sniffit: $(SNIFFIT) $(DEP_FILES) -- cd libpcap; make; cd .. - $(CC) $(EXE_FLAG) $(SNIFFIT) $(EXE_OBJ) $(EXE_OPT) $(LIBS) $(DEFS) $(OS_OPT) -- strip sniffit - - sn_cfgfile.o: sn_cfgfile.h sn_cfgfile.c sn_defines.h sn_structs.h sn_config.h - $(CC) $(OBJ_FLAG) sn_cfgfile.c $(OBJ_OPT) $(DEFS) diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch deleted file mode 100644 index ff84cd7d2259..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-misc.patch +++ /dev/null @@ -1,120 +0,0 @@ ---- a/sn_cfgfile.h -+++ b/sn_cfgfile.h -@@ -10,3 +10,4 @@ - void make_nr_dot (char *); - void interprete_line (char *); - void read_cfg_file (char *); -+char *strlower (char *); ---- a/sn_structs.h -+++ b/sn_structs.h -@@ -67,7 +67,7 @@ - struct snif_mask /* struct for mask */ - { - _32_bit source_ip, destination_ip; -- _32_bit short source_port, destination_port; -+ _32_bit source_port, destination_port; - }; - - /* (packet generation) */ ---- a/sn_analyse.c -+++ b/sn_analyse.c -@@ -1,6 +1,9 @@ - /* Analyse traffic for logging mode */ - /* - by: Brecht Claerhout */ - -+#include <stdlib.h> -+#include <string.h> -+ - const unsigned char *data; - memcpy(&tcphead,header,sizeof(struct TCP_header)); - ---- a/sn_cfgfile.c -+++ b/sn_cfgfile.c -@@ -3,6 +3,11 @@ - /* - improvements: Shudoh Kazuyuki */ - - #include <stdio.h> -+#include <stdlib.h> -+#include "sn_interface.h" -+#include <string.h> -+#include <ctype.h> -+#include <time.h> - #include <netdb.h> /* for getservbyname() */ - - #include "sn_config.h" ---- a/sn_conn_desc.c -+++ b/sn_conn_desc.c -@@ -1,6 +1,8 @@ - /* Connection description detection file */ - /* - by: Brecht Claerhout */ - -+#include <ctype.h> -+#include <string.h> - - /* Simple PORT BASED detection */ - ---- a/sn_generation.c -+++ b/sn_generation.c -@@ -6,12 +6,16 @@ - #ifdef INCLUDE_INTERFACE - #ifdef GENERATION - #include <unistd.h> -+#include <stdlib.h> -+#include <string.h> - #include <sys/socket.h> - #include <netinet/in.h> - #include "sn_curses.h" - #include "sn_defines.h" - #include "sn_structs.h" - #include "sn_generation.h" -+#include "sn_interface.h" /* input_field() */ -+#include "sn_packets.h" /* in_cksum() */ - - extern volatile int screen_busy; - ---- a/sniffit.0.3.7.c -+++ b/sniffit.0.3.7.c -@@ -4,6 +4,9 @@ - #include "sn_config.h" /* Config header file */ - - #include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - #include <signal.h> - #include <stdio.h> - #include <fcntl.h> ---- a/sn_interface.c -+++ b/sn_interface.c -@@ -6,6 +6,9 @@ - #ifdef INCLUDE_INTERFACE - #include <signal.h> - #include <unistd.h> -+#include <stdlib.h> -+#include <string.h> -+#include <ctype.h> - #include <sys/ipc.h> - #include <sys/shm.h> - #include "sn_curses.h" ---- a/sn_logfile.c -+++ b/sn_logfile.c -@@ -4,6 +4,9 @@ - #include "sn_config.h" - - #include <stdio.h> -+#include <stdlib.h> /* exit() */ -+#include <string.h> /* strcpy() */ -+#include <time.h> /* time() ctime() */ - #include <sys/stat.h> - #include <sys/time.h> - #include "sn_defines.h" ---- a/sn_packets.c -+++ b/sn_packets.c -@@ -5,6 +5,7 @@ - #include "sn_defines.h" - #include "sn_structs.h" - #include <netinet/in.h> -+#include <string.h> /* memcpy() strcpy() */ - - extern int PROTO_HEAD; - extern char NO_CHKSUM; diff --git a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch b/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch deleted file mode 100644 index b82835049687..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.3.7-tinfo.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -5,30 +5,15 @@ - - AC_INIT(sniffit.h) - --dnl Config of libpcap --AC_CONFIG_SUBDIRS(libpcap) -- - dnl Check the C compiler - AC_PROG_CC - - dnl Check NCURSES availability --NCURSES_PATH=/usr/include:/usr/include/ncurses:/usr/include/curses:/usr/local/include:/usr/local/include/ncurses:/usr/local/include/curses:./:./ncurses.h --ncurses_warn=0 --AC_CHECK_LIB(ncurses,main,,ncurses_warn=1) -- --AC_PATH_PROGS(NCURSES_LOCATION,ncurses.h,no,$NCURSES_PATH) --if test "$NCURSES_LOCATION" != no; then -- echo "#include \"$NCURSES_LOCATION\"" >sn_curses.h -- AC_DEFINE(HAVE_NCURSES_H,1) --else -- ncurses_warn=1 --fi -- --dnl Print warning for interactive mode --if test $ncurses_warn -ne 0; then -- AC_MSG_WARN(Interactive mode (-i/-I) will NOT be supported.!) -- AC_MSG_WARN(Install ncurses!) --fi -+PKG_CHECK_MODULES(ncurses,ncurses,main, -+ LIBS="$LIBS $ncurses_LIBS" -+ echo "#include <ncurses.h>" > sn_curses.h -+ AC_DEFINE(HAVE_NCURSES_H), -+ AC_MSG_ERROR([ncurses not found])) - - dnl Check Shared Memory support - AC_CHECK_FUNCS(shmget) diff --git a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch b/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch deleted file mode 100644 index 6a576acf1d2b..000000000000 --- a/net-analyzer/sniffit/files/sniffit-0.4.0-fno-common.patch +++ /dev/null @@ -1,181 +0,0 @@ ---- a/src/sn_data.h -+++ b/src/sn_data.h -@@ -101,7 +101,7 @@ - char IP[256]; - unsigned long SNIFLEN; /* bytes we need to snif */ - short DEST_PORT, SRC_PORT; /* destination port */ --char non_printable, *logging_device; -+char non_printable; - - /**** Global data (packets) *************************************************/ - int PROTO_HEAD; /* Base Protocol head length (ethernet, PPP ,....) */ -@@ -147,43 +147,6 @@ - /**** Global data (plugins) *************************************************/ - char Plugin_Active[10]; - --/**** Global data (interactive) *********************************************/ --#ifdef INCLUDE_INTERFACE -- --/**** shared memory pointers ************************************************/ --char *SHARED, *connection_data, *timing, *running_connections, -- *logged_connections; --int *LISTlength, *DATAlength, memory_id; --unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; --unsigned int *IP_nr_of_packets; --unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; --int *DESC_LEN; -- --/**** data structures *******************************************************/ --struct snif_mask *mask; --struct shared_logged_conn *log_conn; --FILE *log_dev_stream; --struct stat log_dev_stat; -- --volatile int LOGGING=0, screen_busy=0; --char PACKET_INFO; --int POINTpos=0, LISTpos=0; --unsigned char COLOR_AVAIL=0; -- --/**** screen **************************************************************/ --int MASK_WINDOW_ROWS, MASK_WINDOW_COLS; --int MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; --int INFO_WINDOW_ROWS, INFO_WINDOW_COLS; --int DATA_WINDOW_ROWS, DATA_WINDOW_COLS; --int INFO_WINDOW_X, INFO_WINDOW_Y; --int MASK_WINDOW_X, MASK_WINDOW_Y; --int DATA_WINDOW_X, DATA_WINDOW_Y; -- --WINDOW *menu_window; --struct box_window data_box, main_box, mask_box, packets_box; --int Pid=0; --#endif -- - /* DEBUG section */ - #ifdef DEBUG - FILE *debug_dev; ---- a/src/sn_global.h -+++ b/src/sn_global.h -@@ -4,7 +4,6 @@ - /* currently some option data */ - - char SNIFMODE, DUMPMODE, PROTOCOLS, ASC, WILDCARD, CFG_FILE, NO_CHKSUM; --char INTERACTIVE_EXTEND; - int LOGPARAM; - /* All option shit */ - ---- a/src/sn_interface.c -+++ b/src/sn_interface.c -@@ -18,37 +18,37 @@ - #include "sn_generation.h" - #include "sn_resolv.h" - --/*** extern stuff ********/ --extern char *SHARED, *connection_data, *timing, *running_connections, -+/*** global stuff ********/ -+char *SHARED, *connection_data, *timing, *running_connections, - *logged_connections; --extern int *LISTlength, *DATAlength, memory_id; --extern unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; --extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; --extern int *DESC_LEN; /* For the connection desciption */ -- --extern char INTERACTIVE_EXTEND; -- --extern struct snif_mask *mask; --extern struct shared_logged_conn *log_conn; --extern FILE *log_dev_stream; --extern struct stat log_dev_stat; -- --extern volatile int LOGGING, screen_busy; --extern char PACKET_INFO; --extern int POINTpos, LISTpos; --extern unsigned char COLOR_AVAIL; -- --extern WINDOW *menu_window; --extern struct box_window data_box, main_box, mask_box, packets_box; --extern int Pid; --extern char *logging_device; -+int *LISTlength, *DATAlength, memory_id; -+unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; unsigned int *IP_nr_of_packets; -+unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; -+int *DESC_LEN; /* For the connection desciption */ -+ -+char INTERACTIVE_EXTEND; -+ -+struct snif_mask *mask; -+struct shared_logged_conn *log_conn; -+FILE *log_dev_stream; -+struct stat log_dev_stat; -+ -+volatile int LOGGING, screen_busy; -+char PACKET_INFO; -+int POINTpos, LISTpos; -+unsigned char COLOR_AVAIL; -+ -+WINDOW *menu_window; -+struct box_window data_box, main_box, mask_box, packets_box; -+int Pid; -+char *logging_device; - - - /*** Screen Parameters ***/ --extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; --extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; --extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; --extern int DATA_WINDOW_X, DATA_WINDOW_Y; -+int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; -+int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; -+int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; -+int DATA_WINDOW_X, DATA_WINDOW_Y; - - - /*** Sreen operations ***/ ---- a/src/sn_interface.h -+++ b/src/sn_interface.h -@@ -1,9 +1,46 @@ - /* Sniffit Data File */ - -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <unistd.h> - #include "pcap.h" - - typedef void (*sig_hand)(int ); /* sighandler_t gave errors, weird */ - -+/*** global stuff ********/ -+extern unsigned int *IP_nr_of_packets; -+extern char *SHARED, *connection_data, *timing, *running_connections, -+ *logged_connections; -+extern int *LISTlength, *DATAlength, memory_id; -+extern unsigned int *TCP_nr_of_packets, *ICMP_nr_of_packets, *UDP_nr_of_packets; -+extern unsigned int *IP_nr_of_packets; -+extern unsigned long *TCP_bytes_in_packets, *UDP_bytes_in_packets; -+extern int *DESC_LEN; /* For the connection desciption */ -+ -+extern char INTERACTIVE_EXTEND; -+ -+extern struct snif_mask *mask; -+extern struct shared_logged_conn *log_conn; -+extern FILE *log_dev_stream; -+extern struct stat log_dev_stat; -+ -+extern volatile int LOGGING, screen_busy; -+extern char PACKET_INFO; -+extern int POINTpos, LISTpos; -+extern unsigned char COLOR_AVAIL; -+ -+extern WINDOW *menu_window; -+extern struct box_window data_box, main_box, mask_box, packets_box; -+extern int Pid; -+extern char *logging_device; -+ -+ -+/*** Screen Parameters ***/ -+extern int MASK_WINDOW_ROWS, MASK_WINDOW_COLS, MAIN_WINDOW_ROWS, MAIN_WINDOW_COLS; -+extern int INFO_WINDOW_ROWS, INFO_WINDOW_COLS, DATA_WINDOW_ROWS, DATA_WINDOW_COLS; -+extern int INFO_WINDOW_X, INFO_WINDOW_Y, MASK_WINDOW_X, MASK_WINDOW_Y; -+extern int DATA_WINDOW_X, DATA_WINDOW_Y; -+ - int add_itemlist(char *, char *, char *); - void child_exit (void); - void clear_shared_mem(char); diff --git a/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch new file mode 100644 index 000000000000..e6ee580d6e33 --- /dev/null +++ b/net-analyzer/sniffit/files/sniffit-0.5.0-implicit-func-decl.patch @@ -0,0 +1,50 @@ +https://github.com/resurrecting-open-source-projects/sniffit/pull/3 + +From a05340968343d9f61f57506ed00bff0a62d3f38e Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 28 Jul 2022 12:14:44 +0100 +Subject: [PATCH] Fix -Wimplicit-function-declaration + +--- a/src/sn_cfgfile.c ++++ b/src/sn_cfgfile.c +@@ -2,6 +2,7 @@ + /* - by : Brecht Claerhout */ + /* - improvements: Shudoh Kazuyuki */ + ++#include <ctype.h> + #include <stdlib.h> + #include <stdio.h> + #include <string.h> +--- a/src/sn_generation.c ++++ b/src/sn_generation.c +@@ -13,7 +13,9 @@ + #include "sn_curses.h" + #include "sn_defines.h" + #include "sn_structs.h" ++#include "sn_packets.h" + #include "sn_generation.h" ++#include "sn_interface.h" + + extern volatile int screen_busy; + +--- a/src/sn_interface.c ++++ b/src/sn_interface.c +@@ -4,6 +4,7 @@ + #include "sn_config.h" + + #ifdef INCLUDE_INTERFACE ++#include <ctype.h> + #include <signal.h> + #include <termios.h> + #include <stdlib.h> +--- a/src/sniffit.c ++++ b/src/sniffit.c +@@ -3,6 +3,7 @@ + + #include "sn_config.h" /* Config header file */ + ++#include <ctype.h> + #include <unistd.h> + #include <signal.h> + #include <stdlib.h> + diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml index 74c2baebb4ec..b1b6918e47b0 100644 --- a/net-analyzer/sniffit/metadata.xml +++ b/net-analyzer/sniffit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> +<upstream> + <remote-id type="github">resurrecting-open-source-projects/sniffit</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild deleted file mode 100644 index 404ae9f3cbc8..000000000000 --- a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils toolchain-funcs - -MY_P="${P/-/.}.beta" -S="${WORKDIR}/${MY_P}" -DESCRIPTION="Interactive Packet Sniffer" -SRC_URI="http://reptile.rug.ac.be/~coder/${PN}/files/${MY_P}.tar.gz" -HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html" - -RDEPEND=" - net-libs/libpcap - >=sys-libs/ncurses-5.2 -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 ppc sparc x86" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-misc.patch \ - "${FILESDIR}"/${P}-tinfo.patch - eautoreconf - tc-export CC -} - -src_install () { - dosbin sniffit - - doman sniffit.5 sniffit.8 - dodoc README* PLUGIN-HOWTO BETA* HISTORY -} diff --git a/net-analyzer/sniffit/sniffit-0.4.0.ebuild b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild index 6761ff0d80e0..1247440f794f 100644 --- a/net-analyzer/sniffit/sniffit-0.4.0.ebuild +++ b/net-analyzer/sniffit/sniffit-0.5-r1.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools DESCRIPTION="Interactive Packet Sniffer" HOMEPAGE="https://github.com/resurrecting-open-source-projects/sniffit" SRC_URI="https://github.com/resurrecting-open-source-projects/sniffit/archive/${P}.tar.gz" -SLOT="0" +S="${WORKDIR}"/${PN}-${P} + LICENSE="BSD" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" RDEPEND=" net-libs/libpcap >=sys-libs/ncurses-5.2 " -DEPEND=" - ${RDEPEND} -" +DEPEND="${RDEPEND}" + PATCHES=( - "${FILESDIR}"/${PN}-0.4.0-fno-common.patch "${FILESDIR}"/${PN}-0.4.0-tinfo.patch + "${FILESDIR}"/${PN}-0.5.0-implicit-func-decl.patch ) -S=${WORKDIR}/${PN}-${P} src_prepare() { default diff --git a/net-analyzer/snmpclitools/Manifest b/net-analyzer/snmpclitools/Manifest new file mode 100644 index 000000000000..b21a3514efb0 --- /dev/null +++ b/net-analyzer/snmpclitools/Manifest @@ -0,0 +1 @@ +DIST snmpclitools-0.6.4.tar.gz 50853 BLAKE2B 23b28395c1b4d376e4b39f8ebb6d9acf8329da8c9bd6403d0670236ed89a783c0145ceb3ed31a653055bc6fbde785f911e6eeb30f32a587b80878b26ea2a8ba1 SHA512 42c0905f65bc855f7f0089ee7e944543e29ca0ca5a8d7185f5fa877f9c97cae1f1952477e85c614db9785deabad1770f1a046c4e6e98a7832097581f8e14748c diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/snmpclitools/metadata.xml index 95148c0af8a3..1584f1bcd08d 100644 --- a/net-analyzer/neti/metadata.xml +++ b/net-analyzer/snmpclitools/metadata.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> + <stabilize-allarches/> <upstream> - <remote-id type="sourceforge">neti</remote-id> + <remote-id type="github">etingof/snmpclitools</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild new file mode 100644 index 000000000000..190b3e6f2f15 --- /dev/null +++ b/net-analyzer/snmpclitools/snmpclitools-0.6.4-r1.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) +inherit distutils-r1 + +DESCRIPTION="Pure-Python SNMP management tools, formerly pysnmp-apps" +HOMEPAGE="https://github.com/etingof/snmpclitools" +SRC_URI="https://github.com/etingof/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND="!dev-python/pysnmp-apps + >=dev-python/pysnmp-4.2.2[${PYTHON_USEDEP}] + dev-python/pysnmp-mibs[${PYTHON_USEDEP}]" diff --git a/net-analyzer/snmptt/Manifest b/net-analyzer/snmptt/Manifest index d8088b076d33..5e868c48ef06 100644 --- a/net-analyzer/snmptt/Manifest +++ b/net-analyzer/snmptt/Manifest @@ -1 +1 @@ -DIST snmptt_1.4.tgz 148504 BLAKE2B b49e51d0ec207f1250536010e6475649eeca1a89f85bf31e1a7545cae2fa6ac66951916932863543336bb63a8519f35e9c54e7c67bcd14a43ed7ce6d8d63876b SHA512 200ebe565766c15f85b9b9cbc178baeef740663efc951af4c790c4b28d27398c14a95c4b38306ec3503cefe9b86634d5f24ec5f2482694f07789e9025ea39a80 +DIST snmptt_1.4.2.tgz 142697 BLAKE2B 5603197adb919a8e34d07d6981f35ff60db5674f254ce3ac4e9e12f7aad31b4ba85ddfa5b785df0c759bd97929a24e9f694b9511d060fc94d60fe2e70764c662 SHA512 b8782aa5789227253c1b65c98771de7eba319f1f29b56224415f89d0c687515cd099f0ba7d0e304d43a9d054fa66335fe09d99545f50415745ac86b8b56a2b9d diff --git a/net-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml index d898065740e6..fce724ab2251 100644 --- a/net-analyzer/snmptt/metadata.xml +++ b/net-analyzer/snmptt/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>SNMP Trap Translator</longdescription> <upstream> <remote-id type="sourceforge">snmptt</remote-id> </upstream> diff --git a/net-analyzer/snmptt/snmptt-1.4.2.ebuild b/net-analyzer/snmptt/snmptt-1.4.2.ebuild new file mode 100644 index 000000000000..075a33df8231 --- /dev/null +++ b/net-analyzer/snmptt/snmptt-1.4.2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="SNMP Trap Translator" +SRC_URI="https://downloads.sourceforge.net/snmptt/${P/-/_}.tgz" +HOMEPAGE="http://www.snmptt.org/" +LICENSE="GPL-2" + +KEYWORDS="~amd64 ~ppc x86" +SLOT="0" + +S="${WORKDIR}/${P/-/_}" + +RDEPEND=" + dev-lang/perl + dev-perl/Config-IniFiles + net-analyzer/net-snmp +" + +src_prepare() { + default + + # bug 105354, daemonize by default + sed -i \ + -e 's:mode = standalone:mode = daemon:g' \ + -e '/pid_file/s:/var/run:/run:g' \ + snmptt.ini || die + + echo "traphandle default /usr/sbin/snmptt" > examples/snmptrapd.conf.sample || die +} + +src_install() { + into /usr + dosbin \ + snmptt \ + snmptt-net-snmp-test \ + snmpttconvert \ + snmpttconvertmib \ + snmptthandler \ + snmptthandler-embedded + + insinto /etc/snmp + doins \ + examples/snmptrapd.conf.sample \ + examples/snmptt.conf.generic \ + snmptt.ini + newins examples/snmptt.conf.generic snmptt.conf + + dodoc ChangeLog README sample-trap + + docinto html + dodoc docs/* + + newinitd "${FILESDIR}"/snmptt.initd-r1 snmptt + + insinto /etc/logrotate.d + newins snmptt.logrotate snmptt +} diff --git a/net-analyzer/snmptt/snmptt-1.4.ebuild b/net-analyzer/snmptt/snmptt-1.4.ebuild deleted file mode 100644 index ed70054e6dc9..000000000000 --- a/net-analyzer/snmptt/snmptt-1.4.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -MY_P="${P/-/_}" - -DESCRIPTION="SNMP Trap Translator" -SRC_URI="mirror://sourceforge/snmptt/${MY_P}.tgz" -HOMEPAGE="http://www.snmptt.org/" -LICENSE="GPL-2" - -KEYWORDS="~amd64 ~ppc x86" -SLOT="0" -IUSE="mysql postgres" - -S="${WORKDIR}/${MY_P}" - -RDEPEND=" - dev-lang/perl - dev-perl/Config-IniFiles - net-analyzer/net-snmp - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) -" - -src_prepare() { - # bug 105354, daemonize this thing - sed -i \ - -e 's:mode = standalone:mode = daemon:g' \ - -e '/pid_file/s:/var/run:/run:g' \ - snmptt.ini || die - - echo "traphandle default /usr/sbin/snmptt" >examples/snmptrapd.conf.sample -} - -src_install() { - into /usr - dosbin snmptt snmptthandler snmptt-net-snmp-test snmpttconvert \ - snmpttconvertmib - - insinto /etc/snmp - doins snmptt.ini examples/snmptt.conf.generic \ - examples/snmptrapd.conf.sample - newins examples/snmptt.conf.generic snmptt.conf - - dodoc BUGS ChangeLog README sample-trap - dohtml docs/faqs.html docs/index.html docs/layout1.css docs/snmptt.html \ - docs/snmpttconvert.html docs/snmpttconvertmib.html - - newinitd "${FILESDIR}"/snmptt.initd-r1 snmptt -} diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest index 5265d0606021..d74b593f0aeb 100644 --- a/net-analyzer/snort/Manifest +++ b/net-analyzer/snort/Manifest @@ -1,4 +1 @@ -DIST snort-2.9.12.tar.gz 6456877 BLAKE2B af5584fe01caf9af2f2188e1362bd927a884354ddcb3026af514dddc1264b557691e1644d3c24e85c3b5b5f515dd9fccdd8d38ebc7c28d2f384fb822e27d8bb8 SHA512 6f759b321ca5496abf27c9e4f4fa003cd5167f8c8a160bf5f0b1aee1a93aa8d27de89b84bdf993a0bfb3a93c6315cb2bdbdc3fdb3b09b8d4d1d3c22b69c6783f -DIST snort-2.9.15.1.tar.gz 6618999 BLAKE2B d9f661b036afa2130d406f8bcfa8d33fca482983e0e4785218e08899104c9069809b089631940109ee31e8d197783d994c58417d94f4b5282702e51466f828fa SHA512 9940f5bcdcf04823f9cb5c3f8efda72f98f6a47bce9f40399dec9ec41d23a386c7f7e44861d82368de31546123b920f9fc617197bbf9c5e750724bf8b9e19590 -DIST snort-2.9.15.tar.gz 6704763 BLAKE2B adef13e3368dbbb9e023d79ec4f75c9652af8d26642b83f1f413e39faf966281b09713854e3a8aa385647b375102a667b10ee96d6f1cebb2f92c9fc7f29a2eb5 SHA512 21830dc4c9ce7b5bc96defa800f78de6ad24c1ab96dbeab0d79a7bf4298a81d6bdb4be8fd3bbec3b28b33aa7bb27cdc48a2a00b33c494f68d1649bc609928eea -DIST snort-2.9.8.3.tar.gz 6244304 BLAKE2B cb77c80dde0b5b32ba0fe36cd07e1f6f465127e4be207ba6cd3b7c7dff75f4537c86c6a88d744a924b99d0b4ac864add2c9111c63e51dc4c7dc23f8d19a6c792 SHA512 2f3dfe46e14a5106a02ca60b2d334549f4924ff916de0804b2b7792cdd31e104fbb454b4b932855b5f25a861698db0f8988844782b12b0e5fa132d88d4a7a687 +DIST snort-2.9.20.tar.gz 7009894 BLAKE2B 0fa1426dce94e2800550691bb433c01371c1688616a528c27803f75837cb5eb430246ee113b2a5a1e374b14b6fd5a57140ce54fe13fb13df94276fbd19aa0a15 SHA512 a9ca37e814baeb978a6db06c3c62256b9e98fdd9fa18ce881a2ce854c0c9a5d92476c3384bec9017b8a67e5d78c6f31ca19956a914f54b817343a159a2a7fced diff --git a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch b/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch deleted file mode 100644 index 9fe39933ddfe..000000000000 --- a/net-analyzer/snort/files/snort-2.9.15.1-fno-common.patch +++ /dev/null @@ -1,106 +0,0 @@ ---- a/src/preprocessors/Stream6/stream_paf.h -+++ b/src/preprocessors/Stream6/stream_paf.h -@@ -68,12 +68,14 @@ - uint16_t s5_paf_port_registration_all (void* pv, uint16_t port, bool c2s, bool flush); - uint16_t s5_paf_service_registration (void* pv, uint16_t service, bool c2s, bool flush); - --enum FlushMode -+typedef enum - { - FLUSH_MODE_NORMAL = 0, - FLUSH_MODE_PRE_DISCARD, - FLUSH_MODE_DISCARD --}FlushMode; -+} FlushMode_t; -+ -+extern FlushMode_t FlushMode; - - typedef struct { - void* user[MAX_PAF_USER]; // arbitrary user data ---- a/src/sfutil/util_jsnorm.h -+++ b/src/sfutil/util_jsnorm.h -@@ -42,5 +42,7 @@ - uint16_t alerts; - }JSState; - -+extern int hex_lookup[256]; -+ - int JSNormalizeDecode(char *, uint16_t , char *, uint16_t destlen, char **, int *, JSState *, uint8_t *); - void InitJSNormLookupTable(void); ---- a/src/preprocessors/spp_session.h -+++ b/src/preprocessors/spp_session.h -@@ -28,6 +28,8 @@ - #include "decode.h" - #include "session_common.h" - -+extern PreprocStats sessionPerfStats; -+ - /* list of function prototypes for this preprocessor */ - void SetupSessionManager(void); - void SessionReload(struct _SessionCache* lws_cache, uint32_t max_sessions, ---- a/src/preprocessors/spp_httpinspect.c -+++ b/src/preprocessors/spp_httpinspect.c -@@ -161,7 +161,6 @@ - MemPool *http_mempool = NULL; - MemPool *mime_decode_mempool = NULL; - MemPool *mime_log_mempool = NULL; --int hex_lookup[256]; - int valid_lookup[256]; - - char** xffFields = NULL; ---- a/src/detection-plugins/sp_session.c -+++ b/src/detection-plugins/sp_session.c -@@ -80,7 +80,7 @@ - #include "snort.h" - #include "profiler.h" - #ifdef PERF_PROFILING --PreprocStats sessionPerfStats; -+PreprocStats sp_sessionPerfStats; - extern PreprocStats ruleOTNEvalPerfStats; - #endif - -@@ -149,7 +149,7 @@ - /* map the keyword to an initialization/processing function */ - RegisterRuleOption("session", SessionInit, NULL, OPT_TYPE_LOGGING, NULL); - #ifdef PERF_PROFILING -- RegisterPreprocessorProfile("session", &sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); -+ RegisterPreprocessorProfile("session", &sp_sessionPerfStats, 3, &ruleOTNEvalPerfStats, NULL); - #endif - DEBUG_WRAP(DebugMessage(DEBUG_PLUGIN, "Plugin: Session Setup\n");); - } -@@ -287,7 +287,7 @@ - FILE *session; /* session file ptr */ - PROFILE_VARS; - -- PREPROC_PROFILE_START(sessionPerfStats); -+ PREPROC_PROFILE_START(sp_sessionPerfStats); - - /* if there's data in this packet */ - if(p != NULL) -@@ -298,7 +298,7 @@ - - if(session == NULL) - { -- PREPROC_PROFILE_END(sessionPerfStats); -+ PREPROC_PROFILE_END(sp_sessionPerfStats); - return DETECTION_OPTION_MATCH; - } - -@@ -308,7 +308,7 @@ - } - } - -- PREPROC_PROFILE_END(sessionPerfStats); -+ PREPROC_PROFILE_END(sp_sessionPerfStats); - return DETECTION_OPTION_MATCH; - } - ---- a/src/detection-plugins/sp_session.h -+++ b/src/detection-plugins/sp_session.h -@@ -29,5 +29,6 @@ - void SetupSession(void); - uint32_t SessionHash(void *d); - int SessionCompare(void *l, void *r); -+extern PreprocStats sp_sessionPerfStats; - - #endif /* __SP_SESSION_H__ */ diff --git a/net-analyzer/snort/files/snort_at.service b/net-analyzer/snort/files/snort_at.service index f764015c2192..40fb0cb1a1d5 100644 --- a/net-analyzer/snort/files/snort_at.service +++ b/net-analyzer/snort/files/snort_at.service @@ -3,7 +3,7 @@ Description=Snort IDS system listening on '%I' [Service] Type=simple -ExecStartPre=/usr/sbin/ip link set up dev %I +ExecStartPre=/bin/ip link set up dev %I ExecStart=/usr/bin/snort --daq-dir /usr/lib/daq/ -A fast -b -p -u snort -g snort -c /etc/snort/snort.conf -i %I ExecReload=/bin/kill -HUP $MAINPID diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml index be9d2aed013e..39900f601479 100644 --- a/net-analyzer/snort/metadata.xml +++ b/net-analyzer/snort/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>patrick@gentoo.org</email> @@ -14,7 +14,7 @@ system (IDS/IPS) developed by Sourcefire. Combining the benefits of signature, protocol, and anomaly-based inspection, Snort is the most widely deployed IDS/IPS technology worldwide. With millions of downloads - and approximately 300,000 registered users, Snort has become the de facto + and approximately 300,000 registered users, Snort has become the de facto standard for IPS. </longdescription> <upstream> @@ -23,8 +23,8 @@ <name>Snort Team</name> </maintainer> <changelog>http://www.snort.org/snort-downloads</changelog> - <doc>http://www.snort.org/docs</doc> - <bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to> + <doc>https://snort.org/documents#OfficialDocumentation</doc> + <bugs-to>https://snort.org/community#bugs</bugs-to> </upstream> <use> <flag name="control-socket"> @@ -34,8 +34,8 @@ Enables extended file inspection capabilities. </flag> <flag name="gre"> - Enable support for inspecting and processing Generic Routing - Encapsulation (GRE) packet headders. Only needed if you are + Enable support for inspecting and processing Generic Routing + Encapsulation (GRE) packet headers. Only needed if you are monitoring GRE tunnels. </flag> <flag name="high-availability"> @@ -50,7 +50,7 @@ </flag> <flag name="linux-smp-stats"> Enable accurate statistics reporting through /proc on systems with - multipule processors. + multiple processors. </flag> <flag name="non-ether-decoders"> Enable decoding of non-ethernet protocols such as TokenRing, FDDI, @@ -62,12 +62,12 @@ and implement application detection. Requires <pkg>dev-lang/luajit</pkg>. </flag> <flag name="perfprofiling"> - Enables support for preprocessor and rule performance profiling + Enables support for preprocessor and rule performance profiling using the perfmonitor preprocessor. </flag> <flag name="ppm"> Enables support for setting per rule or per packet latency limits. - Helps protect against introducing network latency with inline + Helps protect against introducing network latency with inline deployments. </flag> <flag name="react"> @@ -79,24 +79,24 @@ (Only available on Linux systems) </flag> <flag name="side-channel"> - Enables Snort's the side channel. + Enables Snort's side channel. </flag> <flag name="sourcefire"> Enables Sourcefire specific build options, which include --enable-perfprofiling and --enable-ppm. </flag> <flag name="reload-error-restart"> - Enables support for completely restarting snort if an error is - detected durring a reload. + Enables support for completely restarting snort if an error is + detected during a reload. </flag> <flag name="active-response"> - Enables support for automatically sending TCP resets and ICMP + Enables support for automatically sending TCP resets and ICMP unreachable messages to terminate connections. Used with inline deployments. </flag> <flag name="flexresp3"> Enables support for new flexable response preprocessor for enabling - connection tearing for inline deployments. Replaces flexresp and + connection tearing for inline deployments. Replaces flexresp and flexresp2. </flag> <flag name="large-pcap-64bit"> diff --git a/net-analyzer/snort/snort-2.9.12.ebuild b/net-analyzer/snort/snort-2.9.12.ebuild deleted file mode 100644 index 0a355d731945..000000000000 --- a/net-analyzer/snort/snort-2.9.12.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit autotools user systemd tmpfiles multilib - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart open-appid -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch -) - -pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - -} - -src_prepare() { - default - - # Multilib fix for the sf_engine - ebegin "Applying multilib fix" - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \ - || die "sed for sf_engine failed" - - # Multilib fix for the curent set of dynamic-preprocessors - for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \ - || die "sed for $i failed." - done - eend - - mv configure.{in,ac} || die - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable open-appid) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - emake DESTDIR="${D}" install - - keepdir /var/log/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" - - newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${ED%/}"/usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${ED%/}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED%/}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${ED%/}/etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - tmpfiles_process snort.conf - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snort/snort-2.9.15.ebuild b/net-analyzer/snort/snort-2.9.15.ebuild deleted file mode 100644 index 113430f103e6..000000000000 --- a/net-analyzer/snort/snort-2.9.15.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools user systemd tmpfiles multilib - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart open-appid -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch -) - -pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - -} - -src_prepare() { - default - - # Multilib fix for the sf_engine - ebegin "Applying multilib fix" - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \ - || die "sed for sf_engine failed" - - # Multilib fix for the curent set of dynamic-preprocessors - for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \ - || die "sed for $i failed." - done - eend - - mv configure.{in,ac} || die - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable open-appid) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - default - - keepdir /var/log/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - systemd_newunit "${FILESDIR}/snort_at.service" "snort@.service" - - newtmpfiles "${FILESDIR}"/snort.tmpfiles snort.conf - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${ED}"/usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${ED%}/etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${ED}/etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - tmpfiles_process snort.conf - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.20.ebuild index 21bdbd512480..1bfd9d0de604 100644 --- a/net-analyzer/snort/snort-2.9.15.1.ebuild +++ b/net-analyzer/snort/snort-2.9.20.ebuild @@ -1,50 +1,50 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools user systemd tmpfiles multilib +EAPI=8 + +LUA_COMPAT=( luajit ) + +inherit autotools flag-o-matic lua-single systemd tmpfiles DESCRIPTION="The de facto standard for intrusion detection/prevention" HOMEPAGE="https://www.snort.org" SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart open-appid -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 + +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="+active-response control-socket debug file-inspect +flexresp3 +gre +high-availability inline-init-failopen large-pcap-64bit +libtirpc +linux-smp-stats +non-ether-decoders open-appid +perfprofiling +ppm +react +reload-error-restart selinux shared-rep side-channel sourcefire +threads" + +DEPEND="acct-user/snort + acct-group/snort dev-libs/libdnet + >=dev-libs/libpcre-8.33 net-libs/libnsl:0= + >=net-libs/libpcap-1.3.0 sys-libs/zlib !libtirpc? ( sys-libs/glibc[rpc(-)] ) libtirpc? ( net-libs/libtirpc ) - open-appid? ( dev-lang/luajit:= ) -" - + open-appid? ( ${LUA_DEPS} )" +BDEPEND=">=net-libs/daq-2.0.2" RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-snort )" -REQUIRED_USE="!kernel_linux? ( !shared-rep )" +REQUIRED_USE="!kernel_linux? ( !shared-rep ) + open-appid? ( ${LUA_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}"/${PN}-2.9.8.3-no-implicit.patch - "${FILESDIR}"/${PN}-2.9.8.3-rpc.patch - "${FILESDIR}"/${PN}-2.9.12-snort.pc.patch - "${FILESDIR}"/${PN}-2.9.15.1-fno-common.patch + "${FILESDIR}/${PN}-2.9.8.3-no-implicit.patch" + "${FILESDIR}/${PN}-2.9.8.3-rpc.patch" + "${FILESDIR}/${PN}-2.9.12-snort.pc.patch" ) pkg_setup() { - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - + use open-appid && lua-single_pkg_setup } src_prepare() { @@ -56,10 +56,16 @@ src_prepare() { } src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861239 + # + # Upstream does bug mail. Sent an email. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ $(use_enable gre) \ $(use_enable control-socket) \ $(use_enable file-inspect) \ @@ -92,7 +98,9 @@ src_configure() { --disable-profile \ --disable-ppm-test \ --disable-intel-soft-cpm \ - --disable-static-daq + --disable-static-daq \ + --disable-static \ + --disable-so-with-static-lib } src_install() { @@ -154,8 +162,7 @@ src_install() { rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" # Remove unneeded .la files (Bug #382863) - rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" + find "${ED}" -name '*.la' -type f -delete || die # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ diff --git a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild b/net-analyzer/snort/snort-2.9.8.3-r2.ebuild deleted file mode 100644 index 2dc9971f77c8..000000000000 --- a/net-analyzer/snort/snort-2.9.8.3-r2.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools multilib user - -DESCRIPTION="The de facto standard for intrusion detection/prevention" -HOMEPAGE="https://www.snort.org" -SRC_URI="https://www.snort.org/downloads/archive/${PN}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="static +gre +ppm +perfprofiling -+non-ether-decoders control-socket file-inspect high-availability -shared-rep side-channel sourcefire linux-smp-stats inline-init-failopen -+threads debug +active-response reload-error-restart -+react +flexresp3 large-pcap-64bit selinux +libtirpc" - -DEPEND=">=net-libs/libpcap-1.3.0 - >=net-libs/daq-2.0.2 - >=dev-libs/libpcre-8.33 - dev-libs/libdnet - net-libs/libnsl:0= - sys-libs/zlib - !libtirpc? ( sys-libs/glibc[rpc(-)] ) - libtirpc? ( net-libs/libtirpc ) -" - -RDEPEND="${DEPEND} - selinux? ( sec-policy/selinux-snort )" - -REQUIRED_USE="!kernel_linux? ( !shared-rep )" - -PATCHES=( - "${FILESDIR}"/${P}-no-implicit.patch - "${FILESDIR}"/${P}-rpc.patch -) - -pkg_setup() { - - # pre_inst() is a better place to put this - # but we need it here for the 'fowners' statements in src_install() - enewgroup snort - enewuser snort -1 -1 /dev/null snort - -} - -src_prepare() { - default - - # Multilib fix for the sf_engine - ebegin "Applying multilib fix" - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-plugins/sf_engine/Makefile.am" \ - || die "sed for sf_engine failed" - - # Multilib fix for the curent set of dynamic-preprocessors - for i in file ftptelnet smtp ssh dns ssl dcerpc2 sdf imap pop sip reputation gtp modbus dnp3; do - sed -i -e 's|${exec_prefix}/lib|${exec_prefix}/'$(get_libdir)'|g' \ - "${WORKDIR}/${P}/src/dynamic-preprocessors/$i/Makefile.am" \ - || die "sed for $i failed." - done - eend - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - - econf \ - $(use_enable !static shared) \ - $(use_enable static) \ - $(use_enable static so-with-static-lib) \ - $(use_enable gre) \ - $(use_enable control-socket) \ - $(use_enable file-inspect) \ - $(use_enable high-availability ha) \ - $(use_enable non-ether-decoders) \ - $(use_enable shared-rep) \ - $(use_enable side-channel) \ - $(use_enable sourcefire) \ - $(use_enable ppm) \ - $(use_enable perfprofiling) \ - $(use_enable linux-smp-stats) \ - $(use_enable inline-init-failopen) \ - $(use_enable threads pthread) \ - $(use_enable debug) \ - $(use_enable debug debug-msgs) \ - $(use_enable debug corefiles) \ - $(use_enable !debug dlclose) \ - $(use_enable active-response) \ - $(use_enable reload-error-restart) \ - $(use_enable react) \ - $(use_enable flexresp3) \ - $(use_enable large-pcap-64bit large-pcap) \ - $(use_with libtirpc) \ - --enable-mpls \ - --enable-normalizer \ - --enable-reload \ - --enable-targetbased \ - --disable-build-dynamic-examples \ - --disable-profile \ - --disable-ppm-test \ - --disable-intel-soft-cpm \ - --disable-static-daq -} - -src_install() { - - emake DESTDIR="${D}" install - - dodir /var/log/snort \ - /var/run/snort \ - /etc/snort/rules \ - /etc/snort/so_rules \ - /usr/$(get_libdir)/snort_dynamicrules - - # config.log and build.log are needed by Sourcefire - # to trouble shoot build problems and bug reports so we are - # perserving them incase the user needs upstream support. - dodoc RELEASE.NOTES ChangeLog \ - doc/* \ - tools/u2boat/README.u2boat - - insinto /etc/snort - doins etc/attribute_table.dtd \ - etc/classification.config \ - etc/gen-msg.map \ - etc/reference.config \ - etc/threshold.conf \ - etc/unicode.map - - # We use snort.conf.distrib because the config file is complicated - # and the one shipped with snort can change drastically between versions. - # Users should migrate setting by hand and not with etc-update. - newins etc/snort.conf snort.conf.distrib - - # config.log and build.log are needed by Sourcefire - # to troubleshoot build problems and bug reports so we are - # preserving them incase the user needs upstream support. - if [ -f "${WORKDIR}/${PF}/config.log" ]; then - dodoc "${WORKDIR}/${PF}/config.log" - fi - if [ -f "${T}/build.log" ]; then - dodoc "${T}/build.log" - fi - - insinto /etc/snort/preproc_rules - doins preproc_rules/decoder.rules \ - preproc_rules/preprocessor.rules \ - preproc_rules/sensitive-data.rules - - fowners -R snort:snort \ - /var/log/snort \ - /var/run/snort \ - /etc/snort - - newinitd "${FILESDIR}/snort.rc12" snort - newconfd "${FILESDIR}/snort.confd.2" snort - - # Sourcefire uses Makefiles to install docs causing Bug #297190. - # This removes the unwanted doc directory and rogue Makefiles. - rm -rf "${D}"usr/share/doc/snort || die "Failed to remove SF doc directories" - rm "${D}"usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files" - - # Remove unneeded .la files (Bug #382863) - rm "${D}"usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die - rm "${D}"usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la" - - # Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection - sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the correct rule location in the config - sed -i -e 's|RULE_PATH ../rules|RULE_PATH /etc/snort/rules|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the correct preprocessor/decoder rule location in the config - sed -i -e 's|PREPROC_RULE_PATH ../preproc_rules|PREPROC_RULE_PATH /etc/snort/preproc_rules|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Enable the preprocessor/decoder rules - sed -i -e 's|^# include $PREPROC_RULE_PATH|include $PREPROC_RULE_PATH|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^# dynamicdetection directory|dynamicdetection directory|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Just some clean up of trailing /'s in the config - sed -i -e 's|snort_dynamicpreprocessor/$|snort_dynamicpreprocessor|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Make it clear in the config where these are... - sed -i -e 's|^include classification.config|include /etc/snort/classification.config|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - sed -i -e 's|^include reference.config|include /etc/snort/reference.config|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Disable all rule files by default. - sed -i -e 's|^include $RULE_PATH|# include $RULE_PATH|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the configured DAQ to afpacket - sed -i -e 's|^# config daq: <type>|config daq: afpacket|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the location of the DAQ modules - sed -i -e 's|^# config daq_dir: <dir>|config daq_dir: /usr/'$(get_libdir)'/daq|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the DAQ mode to passive - sed -i -e 's|^# config daq_mode: <mode>|config daq_mode: passive|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set snort to run as snort:snort - sed -i -e 's|^# config set_gid:|config set_gid: snort|g' \ - "${D}etc/snort/snort.conf.distrib" || die - sed -i -e 's|^# config set_uid:|config set_uid: snort|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the default log dir - sed -i -e 's|^# config logdir:|config logdir: /var/log/snort/|g' \ - "${D}etc/snort/snort.conf.distrib" || die - - # Set the correct so_rule location in the config - sed -i -e 's|SO_RULE_PATH ../so_rules|SO_RULE_PATH /etc/snort/so_rules|g' \ - "${D}etc/snort/snort.conf.distrib" || die -} - -pkg_postinst() { - - einfo "There have been a number of improvements and new features" - einfo "added to ${P}. Please review the RELEASE.NOTES and" - einfo "ChangLog located in /usr/share/doc/${PF}." - einfo - elog "The Sourcefire Vulnerability Research Team (VRT) recommends that" - elog "users migrate their snort.conf customizations to the latest config" - elog "file released by the VRT. You can find the latest version of the" - elog "Snort config file in /etc/snort/snort.conf.distrib." - elog - elog "!! It is important that you migrate to this new snort.conf file !!" - elog - elog "This version of the ebuild includes an updated init.d file and" - elog "conf.d file that rely on options found in the latest Snort" - elog "config file provided by the VRT." - - if use debug; then - elog "You have the 'debug' USE flag enabled. If this has been done to" - elog "troubleshoot an issue by producing a core dump or a back trace," - elog "then you need to also ensure the FEATURES variable in make.conf" - elog "contains the 'nostrip' option." - fi -} diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/snortalog/metadata.xml +++ b/net-analyzer/snortalog/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild index 076c1310b734..2063d0ad5aa0 100644 --- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild +++ b/net-analyzer/snortalog/snortalog-2.4.3-r2.ebuild @@ -1,22 +1,24 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 MY_P="${PN}_v${PV}" -DESCRIPTION="a powerful perl script that summarizes snort logs" +inherit edos2unix + +DESCRIPTION="A powerful perl script that summarizes snort logs" HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/" SRC_URI="http://jeremy.chartier.free.fr/snortalog/downloads/${PN}/${MY_P}.tar" +S="${WORKDIR}" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" IUSE="tk" RDEPEND=" - dev-lang/perl[ithreads] + || ( >=dev-lang/perl-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[ithreads] ) dev-perl/GDGraph dev-perl/HTML-HTMLDoc virtual/perl-DB_File @@ -24,10 +26,16 @@ RDEPEND=" tk? ( dev-perl/Tk ) " -S=${WORKDIR} - src_prepare() { - edos2unix $(find conf/ modules/ -type f) ${PN}.* CHANGES + default + + local convert=$(find conf/ modules/ -type f || die) + convert+=( ${PN}.* CHANGES ) + + local item + for item in ${convert[@]} ; do + edos2unix "${item}" + done # fix paths, erroneous can access message sed -i \ @@ -41,7 +49,7 @@ src_prepare() { snortalog.pl || die } -src_install () { +src_install() { dobin snortalog.pl insinto /etc/snortalog diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest deleted file mode 100644 index e341252bae98..000000000000 --- a/net-analyzer/snortsam/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snortsam-src-2.70.tar.gz 1971624 BLAKE2B 10f26afb8addffb52db099e0c376a9adb884b625503233b72203070cadc79a688c7a6950014759d6fb58c8844899482057d9701e9eaa5e9d12066f10e88d6421 SHA512 e0b6d53dfc0963e5a0012e25c1cd15f76263cc0d0158f6a50eab3876f1ae40c47eeafb7309113d27f1ca92d5491a19e32748c3bf51754be9320346ebbf26e5b1 diff --git a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch b/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch deleted file mode 100644 index f2d8fd330d33..000000000000 --- a/net-analyzer/snortsam/files/snortsam-2.70-gentoo.patch +++ /dev/null @@ -1,140 +0,0 @@ - makesnortsam.sh | 66 +++++++++++++++++++++------------------------------------ - 1 file changed, 24 insertions(+), 42 deletions(-) - -diff --git a/makesnortsam.sh b/makesnortsam.sh -index 64c6eb6..37f66c9 100644 ---- a/makesnortsam.sh -+++ b/makesnortsam.sh -@@ -36,8 +36,7 @@ SSP_OBSD_SRC="ssp_pf.c ssp_pf2.c" - SSP_BSD_SRC="ssp_ipf.c ssp_ipfw2.c ssp_pf2.c" - SSP_SUNOS_SRC="ssp_ipf.c" - --CFLAGS="-O2 -D${systype}" --LDFLAGS= -+CFLAGS=" ${CFLAGS} -D${systype}" - - # OS specific flags - LINUX_CFLAGS= -@@ -72,23 +71,23 @@ case "$1" in - - case "${systype}" in - Linux*) -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -- ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} \ -+ ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} - ;; - - OpenBSD*) -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} - ;; - - *BSD*) -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} - ;; - - SunOS*) -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} - ;; - esac -@@ -104,23 +103,23 @@ case "$1" in - - case "${systype}" in - Linux*) -- gcc ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} - ;; - - OpenBSD*) -- #gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -- gcc ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ #${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LIBS} /usr/lib/libnsl.a -o ${SNORTSAM} -+ ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} - ;; - - *BSD*) -- gcc ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ -+ ${CC} ${CFLAGS} ${BSD_CFLAGS} ${OPSEC_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${OPSEC_LDFLAGS} ${OPSEC_LIBS} \ - ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} - ;; - - SunOS*) -- gcc ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ -+ ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${OPSEC_SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${OPSEC_SUNOS_LDFLAGS} \ - ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} - ;; - esac -@@ -152,10 +151,10 @@ case "$1" in - rm -f ${SAMTOOL}-debug - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} $${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; - esac - - echo "-------------------------------------------------------------------------------" -@@ -167,10 +166,10 @@ case "$1" in - SAMTOOL="${SAMTOOL}-debug" - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -- SunOS) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LINUX_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; -+ SunOS) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SAMTOOL_SRC} -o ${SAMTOOL} ; [ $? = 0 ] || exit 1;; - esac - cd .. - ;; -@@ -186,29 +185,12 @@ case "$1" in - rm -f ${SNORTSAM}-debug - - case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; -+ Linux*) echo ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} ${LDFLAGS} -o ${SNORTSAM} ${LINUX_LDFLAGS}; ${CC} ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ${LINUX_LDFLAGS}; [ $? = 0 ] || exit 1;; -+ OpenBSD*) echo ${CC} ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} ${LDFLAGS} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${OBSD_CFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ *BSD*) echo ${CC} ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${BSD_CFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; -+ SunOS*) echo ${CC} ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC}-o ${SNORTSAM} ; ${CC} ${CFLAGS} ${LDFLAGS} ${SUNOS_CFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ; [ $? = 0 ] || exit 1;; - esac - -- -- echo "-------------------------------------------------------------------------------" -- echo "Building SnortSam (debug)" -- echo "-------------------------------------------------------------------------------" -- -- rm -f *.o -- CFLAGS="${CFLAGS} -DFWSAMDEBUG" -- SNORTSAM="${SNORTSAM}-debug" -- -- case "${systype}" in -- Linux*) gcc ${CFLAGS} ${LINUX_CFLAGS} ${LDFLAGS} ${LINUX_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_LINUX_SRC} -o ${SNORTSAM} ;; -- OpenBSD*) gcc ${CFLAGS} ${OBSD_CFLAGS} ${LDFLAGS} ${OBSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_OBSD_SRC} -o ${SNORTSAM} ;; -- *BSD*) gcc ${CFLAGS} ${BSD_CFLAGS} ${LDFLAGS} ${BSD_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_BSD_SRC} -o ${SNORTSAM} ;; -- SunOS*) gcc ${CFLAGS} ${SUNOS_CFLAGS} ${LDFLAGS} ${SUNOS_LDFLAGS} ${SSP_GENERIC_SRC} ${SSP_SUNOS_SRC} -o ${SNORTSAM} ;; -- -- esac -- cd .. - ;; - esac - diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml deleted file mode 100644 index 789a44405524..000000000000 --- a/net-analyzer/snortsam/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> -</pkgmetadata> diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild deleted file mode 100644 index 800c7f6f08ec..000000000000 --- a/net-analyzer/snortsam/snortsam-2.70.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs vcs-clean - -DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls" -HOMEPAGE="http://www.snortsam.net/" -SRC_URI="http://www.snortsam.net/files/snortsam/${PN}-src-${PV}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ppc64 sparc x86" -IUSE="debug" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch - ecvs_clean -} - -src_configure() { - use debug && append-cflags -DFWSAMDEBUG - tc-export CC -} - -src_compile() { - sh makesnortsam.sh || die -} - -src_install() { - dobin snortsam - find "${S}" -depth -type f -name "*.asc" -exec rm -f {} \; - dodoc docs/* conf/* -} - -pkg_postinst() { - echo - elog "To use snortsam with snort, you'll have to compile snort with USE=snortsam." - elog "Read the INSTALL file to configure snort for snortsam, and configure" - elog "snortsam for your particular firewall." - echo -} diff --git a/net-analyzer/softflowd/Manifest b/net-analyzer/softflowd/Manifest index 2b86455b2393..8e5c65851f2a 100644 --- a/net-analyzer/softflowd/Manifest +++ b/net-analyzer/softflowd/Manifest @@ -1 +1 @@ -DIST softflowd-0.9.9.tar.gz 91939 BLAKE2B 97ef29e5f450f6896d9448359080a64dbe66d4edf031ff7e2b0e8500e9b781b983de6448b8a1d846d4c8c939269004998a090b0b7e7a9367c9c961e0118b8d59 SHA512 4d579c2a087c0f3cd4d2020bcfbddf9dab73254e40678b3509c93bec212bf8b5692f76bfb4e766577e431ff508f0bce0a2cf326184f192e3c5dc8ddf38514dbd +DIST softflowd-1.0.0.tar.gz 168379 BLAKE2B 97ce677adf8f8278516f25e82db1757ad5fe208fb8923b189698525d58d60c998ea847f29ae91eefed57d7bd1eb42f119a99e46346753539cb3a9584a90eb484 SHA512 01a4f89755c957a495b08c49b572b8b6aa41f5ac7672feb5e31b039fbfab84f3a206b1da95b11de2ec5882123f6ca2387c02efb874ce707c2263bf79b56012fd diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch deleted file mode 100644 index cb4844803e00..000000000000 --- a/net-analyzer/softflowd/files/softflowd-0.9.9-_GNU_SOURCE.patch +++ /dev/null @@ -1,13 +0,0 @@ -setresuid and setresgid need _GNU_SOURCE which clashes with _BSD_SOURCE - ---- a/configure.ac -+++ b/configure.ac -@@ -87,7 +87,7 @@ - AC_SEARCH_LIBS(socket, socket) - AC_CHECK_LIB(pcap, pcap_open_live) - --AC_CHECK_FUNCS(closefrom daemon setresuid setreuid setresgid setgid strlcpy strlcat) -+AC_CHECK_FUNCS(closefrom daemon setreuid setgid strlcpy strlcat) - - AC_CHECK_TYPES([u_int64_t, int64_t, uint64_t, u_int32_t, int32_t, uint32_t]) - AC_CHECK_TYPES([u_int16_t, int16_t, uint16_t, u_int8_t, int8_t, uint8_t]) diff --git a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch b/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch deleted file mode 100644 index c48603a7f491..000000000000 --- a/net-analyzer/softflowd/files/softflowd-0.9.9-no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -52,7 +52,7 @@ - $(srcdir)/mkinstalldirs $(DESTDIR)$(sbindir) - [ -d $(DESTDIR)$(mandir)/man8 ] || \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man8 -- $(INSTALL) -m 0755 -s softflowd $(DESTDIR)$(sbindir)/softflowd -- $(INSTALL) -m 0755 -s softflowctl $(DESTDIR)$(sbindir)/softflowctl -+ $(INSTALL) -m 0755 softflowd $(DESTDIR)$(sbindir)/softflowd -+ $(INSTALL) -m 0755 softflowctl $(DESTDIR)$(sbindir)/softflowctl - $(INSTALL) -m 0644 softflowd.8 $(DESTDIR)$(mandir)/man8/softflowd.8 - $(INSTALL) -m 0644 softflowctl.8 $(DESTDIR)$(mandir)/man8/softflowctl.8 diff --git a/net-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml index 35892ab7c2d1..d3aa32c666d5 100644 --- a/net-analyzer/softflowd/metadata.xml +++ b/net-analyzer/softflowd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild b/net-analyzer/softflowd/softflowd-1.0.0.ebuild index cb7d09e3425e..6795a9a13ead 100644 --- a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild +++ b/net-analyzer/softflowd/softflowd-1.0.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 +inherit autotools DESCRIPTION="flow-based network traffic analyser capable of Cisco NetFlow data export" -HOMEPAGE="http://www.mindrot.org/projects/softflowd/" -SRC_URI="https://softflowd.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="https://www.mindrot.org/projects/softflowd/" +SRC_URI="https://github.com/irino/${PN}/archive/${P}.tar.gz" LICENSE="BSD GPL-2" SLOT="0" @@ -14,10 +14,13 @@ KEYWORDS="~amd64 ~x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" +PATCHES=( +# "${FILESDIR}"/${PN}-0.9.9-_GNU_SOURCE.patch +) +S=${WORKDIR}/${PN}-${P} src_prepare() { - epatch "${FILESDIR}"/${P}-no-strip.patch - epatch "${FILESDIR}"/${P}-_GNU_SOURCE.patch + default eautoreconf } diff --git a/net-analyzer/speedtest++/Manifest b/net-analyzer/speedtest++/Manifest new file mode 100644 index 000000000000..788248bd96f7 --- /dev/null +++ b/net-analyzer/speedtest++/Manifest @@ -0,0 +1 @@ +DIST speedtest++-0.0.20210829.tar.gz 13444 BLAKE2B ac6967d7ed0174e2278c91a8e76012621cc67e51c1722a0d359fc7889b4bc813abb1709b5e482eeef7ff0951be3c697777dc5f2258b099521a08db77c5d7fa40 SHA512 3085adab0f4c94c8e5c3168136094a571d901866352387e9afe0ef386127da6971329bc8f6d8c02efa5f32c8620ccd2482d65dce34da4ca4331b88edf34df2b3 diff --git a/net-analyzer/speedtest++/metadata.xml b/net-analyzer/speedtest++/metadata.xml new file mode 100644 index 000000000000..2c5e2cf3619d --- /dev/null +++ b/net-analyzer/speedtest++/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>zx2c4@gentoo.org</email> + <name>Jason A. Donenfeld</name> + </maintainer> + <upstream> + <remote-id type="github">taganaka/SpeedTest</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild new file mode 100644 index 000000000000..4ccc533381c7 --- /dev/null +++ b/net-analyzer/speedtest++/speedtest++-0.0.20210829.ebuild @@ -0,0 +1,24 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="High performance speedtest.net CLI" +HOMEPAGE="https://github.com/taganaka/SpeedTest" +SNAPSHOT_COMMIT="0f63cfbf7ce8d64ea803bf143b957eae76323405" +SRC_URI="https://github.com/taganaka/SpeedTest/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + net-misc/curl + dev-libs/libxml2:= + dev-libs/openssl:0= +" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/SpeedTest-${SNAPSHOT_COMMIT}" diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest index e056ba9574cb..8cccddb672e4 100644 --- a/net-analyzer/speedtest-cli/Manifest +++ b/net-analyzer/speedtest-cli/Manifest @@ -1 +1 @@ -DIST speedtest-cli-2.1.2.tar.gz 24741 BLAKE2B 09418e34d92e0f91d7482ba4cc46cf812b43f25118c71a8e5127265f62ef93bb428ebfe5cc65a73ea8284fb7bfe1a99cc670d5d186f9e82284a11390f6e66960 SHA512 f2eb125116f42075d3248e1c0590cce4f822f383ff7c54c158504b16de72bf35b35d55a78014413a95a5f5bafa98c71c3ea011f20f480f1db272d6e8800c40bd +DIST speedtest-cli-2.1.3.tar.gz 24771 BLAKE2B 70c604848ffa29ae0a28a636a40ffdd278000c865b243038f773d20a4f6f1c668704505c8bae302d84a0957b2a6ad9d4b303e2e9371b351348d7147ff9a5a67d SHA512 e2ecd9b4eea95e3641045c3da217ec5a39846b26c1f773fdd31c6ffe3cb5e35341320fc1992f865af48afd1a704c4d4224f9ec4048abb69131ee2f32385ae94c diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch new file mode 100644 index 000000000000..455fd4bfd2eb --- /dev/null +++ b/net-analyzer/speedtest-cli/files/speedtest-cli-2.1.3-json-serverlist.patch @@ -0,0 +1,88 @@ +diff --git a/speedtest.py b/speedtest.py +index a33296d..e7490b1 100755 +--- a/speedtest.py ++++ b/speedtest.py +@@ -20,6 +20,7 @@ import re + import csv + import sys + import math ++import json + import errno + import signal + import socket +@@ -1250,10 +1251,7 @@ class Speedtest(object): + ) + + urls = [ +- '://www.speedtest.net/speedtest-servers-static.php', +- 'http://c.speedtest.net/speedtest-servers-static.php', +- '://www.speedtest.net/speedtest-servers.php', +- 'http://c.speedtest.net/speedtest-servers.php', ++ "://www.speedtest.net/api/js/servers", + ] + + headers = {} +@@ -1296,53 +1294,31 @@ class Speedtest(object): + printer('Servers XML:\n%s' % serversxml, debug=True) + + try: +- try: +- try: +- root = ET.fromstring(serversxml) +- except ET.ParseError: +- e = get_exception() +- raise SpeedtestServersError( +- 'Malformed speedtest.net server list: %s' % e +- ) +- elements = etree_iter(root, 'server') +- except AttributeError: +- try: +- root = DOM.parseString(serversxml) +- except ExpatError: +- e = get_exception() +- raise SpeedtestServersError( +- 'Malformed speedtest.net server list: %s' % e +- ) +- elements = root.getElementsByTagName('server') +- except (SyntaxError, xml.parsers.expat.ExpatError): ++ elements = json.loads(serversxml) ++ except SyntaxError: + raise ServersRetrievalError() + + for server in elements: +- try: +- attrib = server.attrib +- except AttributeError: +- attrib = dict(list(server.attributes.items())) +- +- if servers and int(attrib.get('id')) not in servers: ++ if servers and int(server.get('id')) not in servers: + continue + +- if (int(attrib.get('id')) in self.config['ignore_servers'] +- or int(attrib.get('id')) in exclude): ++ if (int(server.get('id')) in self.config['ignore_servers'] ++ or int(server.get('id')) in exclude): + continue + + try: + d = distance(self.lat_lon, +- (float(attrib.get('lat')), +- float(attrib.get('lon')))) ++ (float(server.get('lat')), ++ float(server.get('lon')))) + except Exception: + continue + +- attrib['d'] = d ++ server['d'] = d + + try: +- self.servers[d].append(attrib) ++ self.servers[d].append(server) + except KeyError: +- self.servers[d] = [attrib] ++ self.servers[d] = [server] + + break + diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml index 718c71bda885..1608948afeb0 100644 --- a/net-analyzer/speedtest-cli/metadata.xml +++ b/net-analyzer/speedtest-cli/metadata.xml @@ -1,13 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>zx2c4@gentoo.org</email> - <name>Jason A. Donenfeld</name> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> </maintainer> - <longdescription lang="en"> - Command line interface for testing internet bandwidth using speedtest.net. - </longdescription> <upstream> <remote-id type="github">sivel/speedtest-cli</remote-id> </upstream> diff --git a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild index 8e0aa6890832..50fd8d8ef75d 100644 --- a/net-analyzer/speedtest-cli/speedtest-cli-2.1.2.ebuild +++ b/net-analyzer/speedtest-cli/speedtest-cli-2.1.3-r2.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python{3_6,3_7,3_8} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -13,13 +14,12 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -IUSE="" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -DOCS=( CONTRIBUTING.md README.rst ) +PATCHES=( "${FILESDIR}/${PN}-2.1.3-json-serverlist.patch" ) python_install_all() { doman ${PN}.1 diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml index 33aad216574c..44b52e2a3957 100644 --- a/net-analyzer/sqlninja/metadata.xml +++ b/net-analyzer/sqlninja/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild index e85466b632e4..60cf228b8201 100644 --- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild +++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit versionator +EAPI=8 -MY_PV="$(replace_version_separator 3 '-')" +MY_PV="${PV//_/-}" MY_PV="${MY_PV/p/r}" MY_P="${PN}-${MY_PV}" DESCRIPTION="A SQL Server injection & takeover tool" HOMEPAGE="http://sqlninja.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tgz" +S="${WORKDIR}/${MY_P}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc" - RESTRICT="mirror" RDEPEND=" @@ -28,28 +28,25 @@ RDEPEND=" dev-perl/NetPacket " -S="${WORKDIR}/${MY_P}" - -src_install () { +src_install() { dodoc sqlninja-howto.html ChangeLog README if use doc; then dodoc -r sources - docompress -x /usr/share/doc/"${P}"/sources + docompress -x /usr/share/doc/${P}/sources fi - insinto /etc/"${PN}" + insinto /etc/${PN} doins sqlninja.conf.example rm -r sources sqlninja-howto.html ChangeLog README LICENSE || die rm -r apps || die rm sqlninja.conf.example || die - dodir /usr/lib/"${PN}" - insinto /usr/lib/"${PN}" - exeinto /usr/lib/"${PN}" + insinto /usr/lib/${PN} + exeinto /usr/lib/${PN} doins -r * doexe sqlninja - dosbin "${FILESDIR}"/"${PN}" + dosbin "${FILESDIR}"/${PN} } diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml index db2b74207c46..42bbf7b764a6 100644 --- a/net-analyzer/squid-graph/metadata.xml +++ b/net-analyzer/squid-graph/metadata.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>Squid logfile analyzer and traffic grapher</longdescription> <upstream> <remote-id type="sourceforge">squid-graph</remote-id> </upstream> diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild index 2d14d8885f1b..e0e5a19500ef 100644 --- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild +++ b/net-analyzer/squid-graph/squid-graph-3.2-r2.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 DESCRIPTION="Squid logfile analyzer and traffic grapher" HOMEPAGE="http://squid-graph.sourceforge.net/" -LICENSE="GPL-2" -SRC_URI="mirror://sourceforge/squid-graph/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/squid-graph/${P}.tar.gz" +S="${WORKDIR}"/${PN} +LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -RDEPEND="dev-perl/GD[png]" - -S=${WORKDIR}/${PN} +RDEPEND="dev-perl/GD[png(+)]" -src_install () { +src_install() { dobin apacheconv generate.cgi squid-graph timeconv dodoc README } diff --git a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch index 3dd72203c309..0efa4d0817ec 100644 --- a/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch +++ b/net-analyzer/squidsites/files/squidsites-1.01-format-security.patch @@ -1,5 +1,5 @@ ---- a/src/squidsites.c -+++ b/src/squidsites.c +--- a/squidsites.c ++++ b/squidsites.c @@ -286,7 +286,7 @@ static
void print_help()
diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/squidsites/metadata.xml +++ b/net-analyzer/squidsites/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild index f6bd96865543..3c359aefe472 100644 --- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild +++ b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild @@ -1,32 +1,37 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs +inherit toolchain-funcs -DESCRIPTION="A tool that parses Squid access log file and generates a report of the most visited sites" -LICENSE="GPL-2" +DESCRIPTION="A tool to parse Squid access log file and to generate reports" HOMEPAGE="http://www.stefanopassiglia.com/misc.htm" SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz" +S="${WORKDIR}/src" + +LICENSE="GPL-2" SLOT="1" KEYWORDS="amd64 ppc x86" -S="${WORKDIR}/src" +PATCHES=( + "${FILESDIR}"/${P}-format-security.patch +) src_prepare() { + default + # Respect CFLAGS sed -i Makefile \ -e '/^CCFLAGS=/s|-g| $(CFLAGS) $(LDFLAGS)|' \ || die - epatch "${FILESDIR}"/${P}-format-security.patch } src_compile() { emake CC="$(tc-getCC)" } -src_install () { +src_install() { cd "${WORKDIR}" || die dobin src/squidsites dodoc Authors Bugs ChangeLog GNU-Manifesto.html README diff --git a/net-analyzer/squidview/metadata.xml b/net-analyzer/squidview/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/net-analyzer/squidview/metadata.xml +++ b/net-analyzer/squidview/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/ssh-audit/Manifest b/net-analyzer/ssh-audit/Manifest new file mode 100644 index 000000000000..6d0a4850a473 --- /dev/null +++ b/net-analyzer/ssh-audit/Manifest @@ -0,0 +1,3 @@ +DIST ssh-audit-3.0.0.tar.gz 151667 BLAKE2B 3d79ee96793634f97d5ee7237189f97ddacd388afbbfb55cc8a8f21b4cb1198d79595694c88bf9f0df1adbe997ec5a9d8caa9b9f07d988d4cff07ae0d6924ea0 SHA512 2fcfc6c8b6737d54894de70dbcf1f800662ca122995c897507c87c73fecad66571b44bc3dfe102ff0dbafd270e537e5e00c7449319f1ee12b90494ee784c0cde +DIST ssh-audit-3.1.0.tar.gz 154296 BLAKE2B 8c474ddfa2ceacb5c271eac152d1bb0b1e10132ae46de9da891b445a8a4b2ae70ffc20bb83a2d4ec52fdad8701c13f4777c85bd2e15b8ee5dbc6b021c268e731 SHA512 ea42aa93272cb1881d8c5882b2f68655606fe73f64a708bc0f9f743f14137aab1026eabf10a813f3919de179117c1a9b4c8325d511e25afd60caee273cb32deb +DIST ssh-audit-3.2.0.tar.gz 175715 BLAKE2B 89e9710dae25a05347cfc3f29d69af9f9aaf5c9238c6b7454458bce32db6ce711483b9616ecb9dc20ab2f7de090fc9e724a271c10c8d96fe763cbf4e08c9e443 SHA512 66544b631eee07d02f2c15324016bbe1d6504e70032659f7610fd25aa248285a0ac20d43c4ae8958f434adab079a551baad4f7fabebdde51d0ff7b7047082abe diff --git a/net-analyzer/ssh-audit/metadata.xml b/net-analyzer/ssh-audit/metadata.xml new file mode 100644 index 000000000000..915e0081a17e --- /dev/null +++ b/net-analyzer/ssh-audit/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>graaff@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">jtesta/ssh-audit</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild new file mode 100644 index 000000000000..1a964a4b8a85 --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=(python3_{10,11}) + +inherit distutils-r1 + +DESCRIPTION="SSH server auditing (banner, key exchange, encryption, mac, compression, etc)" +HOMEPAGE="https://github.com/jtesta/ssh-audit" +SRC_URI="https://github.com/jtesta/ssh-audit/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} diff --git a/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild new file mode 100644 index 000000000000..f61f9ddb69ed --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=(python3_{10,11,12}) + +inherit distutils-r1 + +DESCRIPTION="SSH server auditing (banner, key exchange, encryption, mac, compression, etc)" +HOMEPAGE="https://github.com/jtesta/ssh-audit" +SRC_URI="https://github.com/jtesta/ssh-audit/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} diff --git a/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild b/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild new file mode 100644 index 000000000000..4db6488898d3 --- /dev/null +++ b/net-analyzer/ssh-audit/ssh-audit-3.2.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=(python3_{10,11,12}) + +inherit distutils-r1 + +DESCRIPTION="SSH server auditing (banner, key exchange, encryption, mac, compression, etc)" +HOMEPAGE="https://github.com/jtesta/ssh-audit" +SRC_URI="https://github.com/jtesta/ssh-audit/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="test" + +# Tests require prospector which is not packaged +RESTRICT="test" + +src_install() { + distutils-r1_src_install + + doman ssh-audit.1 +} diff --git a/net-analyzer/sshping/Manifest b/net-analyzer/sshping/Manifest new file mode 100644 index 000000000000..5ff59abc1d9a --- /dev/null +++ b/net-analyzer/sshping/Manifest @@ -0,0 +1 @@ +DIST sshping-0.1.4.tar.gz 3536227 BLAKE2B 30ee41324046d5ba5fb38a28acbf11dabadcbe41c506f7e4f51f2a5e95c015251d77ad16c534160eb1b83a871a5d25083b2481a5df91f5beb104279268838ae7 SHA512 16d72099b468c58d44835822a372f97863ba0b73282e8e64c20b0a0e6465e6f9efa634a85b0c7c13d03c470c547b08332820bf177f5bad59984270801ab74782 diff --git a/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch b/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch new file mode 100644 index 000000000000..2758e84b70e4 --- /dev/null +++ b/net-analyzer/sshping/files/sshping-0.1.4-fix-man-dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e59dd5..d20c9a9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,7 +34,7 @@ if (UNIX) + endif (UNIX) + + add_custom_target(man ALL DEPENDS ${MAN_TGT}) +-install(FILES ${MAN_TGT} DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man8) ++install(FILES ${MAN_TGT} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man8) + + # Packaging for RPM or DEB + find_program(rpmbuild_path "rpmbuild" FALSE) diff --git a/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch b/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch new file mode 100644 index 000000000000..9f2f905aded6 --- /dev/null +++ b/net-analyzer/sshping/files/sshping-0.1.4-respect-cxxflags.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e8a7d0b..00ade1c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.8) + #find_package(libssh) + + # Build the sshping binary +-set(CMAKE_CXX_FLAGS "-I ${CMAKE_CURRENT_SOURCE_DIR}/ext/ -Wall") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I ${CMAKE_CURRENT_SOURCE_DIR}/ext/") + add_executable(${PROJECT_NAME} src/sshping.cxx) + target_link_libraries(${PROJECT_NAME} ssh) + install(TARGETS ${PROJECT_NAME} DESTINATION bin) diff --git a/net-analyzer/sshping/metadata.xml b/net-analyzer/sshping/metadata.xml new file mode 100644 index 000000000000..338f017da09e --- /dev/null +++ b/net-analyzer/sshping/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>ajak@gentoo.org</email> + <name>John Helmert III</name> + </maintainer> + <upstream> + <remote-id type="github">spook/sshping</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/sshping/sshping-0.1.4.ebuild b/net-analyzer/sshping/sshping-0.1.4.ebuild new file mode 100644 index 000000000000..b6898c56a36b --- /dev/null +++ b/net-analyzer/sshping/sshping-0.1.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="ssh-based ping: measure character echo latency and bandwidth" +HOMEPAGE="https://github.com/spook/sshping" +SRC_URI="https://github.com/spook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND="dev-lang/perl" +DEPEND="net-libs/libssh:=" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-fix-man-dir.patch" + "${FILESDIR}/${P}-respect-cxxflags.patch" +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_CXX_FLAGS="${CXXFLAGS}" + ) + + cmake_src_configure +} diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index 850d7518accc..eb1f4cb13252 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1 +1 @@ -DIST ssldump-0.9b3.tar.gz 137435 BLAKE2B e42eeac4daa99a62537ac7ee5152428664fed40256ec10f7c61621f9bbd06476d280af1a6c517eaff253058e3720a282e88604b2f1de0c7ad1b5328597879449 SHA512 ea81558a243950ab43354c9f33c0a4feae0ae859bc2bd6e6b58838a01f4a1e7a6447f2a9ab1fa40bbe8dbd6c3630c489c17fc9c066cacfddfb64269b0cd5090a +DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814 diff --git a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch b/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch deleted file mode 100644 index 9a58c6369929..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-DLT_LINUX_SLL.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/base/pcap-snoop.c -+++ b/base/pcap-snoop.c -@@ -157,6 +157,10 @@ - return; - - break; -+ case DLT_LINUX_SLL: -+ data+=16; -+ len-=16; -+ break; - } - network_process_packet(n,&hdr->ts,data,len); - } diff --git a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch b/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch deleted file mode 100644 index 941350e8c789..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-configure-dylib.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -102,14 +102,13 @@ - AC_MSG_CHECKING(for PCAP library) - ac_found_pcap_lib_dir="no" - for dir in $ac_pcap_lib_dir; do -- if test -f $dir/libpcap.a; then -+ if test -f $dir/libpcap.so -o -f $dir/libpcap.dylib; then - dnl Ok, we think we've found them, but check that they -- dnl actually ontain the right functions -+ dnl actually contain the right functions - save_LIBS=$LIBS -- save_LDFLAGS=$LDFLAGS - LIBS="-lpcap $LIBS" - if test "$dir" != "/usr/lib"; then -- LDFLAGS="-L$dir $LDFLAGS" -+ LIBS="-L$dir $LIBS" - fi - AC_TRY_LINK_FUNC(pcap_open_live,ac_linked_libpcap="true", - ac_linked_libpcap="false"); -@@ -118,7 +117,6 @@ - break - fi - LIBS=$save_LIBS -- LDFLAGS=$save_LDFLAGS - fi - done - diff --git a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch b/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch deleted file mode 100644 index 836b52c84ab2..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-declaration.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ssl/ssl_rec.h -+++ b/ssl/ssl_rec.h -@@ -54,6 +54,8 @@ - SSL_CipherSuite *cs,UCHAR *mk,UCHAR *sk,UCHAR *iv)); - int ssl_decode_rec_data PROTO_LIST((ssl_obj *ssl,ssl_rec_decoder *d, - int ct,int version,UCHAR *in,int inl,UCHAR *out,int *outl)); -+int ssl3_check_mac(ssl_rec_decoder *d, int ct, int ver, UCHAR *data, -+ UINT4 datalen, UCHAR *mac); - - #endif - diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch deleted file mode 100644 index 8ca06dcef449..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/common/lib/r_assoc.c -+++ b/common/lib/r_assoc.c -@@ -57,6 +57,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcpy() memcmp() */ - #include "r_assoc.h" - - typedef struct r_assoc_el_ { ---- a/common/lib/r_bitfield.c -+++ b/common/lib/r_bitfield.c -@@ -11,6 +11,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcpy() memset() */ - #include "r_bitfield.h" - - int r_bitfield_create(setp,size) ---- a/common/lib/r_data.c -+++ b/common/lib/r_data.c -@@ -47,6 +47,7 @@ - static char *RCSSTRING="$Id$"; - - #include <r_common.h> -+#include <string.h> /* memcmp() memcpy() memset() */ - #include <r_data.h> - - int r_data_create(dp,d,l) diff --git a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch b/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch deleted file mode 100644 index a9a724658ccf..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-libpcap-header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/base/pcap-snoop.c -+++ b/base/pcap-snoop.c -@@ -49,7 +49,6 @@ - - #include <pcap.h> - #include <unistd.h> --#include <net/bpf.h> - #ifndef _WIN32 - #include <sys/param.h> - #endif diff --git a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch deleted file mode 100644 index 2ce16d54f168..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-openssl-0.9.8.compile-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/ssl/ssldecode.c -+++ b/ssl/ssldecode.c -@@ -51,6 +51,7 @@ - #include <openssl/ssl.h> - #include <openssl/hmac.h> - #include <openssl/evp.h> -+#include <openssl/md5.h> - #include <openssl/x509v3.h> - #endif - #include "ssldecode.h" -@@ -131,6 +132,7 @@ - ssl_decode_ctx *d=0; - int r,_status; - -+ SSL_library_init(); - SSLeay_add_all_algorithms(); - if(!(d=(ssl_decode_ctx *)malloc(sizeof(ssl_decode_ctx)))) - ABORT(R_NO_MEMORY); diff --git a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch b/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch deleted file mode 100644 index 74d7ddcd6f68..000000000000 --- a/net-analyzer/ssldump/files/ssldump-0.9-prefix-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -eliminates unused variable ROOT, which disturbs ld from Prefix. Bug #414335 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -46,13 +46,12 @@ BINDIR=@sbindir@ - MANDIR=@mandir@ - RM=rm -f - --ROOT=./ --ANALYZE_SRCDIR=$(ROOT)base/ -+ANALYZE_SRCDIR=base/ - COMMONDIR=common/ - COMMON_LIB_SRCDIR=$(COMMONDIR)lib/ --ANALYZE_NULL_SRCDIR=$(ROOT)null/ --ANALYZE_SSL_SRCDIR=$(ROOT)ssl/ --ANALYZE_RECORD_SRCDIR=$(ROOT)@RECORD_MOD@/ -+ANALYZE_NULL_SRCDIR=null/ -+ANALYZE_SSL_SRCDIR=ssl/ -+ANALYZE_RECORD_SRCDIR=@RECORD_MOD@/ - include rules.mk - - include $(COMMON_LIB_SRCDIR)/targets.mk diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml index 12203e1a761b..27215b8a217b 100644 --- a/net-analyzer/ssldump/metadata.xml +++ b/net-analyzer/ssldump/metadata.xml @@ -1,11 +1,11 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> <upstream> - <remote-id type="sourceforge">downloads</remote-id> + <remote-id type="github">adulau/ssldump</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild deleted file mode 100644 index 0f7107da7d0b..000000000000 --- a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -AUTOTOOLS_IN_SOURCE_BUILD=1 -AUTOTOOLS_AUTORECONF=1 -inherit autotools eutils toolchain-funcs - -MY_PV=${PV/_beta/b} -MY_P=${PN}-${MY_PV} - -DESCRIPTION="An SSLv3/TLS network protocol analyzer" -HOMEPAGE="http://ssldump.sourceforge.net/" -SRC_URI=" - http://downloads.sourceforge.net/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz -" - -LICENSE="openssl" -SLOT="0" -KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="ssl" - -RDEPEND=" - net-libs/libpcap - ssl? ( >=dev-libs/openssl-1:0= ) -" -DEPEND=" - ${RDEPEND} -" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}"/${PN}-0.9-libpcap-header.patch - "${FILESDIR}"/${PN}-0.9-configure-dylib.patch - "${FILESDIR}"/${PN}-0.9-openssl-0.9.8.compile-fix.patch - "${FILESDIR}"/${PN}-0.9-DLT_LINUX_SLL.patch - "${FILESDIR}"/${PN}-0.9-prefix-fix.patch - "${FILESDIR}"/${PN}-0.9-declaration.patch - "${FILESDIR}"/${PN}-0.9-includes.patch -) - -src_prepare() { - default - - eapply_user - - eautoreconf -} - -src_configure() { - tc-export CC - - econf \ - --with-pcap-inc="${EPREFIX}/usr/include" \ - --with-pcap-lib="${EPREFIX}/usr/$(get_libdir)" \ - $(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '--without-openssl') \ - $(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '--without-openssl') -} - -src_install() { - dosbin ssldump - doman ssldump.1 - dodoc ChangeLog CREDITS README -} diff --git a/net-analyzer/ssldump/ssldump-1.5.ebuild b/net-analyzer/ssldump/ssldump-1.5.ebuild new file mode 100644 index 000000000000..bfac1f000611 --- /dev/null +++ b/net-analyzer/ssldump/ssldump-1.5.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="An SSLv3/TLS network protocol analyzer" +HOMEPAGE="https://github.com/adulau/ssldump/" +SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="dev-libs/json-c:= + dev-libs/openssl:= + net-libs/libnet:1.1 + net-libs/libpcap" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_install() { + dosbin ssldump + doman ssldump.1 + dodoc ChangeLog CREDITS README README.md +} diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest index 8d3a954d335d..ed9de4f1eecb 100644 --- a/net-analyzer/sslscan/Manifest +++ b/net-analyzer/sslscan/Manifest @@ -1,4 +1,6 @@ -DIST sslscan-1.11.12-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f -DIST sslscan-1.11.12-rbsec.tar.gz 56346 BLAKE2B 0079a4be50c037c02bc716341315e0a2164742f270a54fa616ba223b5ecc56bdfa9cec3bc495cd57d4d20cdb4331c622bb78b705f2516fcff228306bb1e5c6ff SHA512 e667cc50f0ec71343b73ca11871a1a53aa9f255c671f16b7c5f33093125a1e60d6e7945e7bd7296f4a71aa6837c823dc939e18982f3e3f831acc061ead9e7ebb -DIST sslscan-1.11.13-rbsec-openssl.tar.gz 5523256 BLAKE2B d8f5aa8bf748310fe1186ec9ab74ecc33425d6fa3db709d94516780d4efadbdd9cf6358798796704dfeb4032ec615298f3b67c8150e314f1e79a4d826c2589b7 SHA512 9bfdac0b6dcbb9e932ef41db9753f7298cf38ddc18731386968289114fd5ed10d81e95523d557b42b431377638d2f62fb710189e7d944ba89979fe5e3437fd3f -DIST sslscan-1.11.13-rbsec.tar.gz 57006 BLAKE2B ea5e2754f5a8218ee1f3aba26e7efe2394fa87b79137955705edc4600d67139f2641ac7b4e7a92f7273878f5b150e3e1b159114c833dc180049688563cf5095b SHA512 51477e5b29a2fc87e2d6c8d76430eeb2a6feb388d47392938b9e2c572acc5926534a19dc249080a066256a1a6cbfe08b162e9f3839386c86116352e5eb57c544 +DIST sslscan-2.1.1.tar.gz 113738 BLAKE2B c31a16e7a174f8c7c476ea525846963cfeff590d92063a7b0c4f2cfd95129517f32d4450e1d839dea648f9f8990fef715692caf331186b0f3cfafe8372927076 SHA512 5178119d67d41cc72afb7d7ae294d7eb8e68b75932038c09bf07936f53807b06bc27b036b105e655be40f025f3afd20c9c4c0d0b2bd28cfa8e6234c5cee53c3d +DIST sslscan-2.1.2.tar.gz 113842 BLAKE2B b4c297b9b8619f559bae28debaeab5fae89ba60823b0bd2d043436e73bbafd3ce688e505678bb4d0182c78caa0f4c086f71e40e900e40d4bea93649f4ab8baca SHA512 2d76c1908b64dc291e8e6688746544386823a2e53d61e13a3ea3109d6ccb4f7dc0199b4c4d8a2ac6d420cf85183d9c9ca42051e351531c54eb138ede01a13277 +DIST sslscan-2.1.3.tar.gz 113917 BLAKE2B 2c3dd21838bca82035dc4d1c48869d4d2c2a18ea603b947d39040744d2f51c4946e6ca6681d734aafc62cf71b6e380b31f6f29c7164c14c2d75e0d1ab5925245 SHA512 62dbb8c97598cdc5bf22cb8311eaba6cff186f6b874d8eb4165a80d0577cd0a13837222fe6ee4e015c353acef2691ff044f4538c04044869805b5455abf36155 +DIST sslscan-openssl-3.0.11.tar.gz 15347070 BLAKE2B e9b0d6c53b66fc66b1dfe46b042adb9bad770fa60555eea65748ef59bd7231ea8882f16ddff7e5ebdd1c164a83264a5d7da37a4f0207a3bd88045cabcebe0ea8 SHA512 4dd485720a335879bd52d0045edf65fd8397b6f6b6afb3e2c756230937304975b3bd95f67933cadde175cae81d420a692fcf7e96b9f9d2b059ea387a8d9ac305 +DIST sslscan-openssl-3.0.12.tar.gz 15352880 BLAKE2B 55a321609e97636173421e738bfb745b6e9a912744fba6d83bfecba199f8684b5625b8547e29305dacda91735cd329fc4c3f5c1f0f919d362a81995073781796 SHA512 8eb6141c1f3d43aa7dd5a5570c99302910feae0d25ab872c58432e5d11d3e330a069715fd4a0cd03234f3fb3e5e9fba38ef59977f7ecf162a2b048476dbb14c6 +DIST sslscan-openssl-3.0.13.tar.gz 15440228 BLAKE2B 00f66b5940b494c36ea8731f05691bf85206c7a93f6313f3ff2cea36d35ce99e71dadc9620188eee8ea0d7be523721af432d7fd74aa59e34634796cd0e4899a6 SHA512 272223fefae76759de40219dd05ff119b99688a807c1af01360470ac5f390426e45463c1445988bf0a6e4cca23a6e0b1649a78121f9d6f69f92563e307a7fd70 diff --git a/net-analyzer/sslscan/files/gentoo.config-1.0.2 b/net-analyzer/sslscan/files/gentoo.config-1.0.2 new file mode 100644 index 000000000000..68d7d0ac1fc1 --- /dev/null +++ b/net-analyzer/sslscan/files/gentoo.config-1.0.2 @@ -0,0 +1,171 @@ +#!/usr/bin/env bash +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 +# +# Openssl doesn't play along nicely with cross-compiling +# like autotools based projects, so let's teach it new tricks. +# +# Review the bundled 'config' script to see why kind of targets +# we can pass to the 'Configure' script. + + +# Testing routines +if [[ $1 == "test" ]] ; then + for c in \ + "arm-gentoo-linux-uclibc |linux-generic32 -DL_ENDIAN" \ + "armv5b-linux-gnu |linux-armv4 -DB_ENDIAN" \ + "x86_64-pc-linux-gnu |linux-x86_64" \ + "alpha-linux-gnu |linux-alpha-gcc" \ + "alphaev56-unknown-linux-gnu |linux-alpha+bwx-gcc" \ + "i686-pc-linux-gnu |linux-elf" \ + "whatever-gentoo-freebsdX.Y |BSD-generic32" \ + "i686-gentoo-freebsdX.Y |BSD-x86-elf" \ + "sparc64-alpha-freebsdX.Y |BSD-sparc64" \ + "ia64-gentoo-freebsd5.99234 |BSD-ia64" \ + "x86_64-gentoo-freebsdX.Y |BSD-x86_64" \ + "hppa64-aldsF-linux-gnu5.3 |linux-generic32 -DB_ENDIAN" \ + "powerpc-gentOO-linux-uclibc |linux-ppc" \ + "powerpc64-unk-linux-gnu |linux-ppc64" \ + "powerpc64le-linux-gnu |linux-ppc64le" \ + "x86_64-apple-darwinX |darwin64-x86_64-cc" \ + "powerpc64-apple-darwinX |darwin64-ppc-cc" \ + "i686-apple-darwinX |darwin-i386-cc" \ + "i386-apple-darwinX |darwin-i386-cc" \ + "powerpc-apple-darwinX |darwin-ppc-cc" \ + "i586-pc-winnt |winnt-parity" \ + "s390-ibm-linux-gnu |linux-generic32 -DB_ENDIAN" \ + "s390x-linux-gnu |linux64-s390x" \ + ;do + CHOST=${c/|*} + ret_want=${c/*|} + ret_got=$(CHOST=${CHOST} "$0") + + if [[ ${ret_want} == "${ret_got}" ]] ; then + echo "PASS: ${CHOST}" + else + echo "FAIL: ${CHOST}" + echo -e "\twanted: ${ret_want}" + echo -e "\twe got: ${ret_got}" + fi + done + exit 0 +fi +[[ -z ${CHOST} && -n $1 ]] && CHOST=$1 + + +# Detect the operating system +case ${CHOST} in + *-aix*) system="aix";; + *-darwin*) system="darwin";; + *-freebsd*) system="BSD";; + *-hpux*) system="hpux";; + *-linux*) system="linux";; + *-solaris*) system="solaris";; + *-winnt*) system="winnt";; + x86_64-*-mingw*) system="mingw64";; + *mingw*) system="mingw";; + *) exit 0;; +esac + + +# Compiler munging +compiler="gcc" +if [[ ${CC} == "ccc" ]] ; then + compiler=${CC} +fi + + +# Detect target arch +machine="" +chost_machine=${CHOST%%-*} +case ${system} in +linux) + case ${chost_machine}:${ABI} in + aarch64*be*) machine="aarch64 -DB_ENDIAN";; + aarch64*) machine="aarch64 -DL_ENDIAN";; + alphaev56*|\ + alphaev[678]*)machine=alpha+bwx-${compiler};; + alpha*) machine=alpha-${compiler};; + armv[4-9]*b*) machine="armv4 -DB_ENDIAN";; + armv[4-9]*) machine="armv4 -DL_ENDIAN";; + arm*b*) machine="generic32 -DB_ENDIAN";; + arm*) machine="generic32 -DL_ENDIAN";; + avr*) machine="generic32 -DL_ENDIAN";; + bfin*) machine="generic32 -DL_ENDIAN";; + # hppa64*) machine=parisc64;; + hppa*) machine="generic32 -DB_ENDIAN";; + i[0-9]86*|\ + x86_64*:x86) machine=elf;; + ia64*) machine=ia64;; + m68*) machine="generic32 -DB_ENDIAN";; + mips*el*) machine="generic32 -DL_ENDIAN";; + mips*) machine="generic32 -DB_ENDIAN";; + powerpc64*le*)machine=ppc64le;; + powerpc64*) machine=ppc64;; + powerpc*le*) machine="generic32 -DL_ENDIAN";; + powerpc*) machine=ppc;; + riscv32*) machine="generic32 -DL_ENDIAN";; + riscv64*) machine="generic64 -DL_ENDIAN";; + # sh64*) machine=elf;; + sh*b*) machine="generic32 -DB_ENDIAN";; + sh*) machine="generic32 -DL_ENDIAN";; + # TODO: Might want to do -mcpu probing like glibc to determine a + # better default for sparc-linux-gnu targets. This logic will + # break v7 and older systems when they use it. + sparc*v7*) machine="generic32 -DB_ENDIAN";; + sparc64*) machine=sparcv9 system=linux64;; + sparc*v9*) machine=sparcv9;; + sparc*v8*) machine=sparcv8;; + sparc*) machine=sparcv8;; + s390x*) machine=s390x system=linux64;; + s390*) machine="generic32 -DB_ENDIAN";; + x86_64*:x32) machine=x32;; + x86_64*) machine=x86_64;; + esac + ;; +BSD) + case ${chost_machine} in + alpha*) machine=generic64;; + i[6-9]86*) machine=x86-elf;; + ia64*) machine=ia64;; + sparc64*) machine=sparc64;; + x86_64*) machine=x86_64;; + *) machine=generic32;; + esac + ;; +aix) + machine=${compiler} + ;; +darwin) + case ${chost_machine} in + powerpc64) machine=ppc-cc; system=${system}64;; + powerpc) machine=ppc-cc;; + i?86*) machine=i386-cc;; + x86_64) machine=x86_64-cc; system=${system}64;; + esac + ;; +hpux) + case ${chost_machine} in + ia64) machine=ia64-${compiler} ;; + esac + ;; +solaris) + case ${chost_machine} in + i386) machine=x86-${compiler} ;; + x86_64*) machine=x86_64-${compiler}; system=${system}64;; + sparcv9*) machine=sparcv9-${compiler}; system=${system}64;; + sparc*) machine=sparcv8-${compiler};; + esac + ;; +winnt) + machine=parity + ;; +mingw*) + # special case ... no xxx-yyy style name + echo ${system} + ;; +esac + + +# If we have something, show it +[[ -n ${machine} ]] && echo ${system}-${machine} diff --git a/net-analyzer/sslscan/metadata.xml b/net-analyzer/sslscan/metadata.xml index a67d5ce56426..7684d0be8b63 100644 --- a/net-analyzer/sslscan/metadata.xml +++ b/net-analyzer/sslscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>graaff@gentoo.org</email> diff --git a/net-analyzer/sslscan/sslscan-1.11.12.ebuild b/net-analyzer/sslscan/sslscan-1.11.12.ebuild deleted file mode 100644 index 6d30e8c8c250..000000000000 --- a/net-analyzer/sslscan/sslscan-1.11.12.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Upstream now builds against the openssl 1.0.x fork by PeterMosmans -MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be - -inherit eutils toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -MY_FORK="rbsec" -SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz - static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libressl +static" - -DEPEND="libressl? ( dev-libs/libressl )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-${MY_FORK}" - -src_prepare() { - if use static; then - ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die - touch .openssl_is_fresh || die - - sed -i -e '/openssl\/.git/,/fi/d' \ - -e '/openssl test/d' Makefile || die - - fi - - default -} - -src_compile() { - if use static; then - emake static - else - emake - fi -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild deleted file mode 100644 index dfa4053fb25f..000000000000 --- a/net-analyzer/sslscan/sslscan-1.11.13-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Upstream now builds against the openssl 1.0.x fork by PeterMosmans -MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be - -inherit eutils toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -MY_FORK="rbsec" -SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz - https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-${MY_FORK}" - -src_prepare() { - ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die - touch .openssl_is_fresh || die - - sed -i -e '/openssl\/.git/,/fi/d' \ - -e '/openssl test/d' Makefile || die - - default -} - -src_compile() { - emake static -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-1.11.13.ebuild b/net-analyzer/sslscan/sslscan-1.11.13.ebuild deleted file mode 100644 index 0a071a7e55af..000000000000 --- a/net-analyzer/sslscan/sslscan-1.11.13.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Upstream now builds against the openssl 1.0.x fork by PeterMosmans -MOSMANS_OPENSSL_COMMIT=c9ba19c8b7fd131137373dbd1fccd6a8bb0628be - -inherit eutils toolchain-funcs - -DESCRIPTION="Fast SSL configuration scanner" -HOMEPAGE="https://github.com/rbsec/sslscan" -MY_FORK="rbsec" -SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz - static? ( https://github.com/PeterMosmans/openssl/archive/${MOSMANS_OPENSSL_COMMIT}.tar.gz -> ${P}-${MY_FORK}-openssl.tar.gz )" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl +static" - -DEPEND="libressl? ( dev-libs/libressl )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${P}-${MY_FORK}" - -src_prepare() { - if use static; then - ln -s ../openssl-${MOSMANS_OPENSSL_COMMIT} openssl || die - touch .openssl_is_fresh || die - - sed -i -e '/openssl\/.git/,/fi/d' \ - -e '/openssl test/d' Makefile || die - - fi - - default -} - -src_compile() { - if use static; then - emake static - else - emake - fi -} - -src_install() { - DESTDIR="${D}" emake install - - dodoc Changelog README.md -} diff --git a/net-analyzer/sslscan/sslscan-2.1.1.ebuild b/net-analyzer/sslscan/sslscan-2.1.1.ebuild new file mode 100644 index 000000000000..4a30e17b6ac3 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="openssl-3.0.11" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + # Copied from dev-libs/openssl + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + default +} + +src_configure() { + # Copied from dev-libs/openssl + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslscan/sslscan-2.1.2.ebuild b/net-analyzer/sslscan/sslscan-2.1.2.ebuild new file mode 100644 index 000000000000..b77ee2587f92 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="openssl-3.0.12" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + # Copied from dev-libs/openssl + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + default +} + +src_configure() { + # Copied from dev-libs/openssl + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild b/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild new file mode 100644 index 000000000000..85086045d0da --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.3-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="openssl-3.0.13" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + # Copied from dev-libs/openssl + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + default +} + +src_configure() { + # Copied from dev-libs/openssl + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslscan/sslscan-2.1.3.ebuild b/net-analyzer/sslscan/sslscan-2.1.3.ebuild new file mode 100644 index 000000000000..aa63120b6c89 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-2.1.3.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +# sslscan builds against a static openssl library to allow weak ciphers +# to be enabled so that they can be tested. +OPENSSL_RELEASE_TAG="openssl-3.0.12" + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +SRC_URI="https://github.com/rbsec/sslscan/archive/${PV}.tar.gz -> ${P}.tar.gz + https://github.com/openssl/openssl/archive/${OPENSSL_RELEASE_TAG}.tar.gz -> ${PN}-${OPENSSL_RELEASE_TAG}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +# Requires a docker environment +RESTRICT="test" + +# S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + ln -s ../openssl-${OPENSSL_RELEASE_TAG} openssl || die + touch .openssl_is_fresh || die + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + # Copied from dev-libs/openssl + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die + chmod a+rx gentoo.config || die + + default +} + +src_configure() { + # Copied from dev-libs/openssl + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + # Clean out hardcoded flags that openssl uses + local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \ + -e 's:^CFLAGS=::' \ + -e 's:\(^\| \)-fomit-frame-pointer::g' \ + -e 's:\(^\| \)-O[^ ]*::g' \ + -e 's:\(^\| \)-march=[^ ]*::g' \ + -e 's:\(^\| \)-mcpu=[^ ]*::g' \ + -e 's:\(^\| \)-m[^ ]*::g' \ + -e 's:^ *::' \ + -e 's: *$::' \ + -e 's: \+: :g' \ + -e 's:\\:\\\\:g' + ) + + # Now insert clean default flags with user flags + sed -i \ + -e "/^CFLAGS=/s|=.*|=${DEFAULT_CFLAGS} ${CFLAGS}|" \ + -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" \ + Makefile || die +} + +src_compile() { + emake static +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslsplit/Manifest b/net-analyzer/sslsplit/Manifest index c06f6601455f..99d65e3f8129 100644 --- a/net-analyzer/sslsplit/Manifest +++ b/net-analyzer/sslsplit/Manifest @@ -1,2 +1 @@ -DIST sslsplit-0.5.4.tar.gz 1750390 BLAKE2B 4ab9014c91938397c469bdc49dd307c47375047f018a5caaf8b32eb84596d2fbe623702349dc85776071363b2167c6ee8918604c6bf2843d357ffe64df36bb1b SHA512 5220cbf26a2d5201c4b36207ec52b290f95002c6d5a4d828868d163cff528095add8b333ecb844b86b4e83f62934aa840f80d3838d00997acd50b6e30cee7aed DIST sslsplit-0.5.5.tar.gz 1846850 BLAKE2B b223491c480070dd9718804f0ceb8fec9fe519cf0d189fd9bf9cc4dce5ae00d93227dca42349b42d2b82c62d0d92c451442670f6eae2f8d2beedef437907299b SHA512 f236f1ccce8bdb4a09659551defd73b73fbf660ceedace6ffbbb687c1de4488f74a23274b53a67e7001dfcdbd0ede7270ba8261feab633a25ae9f57cce468f39 diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch deleted file mode 100644 index 65959f3e1090..000000000000 --- a/net-analyzer/sslsplit/files/sslsplit-0.5.4-install.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/GNUmakefile b/GNUmakefile -index ebdcf0a..02cb4b7 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -519,21 +519,12 @@ $(TARGET).conf.5: $(TARGET).conf.5.in $(MKFS) FORCE - - install: $(TARGET) $(TARGET).conf $(TARGET).1 $(TARGET).conf.5 - test -d $(DESTDIR)$(PREFIX)/bin || $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin -- test -d $(DESTDIR)$(PREFIX)/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)$(PREFIX)/sslsplit - test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 || \ - $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - test -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 || \ - $(MKDIR) -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man5 -- test -d $(DESTDIR)/var/log/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)/var/log/$(TARGET) -- test -d $(DESTDIR)/var/run/$(TARGET) || \ -- $(MKDIR) -p $(DESTDIR)/var/run/$(TARGET) - $(INSTALL) $(BINOWNERFLAGS) -m $(BINMODE) \ - $(TARGET) $(DESTDIR)$(PREFIX)/bin/ -- $(INSTALL) $(CNFOWNERFLAGS) -m $(CNFMODE) \ -- $(TARGET).conf \ -- $(DESTDIR)$(PREFIX)/$(TARGET)/$(TARGET).conf.sample - $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \ - $(TARGET).1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/ - $(INSTALL) $(MANOWNERFLAGS) -m $(MANMODE) \ diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch new file mode 100644 index 000000000000..dd6ae812efb6 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libcrypto-pkgconfig.patch @@ -0,0 +1,23 @@ +Use pkgconfig for localization of libcrypto. This is needed for tests in +multilib systems. + +diff --git a/extra/engine/GNUmakefile b/extra/engine/GNUmakefile +index b50717b..3712ad6 100644 +--- a/extra/engine/GNUmakefile ++++ b/extra/engine/GNUmakefile +@@ -16,9 +16,9 @@ else + SUFFIX:= so + endif + +-CFLAGS+= -fPIC -I$(OPENSSL_BASE)/include +-LDFLAGS+= -L$(OPENSSL_BASE)/lib +-LIBS+= -lcrypto ++CFLAGS+= -fPIC $(shell pkg-config --cflags libcrypto) ++LDFLAGS+= $(shell pkg-config --libs-only-L libcrypto) ++LIBS+= $(shell pkg-config --libs-only-l libcrypto) + + TARGET= dummy-engine + +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch new file mode 100644 index 000000000000..5eebf8d4deaf --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-libnet-pkgconfig.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] locate libnet with pkgconfig + +This is partially reverted from upstream commit 46a55de8040a ("Refactor +location of packages, improve libnet detection") + +diff --git a/GNUmakefile b/GNUmakefile +index cc7197e..2343272 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -277,6 +277,10 @@ PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_openssl \ + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libevent_pthreads \ + && echo libevent_pthreads) + endif ++ifndef LIBNET_BASE ++PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libnet \ ++ && echo libnet) ++endif + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + ifndef LIBPCAP_BASE + PKGS+= $(shell $(PKGCONFIG) $(PCFLAGS) --exists libpcap \ +@@ -333,7 +337,7 @@ CHECK_MISSING:= 1 + endif + endif + +-# Always search filesystem for libnet because libnet-config is unreliable ++ifeq (,$(filter libnet,$(PKGS))) + ifneq ($(filter -DWITHOUT_MIRROR,$(FEATURES)),-DWITHOUT_MIRROR) + LIBNET_FOUND:= $(call locate,libnet,include/libnet-1.1/libnet.h,$(LIBNET_BASE)) + ifdef LIBNET_FOUND +@@ -347,6 +351,7 @@ $(error dependency 'libnet' not found; \ + install it or point LIBNET_BASE to base path) + endif + endif ++endif + + ifdef OPENSSL_FOUND + PKG_CPPFLAGS+= -I$(OPENSSL_FOUND)/include +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch new file mode 100644 index 000000000000..10807bee3899 --- /dev/null +++ b/net-analyzer/sslsplit/files/sslsplit-0.5.5-openssl3.patch @@ -0,0 +1,31 @@ +From: Soner Tari <sonertari@gmail.com> +Date: Fri, 4 Feb 2022 19:46:58 +0300 +Subject: [PATCH] Fix build errors with OpenSSL 3.0.x, but not deprecation + warnings, issue #290 + +This patch fixes errors only, so that build succeeds, but deprecation +warnings remain. It seems we need considerable changes to replace those +deprecated functions in the warnings. +--- + +Upstream-commit: e17de8454a65 ("Fix build errors with OpenSSL 3.0.x, but not deprecation warnings, issue #290") +Upstream-issue: https://github.com/droe/sslsplit/issues/290 + +diff --git a/pxyconn.c b/pxyconn.c +index e69de20..09a8b80 100644 +--- a/pxyconn.c ++++ b/pxyconn.c +@@ -72,6 +72,10 @@ bufferevent_openssl_set_allow_dirty_shutdown(UNUSED struct bufferevent *bev, + } + #endif /* LIBEVENT_VERSION_NUMBER < 0x02010000 */ + ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++#define ERR_GET_FUNC(x) 0 ++#define ERR_func_error_string(x) "" ++#endif + + /* + * Maximum size of data to buffer per connection direction before +-- +2.35.1 + diff --git a/net-analyzer/sslsplit/metadata.xml b/net-analyzer/sslsplit/metadata.xml index 614c7c40e2e1..c83f57067941 100644 --- a/net-analyzer/sslsplit/metadata.xml +++ b/net-analyzer/sslsplit/metadata.xml @@ -1,14 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>arkamar@atlas.cz</email> + <email>arkamar@gentoo.org</email> <name>Petr Vaněk</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription lang="en"> SSLsplit is a tool for man-in-the-middle attacks against SSL/TLS encrypted network connections. It is intended to be useful for network diff --git a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild deleted file mode 100644 index 7960cc011edf..000000000000 --- a/net-analyzer/sslsplit/sslsplit-0.5.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" - -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_musl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/droe/${PN}" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/libevent[ssl,threads] - dev-libs/openssl:0= - net-libs/libnet:1.1 - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="" - -PATCHES=( - "${FILESDIR}/${P}-install.patch" -) - -src_prepare() { - default - - use elibc_musl && append-libs "-lfts" - - sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ - -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die - sed -i '/opts_suite/d' main.t.c || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install - dodoc AUTHORS.md NEWS.md README.md sslsplit.conf -} diff --git a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild b/net-analyzer/sslsplit/sslsplit-0.5.5-r1.ebuild index 2aa8a7e58600..bd815603e0c1 100644 --- a/net-analyzer/sslsplit/sslsplit-0.5.5.ebuild +++ b/net-analyzer/sslsplit/sslsplit-0.5.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,11 +6,14 @@ EAPI=7 inherit flag-o-matic DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" +HOMEPAGE=" + https://www.roe.ch/SSLsplit + https://github.com/droe/sslsplit +" LICENSE="BSD-2" SLOT="0" -IUSE="elibc_musl test" +IUSE="test" RESTRICT="!test? ( test )" if [[ ${PV} == *9999 ]] ; then @@ -19,17 +22,24 @@ if [[ ${PV} == *9999 ]] ; then EGIT_BRANCH="develop" else SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi RDEPEND=" - dev-libs/libevent[ssl,threads] + dev-libs/libevent:=[ssl,threads(+)] dev-libs/openssl:0= net-libs/libnet:1.1 + net-libs/libpcap elibc_musl? ( sys-libs/fts-standalone )" DEPEND="${RDEPEND} test? ( dev-libs/check )" -BDEPEND="" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-openssl3.patch" + "${FILESDIR}/${P}-libnet-pkgconfig.patch" + "${FILESDIR}/${P}-libcrypto-pkgconfig.patch" +) src_prepare() { default diff --git a/net-analyzer/sslsplit/sslsplit-9999.ebuild b/net-analyzer/sslsplit/sslsplit-9999.ebuild deleted file mode 100644 index 2aa8a7e58600..000000000000 --- a/net-analyzer/sslsplit/sslsplit-9999.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic - -DESCRIPTION="Transparent SSL/TLS interception" -HOMEPAGE="https://www.roe.ch/SSLsplit" - -LICENSE="BSD-2" -SLOT="0" -IUSE="elibc_musl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/droe/${PN}" - EGIT_BRANCH="develop" -else - SRC_URI="https://github.com/droe/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - dev-libs/libevent[ssl,threads] - dev-libs/openssl:0= - net-libs/libnet:1.1 - elibc_musl? ( sys-libs/fts-standalone )" -DEPEND="${RDEPEND} - test? ( dev-libs/check )" -BDEPEND="" - -src_prepare() { - default - - use elibc_musl && append-libs "-lfts" - - sed -i -e 's/-D_FORTIFY_SOURCE=2 //g' \ - -e 's/\<FEATURES\>/SSLSPLIT_FEATURES/g' GNUmakefile || die - sed -i '/opts_suite/d' main.t.c || die -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" SYSCONFDIR="${EPREFIX}/etc" install - dodoc AUTHORS.md NEWS.md README.md -} diff --git a/net-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml index 851f9e832157..164fd2d779f4 100644 --- a/net-analyzer/ssmping/metadata.xml +++ b/net-analyzer/ssmping/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild index a9dc609c45f5..13fb78913e09 100644 --- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild +++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild @@ -1,18 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Tool for testing multicast connectivity" HOMEPAGE="http://www.venaas.no/multicast/ssmping/" -LICENSE="public-domain" SRC_URI="http://www.venaas.no/multicast/ssmping/${P}.tar.gz" + +LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" + +PATCHES=( + "${FILESDIR}"/${PN}-0.9-build.patch +) src_prepare() { - epatch "${FILESDIR}"/${PN}-0.9-build.patch + default tc-export CC } diff --git a/net-analyzer/suricata/Manifest b/net-analyzer/suricata/Manifest index ac5ea56c85b3..fdaacd396d1e 100644 --- a/net-analyzer/suricata/Manifest +++ b/net-analyzer/suricata/Manifest @@ -1 +1,2 @@ -DIST suricata-5.0.1.tar.gz 23721536 BLAKE2B 529837e8e4d6c33d2093df8208bf03519e0d60deef92eadf9d0a44b7416eae2f900b2f72349815acb86d9bdd9d4253bbc5d7c4c1a34157f544982b0788291624 SHA512 db0797a7992abf0ddf170cb603fdac06b0ff92278bb91343860bccbbe029ea0e83131dfb9805ca44bcbbe3925502119259e350a17e94209b21d1f8b610d965a6 +DIST suricata-7.0.5.tar.gz 23612189 BLAKE2B 9a44e4561edcc8909853b88779aa520a79b684ca9114479a95b2b34f8e34b6a0f5887d4b332dddb9da225335d7642089345e7f245a1ebce68f42f38126eb4b58 SHA512 4eae28a78e1e9595c7f37215e9cccdf417235eadf3c8a9dc4cb531d7dc3fb353c903154ee745df7a44620d299998b84f15d6db95e5f0562744ff7cbaac398d34 +DIST suricata-7.0.5.tar.gz.sig 566 BLAKE2B f1e4885f92d13e3168ae44b2fd2b134e1eee9a71f4d92ee8e60df65af3558f4dfa64919955dc60d597d0ef6c6a92b505ab5974fc2f07cd8dc8b4d889eaa4b4c2 SHA512 5f6c2904441c0cb414990a89a2c5a640da9ef25b572512cb2dbb607c7e469186982299acc98414067f8119c8e7c2d433f1b8cf38d1a3c95235a493311230bfc7 diff --git a/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch new file mode 100644 index 000000000000..69a857408eee --- /dev/null +++ b/net-analyzer/suricata/files/suricata-5.0.7_configure-no-hyperscan-automagic.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -729,8 +729,11 @@ + fi + + # libhs +- enable_hyperscan="no" +- ++ AC_ARG_ENABLE(hyperscan, ++ AS_HELP_STRING([--enable-hyperscan], [Enable high-performance regex matching with hyperscan]), ++ [enable_hyperscan=$enableval], ++ [enable_hyperscan=no]) ++ if test "x$enable_hyperscan" != "xno"; then + # Try pkg-config first: + PKG_CHECK_MODULES([libhs], libhs,, [with_pkgconfig_libhs=no]) + if test "$with_pkgconfig_libhs" != "no"; then +@@ -765,6 +768,7 @@ + enable_hyperscan="no" + fi + fi ++ fi + AS_IF([test "x$enable_hyperscan" = "xyes"], [AC_DEFINE([BUILD_HYPERSCAN], [1], [Intel Hyperscan support enabled])]) + + # libyaml diff --git a/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch index ef1b1f63ad4f..03e0f1cda944 100644 --- a/net-analyzer/suricata/files/suricata-5.0.1_default-config.patch +++ b/net-analyzer/suricata/files/suricata-6.0.0_default-config.patch @@ -1,6 +1,6 @@ --- a/suricata.yaml.in +++ b/suricata.yaml.in -@@ -203,8 +203,9 @@ +@@ -209,8 +209,9 @@ # https://suricata.readthedocs.io/en/latest/output/eve/eve-json-output.html#dns-v1-format # As of Suricata 5.0, version 2 of the eve dns output @@ -12,10 +12,10 @@ # Enable/disable this logger. Default: enabled. #enabled: yes -@@ -978,9 +979,9 @@ +@@ -988,9 +989,9 @@ ## - # Run suricata as user and group. + # Run Suricata with a specific user-id and group-id: -#run-as: -# user: suri -# group: suri @@ -23,5 +23,5 @@ + user: suricata + group: suricata - # Some logging module will use that name in event as identifier. The default + # Some logging modules will use that name in event as identifier. The default # value is the hostname diff --git a/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch b/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch new file mode 100644 index 000000000000..07fddac0a6d2 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-7.0.2_configure-no-sphinx-pdflatex-automagic.patch @@ -0,0 +1,20 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -2231,7 +2231,7 @@ + fi + + # sphinx-build for documentation, and also check for a new enough version +- AC_PATH_PROG([SPHINX_BUILD], [sphinx-build], [no]) ++ SPHINX_BUILD="no" + if test "$SPHINX_BUILD" != "no"; then + MIN_SPHINX_BUILD_VERSION="3.4.3" + sphinx_build_version=$($SPHINX_BUILD --version 2>&1 | cut -d' ' -f2-) +@@ -2257,7 +2257,7 @@ + AM_CONDITIONAL([HAVE_SURICATA_MAN], [test "x$have_suricata_man" = "xyes"]) + + # pdflatex for the pdf version of the user manual +- AC_PATH_PROG(HAVE_PDFLATEX, pdflatex, "no") ++ HAVE_PDFLATEX="no" + if test "$HAVE_PDFLATEX" = "no"; then + enable_pdflatex=no + fi diff --git a/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch new file mode 100644 index 000000000000..302f9bb382f3 --- /dev/null +++ b/net-analyzer/suricata/files/suricata-7.0.5_configure-fortify_source.patch @@ -0,0 +1,18 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -339,15 +339,6 @@ + [AC_MSG_RESULT(no)]) + CFLAGS="${TMPCFLAGS}" + +- #compile-time best-practices errors for certain libc functions, provides checks of buffer lengths and memory regions +- AC_MSG_CHECKING(for -D_FORTIFY_SOURCE=2) +- TMPCFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} -D_FORTIFY_SOURCE=2" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[SECCFLAGS="${SECCFLAGS} -D_FORTIFY_SOURCE=2" +- AC_MSG_RESULT(yes)], +- [AC_MSG_RESULT(no)]) +- CFLAGS="${TMPCFLAGS}" +- + #compile-time warnings about misuse of format strings + AC_MSG_CHECKING(for -Wformat -Wformat-security) + TMPCFLAGS="${CFLAGS}" diff --git a/net-analyzer/suricata/files/suricata-5.0.1-conf b/net-analyzer/suricata/files/suricata.confd index 7f22113dbf0d..7f22113dbf0d 100644 --- a/net-analyzer/suricata/files/suricata-5.0.1-conf +++ b/net-analyzer/suricata/files/suricata.confd diff --git a/net-analyzer/suricata/files/suricata-5.0.1-init b/net-analyzer/suricata/files/suricata.initd index 89f92803cedf..154636ef828e 100644 --- a/net-analyzer/suricata/files/suricata-5.0.1-init +++ b/net-analyzer/suricata/files/suricata.initd @@ -26,7 +26,7 @@ fi SURICATAUSER=${SURICATAUSER:-${SURICATA_USER}} SURICATAGROUP=${SURICATAGROUP:-${SURICATA_GROUP}} [ -e ${SURICATACONF} ] && SURICATAOPTS="-c ${SURICATACONF} ${SURICATAOPTS}" -[[ -z "${SURICATA_MAX_WAIT_ON_STOP// }" ]] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}" +[ -z "${SURICATA_MAX_WAIT_ON_STOP}" ] || SURICATA_RETRY="--retry ${SURICATA_MAX_WAIT_ON_STOP}" description="Suricata IDS/IPS" extra_commands="checkconfig dump" diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml index 457a2fbd2e8a..a409aa734d3c 100644 --- a/net-analyzer/suricata/metadata.xml +++ b/net-analyzer/suricata/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>marecki@gentoo.org</email> @@ -7,12 +7,12 @@ </maintainer> <use> <flag name="af-packet">Enable AF_PACKET support</flag> + <flag name="af-xdp">Enable AF_XDP support</flag> <flag name="bpf">Enable support for eBPF (as well as XDP if supported by the kernel and the NIC driver) for low-level, high-speed packet processing</flag> <flag name="control-socket">Enable unix socket</flag> - <flag name="cuda">Enable NVIDIA Cuda computations support</flag> <flag name="detection">Enable detection modules</flag> - <flag name="logrotate">Install logrotate rule</flag> + <flag name="hyperscan">Enable high-performance regex matching with Hyperscan</flag> <flag name="lz4">Enable support for compressed pcap logging using the LZ4 algorithm</flag> <flag name="nflog">Enable libnetfilter_log support</flag> <flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag> diff --git a/net-analyzer/suricata/suricata-5.0.1-r1.ebuild b/net-analyzer/suricata/suricata-7.0.5.ebuild index e74f32fee51a..d6d60eada0b0 100644 --- a/net-analyzer/suricata/suricata-5.0.1-r1.ebuild +++ b/net-analyzer/suricata/suricata-7.0.5.ebuild @@ -1,87 +1,100 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{10..12} ) -inherit autotools flag-o-matic linux-info python-single-r1 systemd +inherit autotools flag-o-matic linux-info lua-single python-single-r1 systemd tmpfiles verify-sig DESCRIPTION="High performance Network IDS, IPS and Network Security Monitoring engine" -HOMEPAGE="https://suricata-ids.org/" -SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz" +HOMEPAGE="https://suricata.io/" +SRC_URI="https://www.openinfosecfoundation.org/download/${P}.tar.gz + verify-sig? ( https://www.openinfosecfoundation.org/download/${P}.tar.gz.sig )" LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+af-packet bpf control-socket cuda debug +detection geoip hardened logrotate lua luajit lz4 nflog +nfqueue redis systemd test" +SLOT="0/7" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="+af-packet af-xdp bpf control-socket cuda debug +detection geoip hardened hyperscan lua lz4 nflog +nfqueue redis systemd test" +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/openinfosecfoundation.org.asc" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE} - ?? ( lua luajit ) - bpf? ( af-packet )" + af-xdp? ( bpf ) + bpf? ( af-packet ) + lua? ( ${LUA_REQUIRED_USE} )" -CDEPEND="acct-group/suricata +RDEPEND="${PYTHON_DEPS} + acct-group/suricata acct-user/suricata - dev-libs/jansson - dev-libs/libpcre + dev-libs/jansson:= + dev-libs/libpcre2 dev-libs/libyaml net-libs/libnet:* net-libs/libnfnetlink dev-libs/nspr dev-libs/nss $(python_gen_cond_dep ' - dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] ') - >=net-libs/libhtp-0.5.32 + >=net-libs/libhtp-0.5.48 net-libs/libpcap sys-apps/file sys-libs/libcap-ng - bpf? ( >=dev-libs/libbpf-0.0.6 ) + af-xdp? ( net-libs/xdp-tools ) + bpf? ( dev-libs/libbpf ) cuda? ( dev-util/nvidia-cuda-toolkit ) - geoip? ( dev-libs/libmaxminddb ) - logrotate? ( app-admin/logrotate ) - lua? ( dev-lang/lua:* ) - luajit? ( dev-lang/luajit:* ) + geoip? ( dev-libs/libmaxminddb:= ) + hyperscan? ( dev-libs/vectorscan:= ) + lua? ( ${LUA_DEPS} ) lz4? ( app-arch/lz4 ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) - redis? ( dev-libs/hiredis )" -DEPEND="${CDEPEND} - >=sys-devel/autoconf-2.69-r5 + redis? ( dev-libs/hiredis:= )" +DEPEND="${RDEPEND} + >=dev-build/autoconf-2.69-r5 virtual/rust" -RDEPEND="${CDEPEND} - ${PYTHON_DEPS}" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oisf-20200807 )" PATCHES=( "${FILESDIR}/${PN}-5.0.1_configure-no-lz4-automagic.patch" - "${FILESDIR}/${PN}-5.0.1_default-config.patch" + "${FILESDIR}/${PN}-5.0.7_configure-no-hyperscan-automagic.patch" + "${FILESDIR}/${PN}-6.0.0_default-config.patch" + "${FILESDIR}/${PN}-7.0.2_configure-no-sphinx-pdflatex-automagic.patch" + "${FILESDIR}/${PN}-7.0.5_configure-fortify_source.patch" ) pkg_pretend() { + if use af-xdp && use kernel_linux; then + if kernel_is -lt 4 18; then + ewarn "Kernel 4.18 or newer is required for AF_XDP" + fi + fi + if use bpf && use kernel_linux; then if kernel_is -lt 4 15; then ewarn "Kernel 4.15 or newer is necessary to use all XDP features like the CPU redirect map" fi CONFIG_CHECK="~XDP_SOCKETS" - ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata will to load XDP programs. " + ERROR_XDP_SOCKETS="CONFIG_XDP_SOCKETS is not set, making it impossible for Suricata to load XDP programs. " ERROR_XDP_SOCKETS+="Other eBPF features should work normally." check_extra_config fi } src_prepare() { - # Bug #707204 - append-cflags $(test-flags-CC -fcommon) - default - sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" + sed -ie 's/docdir =.*/docdir = ${datarootdir}\/doc\/'${PF}'\//' "${S}/doc/Makefile.am" || die eautoreconf } src_configure() { + # Bug #861242 + filter-lto + local myeconfargs=( "--localstatedir=/var" \ "--runstatedir=/run" \ @@ -89,6 +102,7 @@ src_configure() { "--enable-gccmarch-native=no" \ "--enable-python" \ $(use_enable af-packet) \ + $(use_enable af-xdp) \ $(use_enable bpf ebpf) \ $(use_enable control-socket unix-socket) \ $(use_enable cuda) \ @@ -96,8 +110,7 @@ src_configure() { $(use_enable geoip) \ $(use_enable hardened gccprotect) \ $(use_enable hardened pie) \ - $(use_enable lua) \ - $(use_enable luajit) \ + $(use_enable hyperscan) \ $(use_enable lz4) \ $(use_enable nflog) \ $(use_enable nfqueue) \ @@ -105,10 +118,18 @@ src_configure() { $(use_enable test unittests) \ "--disable-coccinelle" ) + if use lua; then + if use lua_single_target_luajit; then + myeconfargs+=( --enable-luajit ) + else + myeconfargs+=( --enable-lua ) + fi + fi if use debug; then myeconfargs+=( $(use_enable debug) ) # so we can get a backtrace according to "reporting bugs" on upstream web site + QA_FLAGS_IGNORED="usr/bin/${PN}" CFLAGS="-ggdb -O0" econf ${myeconfargs[@]} else econf ${myeconfargs[@]} @@ -118,9 +139,11 @@ src_configure() { src_install() { emake DESTDIR="${D}" install python_optimize + # Bug #878855 + python_fix_shebang "${ED}"/usr/bin/ if use bpf; then - rm -f ebpf/Makefile.{am,in} + rm -f ebpf/Makefile.{am,in} || die dodoc -r ebpf/ keepdir /usr/libexec/suricata/ebpf fi @@ -133,22 +156,22 @@ src_install() { fowners -R ${PN}: "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" fperms 750 "/var/lib/${PN}" "/var/log/${PN}" "/etc/${PN}" - fperms 2750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" + fperms 6750 "/var/lib/${PN}/rules" "/var/lib/${PN}/update" - newinitd "${FILESDIR}/${PN}-5.0.1-init" ${PN} - newconfd "${FILESDIR}/${PN}-5.0.1-conf" ${PN} + newinitd "${FILESDIR}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} systemd_dounit "${FILESDIR}"/${PN}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf - if use logrotate; then - insopts -m0644 - insinto /etc/logrotate.d - newins etc/${PN}.logrotate ${PN} - fi + insopts -m0644 + insinto /etc/logrotate.d + newins etc/${PN}.logrotate ${PN} } pkg_postinst() { - elog "" + tmpfiles_process ${PN}.conf + + elog if use systemd; then elog "Suricata requires either the mode of operation (e.g. --af-packet) or the interface to listen on (e.g. -i eth0)" elog "to be specified on the command line. The provided systemd unit launches Suricata in af-packet mode and relies" @@ -159,7 +182,7 @@ pkg_postinst() { else elog "The ${PN} init script expects to find the path to the configuration" elog "file as well as extra options in /etc/conf.d." - elog "" + elog elog "To create more than one ${PN} service, simply create a new .yaml file for it" elog "then create a symlink to the init script from a link called" elog "${PN}.foo - like so" @@ -168,12 +191,12 @@ pkg_postinst() { elog " cd /etc/init.d" elog " ln -s ${PN} ${PN}.foo" elog "Then edit /etc/conf.d/${PN} and make sure you specify sensible options for foo." - elog "" + elog elog "You can create as many ${PN}.foo* services as you wish." fi if use bpf; then - elog "" + elog elog "eBPF/XDP files must be compiled (using sys-devel/clang[llvm_targets_BPF]) before use" elog "because their configuration is hard-coded. You can find the default ones in" elog " ${EPREFIX}/usr/share/doc/${PF}/ebpf" @@ -183,19 +206,17 @@ pkg_postinst() { fi if use debug; then - elog "" + elog elog "You have enabled the debug USE flag. Please read this link to report bugs upstream:" elog "https://redmine.openinfosecfoundation.org/projects/suricata/wiki/Reporting_Bugs" elog "You need to also ensure the FEATURES variable in make.conf contains the" elog "'nostrip' option to produce useful core dumps or back traces." fi - elog "" - elog "To download and install an initial set of rules, run:" - elog " emerge --config =${CATEGORY}/${PF}" - elog "" -} - -pkg_config() { - suricata-update + elog + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "To download and install an initial set of rules, run:" + elog " suricata-update" + fi + elog } diff --git a/net-analyzer/symon/Manifest b/net-analyzer/symon/Manifest index c8e4c0f69a7c..98d712d76e18 100644 --- a/net-analyzer/symon/Manifest +++ b/net-analyzer/symon/Manifest @@ -1,2 +1 @@ -DIST symon-2.87.tar.gz 107607 BLAKE2B 44f42ceff818c0643b02f59715ddc9b886e480233cc63c0c29f6a234b7c510d5e175a964b1cd3fadbf9b3d95642d79f947921e88b979f71650a81798acea7429 SHA512 8fce5cf2312f1d7ba78f693da2df9fea3bbeacae0c1b65f79c5f2444fcf07e07b11a5a7229ba762ac47ce484429a42f37bcbcc9e001fce0e5813a0dffd57a953 DIST symon-2.88.tar.gz 110149 BLAKE2B 918ecf6c87a363e85ce67f9890b2ff6d326f14f896cb85ee6e501b962cb4e476b8fab9d6a96857e63e34aa2ebd2036fbb507c52d74b66b59ff7d77c7bc571474 SHA512 d2079caefcde4cf017460560826c7bf9e97aee9dcce886cd0a85d671bdad877c513889c9b7cd67844dbb4161ce6b6e6f99709475dd2591141f1bc61ee11e8173 diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml index ed375df28cbc..324d9ed6fee9 100644 --- a/net-analyzer/symon/metadata.xml +++ b/net-analyzer/symon/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/symon/symon-2.87.ebuild b/net-analyzer/symon/symon-2.87.ebuild deleted file mode 100644 index 45cfd03c95d2..000000000000 --- a/net-analyzer/symon/symon-2.87.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils perl-module toolchain-funcs - -DESCRIPTION="Performance and information monitoring tool" -HOMEPAGE="https://wpd.home.xs4all.nl/symon/" -SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~sparc ~x86" -IUSE="perl +symon symux" - -RDEPEND="perl? ( dev-lang/perl ) - symux? ( net-analyzer/rrdtool )" -DEPEND="${RDEPEND} - sys-devel/pmake" - -S=${WORKDIR}/${PN} - -# Deletes the directory passed as an argument from the internal pmake -# variable SUBDIR. -zap_subdir() { - sed -i "/^SUBDIR/s|$1||" Makefile || die -} - -pkg_setup() { - use symon && USE_SYMON=1 && return - - if ! use perl && ! use symon && ! use symux; then - ewarn "You have all available USE flags disabled. Therefore, only the" - ewarn "system monitor will be emerged. Please, enable at least one USE" - ewarn "flag to avoid this message." - USE_SYMON=1 - fi -} - -src_prepare() { - sed -i \ - -e '/^[ \t]*${CC}.*\${LIBS}/s:\${CC}:$(CC) $(LDFLAGS):' \ - sym*/Makefile || die -} - -src_configure() { - # Do some sed magic in accordance with the USE flags. - use perl && [[ -z ${USE_SYMON} ]] && ! use symux && zap_subdir lib - ! use perl && zap_subdir client - ! use symux && zap_subdir symux - [[ -z ${USE_SYMON} ]] && zap_subdir symon -} - -src_compile() { - pmake CC="$(tc-getCC)" CFLAGS+="${CFLAGS}" STRIP=true || die "pmake failed" -} - -src_install() { - if [[ -n ${USE_SYMON} ]]; then - insinto /etc - doins "${FILESDIR}"/symon.conf - - newinitd "${FILESDIR}"/symon-init.d symon - - dodoc CHANGELOG HACKERS TODO - - doman symon/symon.8 - dosbin symon/symon - fi - - if use perl; then - dobin client/getsymonitem.pl - - perl_set_version - insinto ${VENDOR_LIB} - doins client/SymuxClient.pm - fi - - if use symux; then - insinto /etc - doins "${FILESDIR}"/symux.conf - - newinitd "${FILESDIR}"/symux-init.d symux - - doman symux/symux.8 - dosbin symux/symux - - dodir /usr/share/symon - insinto /usr/share/symon - doins symux/c_smrrds.sh - fperms a+x /usr/share/symon/c_smrrds.sh - - dodir /var/lib/symon/rrds/localhost - fi -} - -pkg_postinst() { - if use symux; then - elog "The RRDs files can be obtained by running" - elog "/usr/share/symon/c_smrrds.sh all." - elog "For information about migrating RRDs from a previous" - elog "symux version read the LEGACY FORMATS section of symux(8)." - elog "To view the rrdtool pictures of the stored data, emerge" - elog "net-analyzer/syweb." - fi -} diff --git a/net-analyzer/symon/symon-2.88.ebuild b/net-analyzer/symon/symon-2.88.ebuild index 0250b6eec39b..db593d82b2e3 100644 --- a/net-analyzer/symon/symon-2.88.ebuild +++ b/net-analyzer/symon/symon-2.88.ebuild @@ -1,31 +1,27 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils perl-module toolchain-funcs +EAPI=7 + +inherit perl-module toolchain-funcs DESCRIPTION="Performance and information monitoring tool" HOMEPAGE="https://wpd.home.xs4all.nl/symon/" SRC_URI="https://wpd.home.xs4all.nl/symon/philes/${P}.tar.gz" +S="${WORKDIR}"/${PN} LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" IUSE="perl +symon symux" -REQUIRED_USE=" - || ( perl symon symux ) -" +REQUIRED_USE="|| ( perl symon symux )" +BDEPEND="dev-build/pmake" RDEPEND=" perl? ( dev-lang/perl ) symux? ( net-analyzer/rrdtool ) " -DEPEND=" - ${RDEPEND} - sys-devel/pmake -" - -S=${WORKDIR}/${PN} +DEPEND="${RDEPEND}" # Deletes the directory passed as an argument from the internal pmake # variable SUBDIR. @@ -84,7 +80,6 @@ src_install() { doman symux/symux.8 dosbin symux/symux - dodir /usr/share/symon insinto /usr/share/symon doins symux/c_smrrds.sh fperms a+x /usr/share/symon/c_smrrds.sh diff --git a/net-analyzer/synscan/Manifest b/net-analyzer/synscan/Manifest index 1c2ae2fe5d31..3f73f21271ad 100644 --- a/net-analyzer/synscan/Manifest +++ b/net-analyzer/synscan/Manifest @@ -1,2 +1 @@ -DIST synscan-5.01.tar.gz 61440 BLAKE2B c32984108e7bf618816f29f034d120e322e25816b8aef6aa4a80920bb0555223706c1f916f96f64be7015bedcf4b22c55fb59a54b53ffe03d85575871832e503 SHA512 6a090ceed5ca0766b63a82fee468459a47cc2bbd97c120d0e0b8708f5ce154116d988a42ff29a9b6fa5fd6d699064b1df0e263795c4dcef0f619797289db88fc DIST synscan-5.02.tar.gz 60651 BLAKE2B 0ad083d6751234b60ec0428cb3752ba1207a5be5e305a0d26950343c7a7f0572aa9ad5cb16831d862ac43c35a051514bd8fefce4abadbf4c120e4e9add7fa433 SHA512 40ec616e169d0d4150e2213fbdcb985e55dcceefef521b0bf85d8964f5b82892b8abeffcbe9c5e38314c22b86553dae56fb082d546e83efa65755a4d345ea7b0 diff --git a/net-analyzer/synscan/files/synscan-5.01-build.patch b/net-analyzer/synscan/files/synscan-5.01-build.patch deleted file mode 100644 index 79cf6943e185..000000000000 --- a/net-analyzer/synscan/files/synscan-5.01-build.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -ur synscan-5.01.orig/configure.in synscan-5.01/configure.in ---- synscan-5.01.orig/configure.in 2009-03-31 23:22:46.000000000 +0300 -+++ synscan-5.01/configure.in 2010-06-14 00:31:06.000000000 +0300 -@@ -49,7 +49,7 @@ - owd=`pwd` - if cd $withval; then withval=`pwd`; cd $owd; fi - CFLAGS="$CFLAGS -I$withval -I$withval/bpf" -- LDFLAGS="$LDFLAGS -L$withval -lpcap" -+ LIBS="$LIBS -L$withval -lpcap" - else - AC_ERROR(pcap.h or libpcap.a not found in $withval) - fi -@@ -57,12 +57,12 @@ - esac ], - [ if test -f ${prefix}/include/pcap.h; then - CFLAGS="$CFLAGS -I${prefix}/include" -- LDFLAGS="$LDFLAGS -L${prefix}/lib -lpcap" -+ LIBS="$LIBS -L${prefix}/lib -lpcap" - elif test -f /usr/include/pcap/pcap.h; then - CFLAGS="$CFLAGS -I/usr/include/pcap" -- LDFLAGS="$LDFLAGS -lpcap" -+ LIBS="$LIBS -lpcap" - elif test -f /usr/include/pcap.h; then -- LDFLAGS="$LDFLAGS -lpcap" -+ LIBS="$LIBS -lpcap" - else - AC_MSG_RESULT(no) - AC_ERROR(libpcap not found) -@@ -73,12 +73,15 @@ - ## - ## Check of getoptlong - ## --AC_CHECK_FUNCS([getopt_long],, -- AC_CHECK_LIB([gnugetopt], getopt_long, -- [ LDFLAGS="$LDFLAGS -lgnugetopt"; -- AC_DEFINE([HAVE_GETOPT_LONG])] -- ) --) -+ac_cv_have_getopt_long="no" -+AC_CHECK_FUNCS([getopt_long], -+ [ac_cv_have_getopt_long="yes"], -+ [AC_CHECK_LIB([gnugetopt], [getopt_long], -+ [ac_cv_have_getopt_long="yes" -+ LIBS="${LIBS} -lgnugetopt"])]) -+if test "$ac_cv_have_getopt_long" != "no"; then -+ AC_DEFINE([HAVE_GETOPT_LONG]) -+fi - - ## - ## Output files -diff -ur synscan-5.01.orig/Makefile.in synscan-5.01/Makefile.in ---- synscan-5.01.orig/Makefile.in 2009-03-31 23:22:28.000000000 +0300 -+++ synscan-5.01/Makefile.in 2010-06-14 00:32:19.000000000 +0300 -@@ -5,7 +5,7 @@ - - CC = @CC@ - CFLAGS=@CFLAGS@ @DEFS@ -Wall --LDFLAGS = @LDFLAGS@ -+LIBS = @LIBS@ - - OBJS_MINIMAL = \ - common.o net.o obuf.o -@@ -56,13 +56,13 @@ - solaris-sparc-gcc: - $(MAKE) $(PROJ) \ - CFLAGS="$(CFLAGS) -DBSD_COMP -DSOLARIS" \ -- LDFLAGS="$(LDFLAGS) -lsocket -lresolv -lnsl" -+ LIBS="$(LIBS) -lsocket -lresolv -lnsl" - - synscan: synscan.c synscan.h ${OBJS} -- ${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o synscan -+ ${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o synscan - - sslog: sslog.c ${OBJS} -- ${CC} ${CFLAGS} $< ${OBJS} ${LDFLAGS} -o sslog -+ ${CC} ${LDFLAGS} ${CFLAGS} $< ${OBJS} ${LIBS} -o sslog - - install: - mkdir -p -m 755 ${bindir} diff --git a/net-analyzer/synscan/files/synscan-5.02-lld.patch b/net-analyzer/synscan/files/synscan-5.02-lld.patch new file mode 100644 index 000000000000..612e91599984 --- /dev/null +++ b/net-analyzer/synscan/files/synscan-5.02-lld.patch @@ -0,0 +1,9 @@ +lld does not ignore erroneous libdirs (ideally should use pkg-config) +https://bugs.gentoo.org/875017 +--- a/configure.in ++++ b/configure.in +@@ -60,3 +60,3 @@ + CFLAGS="$CFLAGS -I${prefix}/include" +- LIBS="$LIBS -L${prefix}/lib -lpcap" ++ LIBS="$LIBS -lpcap" + elif test -f /usr/include/pcap/pcap.h; then diff --git a/net-analyzer/synscan/metadata.xml b/net-analyzer/synscan/metadata.xml index 1b94d6737400..115e9d64a669 100644 --- a/net-analyzer/synscan/metadata.xml +++ b/net-analyzer/synscan/metadata.xml @@ -1,12 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>hasan.calisir@psauxit.com</email> - <name>Hasan ÇALIŞIR</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/net-analyzer/synscan/synscan-5.01.ebuild b/net-analyzer/synscan/synscan-5.01.ebuild deleted file mode 100644 index 14cfdbfae4c4..000000000000 --- a/net-analyzer/synscan/synscan-5.01.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A fast asynchronous half-open TCP portscanner" -HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/" -SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="kernel_FreeBSD kernel_linux" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-build.patch - eautoconf -} - -src_compile() { - local _target - use kernel_FreeBSD && _target=freebsd - use kernel_linux && _target=linux - - emake ${_target} -} - -src_install() { - dobin synscan sslog - dodoc AUTHORS README -} diff --git a/net-analyzer/synscan/synscan-5.02.ebuild b/net-analyzer/synscan/synscan-5.02.ebuild index 734a7d101fba..5d38f8710526 100644 --- a/net-analyzer/synscan/synscan-5.02.ebuild +++ b/net-analyzer/synscan/synscan-5.02.ebuild @@ -1,39 +1,38 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools eutils +EAPI=8 -DESCRIPTION="A fast asynchronous half-open TCP portscanner" +inherit autotools + +DESCRIPTION="Fast asynchronous half-open TCP portscanner" HOMEPAGE="http://www.digit-labs.org/files/tools/synscan/" -SRC_URI="http://www.digit-labs.org/files/tools/${PN}/releases/${P}.tar.gz" +SRC_URI="http://www.digit-labs.org/files/tools/synscan/releases/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kernel_FreeBSD kernel_linux" +KEYWORDS="amd64 x86 ~x64-macos" RDEPEND="net-libs/libpcap" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}/${P}-destdir.patch" + "${FILESDIR}"/${P}-destdir.patch + "${FILESDIR}"/${P}-lld.patch ) src_prepare() { default - mv "$S"/configure.in "$S"/configure.ac || die - eautoconf -} -src_configure() { - econf --prefix="${EPREFIX}"/usr + eautoreconf } src_compile() { local _target - use kernel_FreeBSD && _target=freebsd + use kernel_linux && _target=linux + use kernel_SunOS && _target=solaris-sparc-gcc + use kernel_Darwin && _target=macos emake ${_target} } diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml index 2c2a7923cfc8..d5af4bcfaf13 100644 --- a/net-analyzer/syweb/metadata.xml +++ b/net-analyzer/syweb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/syweb/syweb-0.65.ebuild b/net-analyzer/syweb/syweb-0.65-r1.ebuild index da3bdcae2f6d..1f6494bd2c77 100644 --- a/net-analyzer/syweb/syweb-0.65.ebuild +++ b/net-analyzer/syweb/syweb-0.65-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 WEBAPP_MANUAL_SLOT="yes" inherit webapp @@ -9,18 +9,19 @@ inherit webapp DESCRIPTION="Web frontend to symon" HOMEPAGE="http://www.xs4all.nl/~wpd/symon/" SRC_URI="http://www.xs4all.nl/~wpd/symon/philes/${P}.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="BSD-2" SLOT="0" KEYWORDS="~amd64 ~sparc ~x86" -RDEPEND="virtual/httpd-php - net-analyzer/rrdtool" +RDEPEND=" + net-analyzer/rrdtool + virtual/httpd-php +" need_httpd_cgi -S=${WORKDIR}/${PN} - src_install() { webapp_src_preinst diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest index 96c3fad37e23..a9f92479362d 100644 --- a/net-analyzer/tcpdump/Manifest +++ b/net-analyzer/tcpdump/Manifest @@ -1 +1,2 @@ -DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22 +DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df +DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8 diff --git a/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch new file mode 100644 index 000000000000..b38c2c24b108 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch @@ -0,0 +1,22 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1068 + +From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 27 Jul 2023 08:31:53 +0100 +Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE + +This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms. + +Bug: https://bugs.gentoo.org/911176 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then + fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_LBL_C_INLINE +- ++AC_SYS_LARGEFILE + AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h) + + case "$host_os" in diff --git a/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch b/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch new file mode 100644 index 000000000000..396614ef3ad2 --- /dev/null +++ b/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch @@ -0,0 +1,22 @@ +https://github.com/the-tcpdump-group/tcpdump/pull/1068 + +From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Thu, 27 Jul 2023 08:31:53 +0100 +Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE + +This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms. + +Bug: https://bugs.gentoo.org/911176 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then + fi + AC_LBL_C_INIT(V_CCOPT, V_INCLS) + AC_C_INLINE +- ++AC_SYS_LARGEFILE + AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h) + + case "$host_os" in diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml index 926985b6a8cb..46a723b7db8b 100644 --- a/net-analyzer/tcpdump/metadata.xml +++ b/net-analyzer/tcpdump/metadata.xml @@ -1,13 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> </maintainer> <use> <flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag> - <flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag> + <flag name="drop-root">Drop privileges to pcap:pcap when run as root</flag> </use> <upstream> <remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id> diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild deleted file mode 100644 index 2fc6154ef964..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.3-r1.ebuild +++ /dev/null @@ -1,91 +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 user - -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -SRC_URI=" - https://www.tcpdump.org/release/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="+drop-root libressl smi ssl samba suid test" -RESTRICT="!test? ( test )" - -RDEPEND=" - drop-root? ( sys-libs/libcap-ng ) - net-libs/libpcap - smi? ( net-libs/libsmi ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND=" - ${RDEPEND} - drop-root? ( virtual/pkgconfig ) - test? ( - >=net-libs/libpcap-1.9.1 - dev-lang/perl - ) -" - -pkg_setup() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - -src_configure() { - if use drop-root; then - append-cppflags -DHAVE_CAP_NG_H - export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) - fi - - econf \ - $(use_enable samba smb) \ - $(use_with drop-root chroot '') \ - $(use_with smi) \ - $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=tcpdump" "") -} - -src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then - emake check - else - ewarn "If you want to run the test suite, make sure you either" - ewarn "set FEATURES=userpriv or set USE=-drop-root" - fi -} - -src_install() { - dosbin tcpdump - doman tcpdump.1 - dodoc *.awk - dodoc CHANGES CREDITS README.md - - if use suid; then - fowners root:tcpdump /usr/sbin/tcpdump - fperms 4110 /usr/sbin/tcpdump - fi -} - -pkg_preinst() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - -pkg_postinst() { - use suid && elog "To let normal users run tcpdump add them into tcpdump group." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild deleted file mode 100644 index 32094766b858..000000000000 --- a/net-analyzer/tcpdump/tcpdump-4.9.3.ebuild +++ /dev/null @@ -1,92 +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 user - -DESCRIPTION="A Tool for network monitoring and data acquisition" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" -SRC_URI=" - https://www.tcpdump.org/release/${P}.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="+drop-root libressl smi ssl samba suid test" -RESTRICT="!test? ( test )" - -RDEPEND=" - drop-root? ( sys-libs/libcap-ng ) - net-libs/libpcap - smi? ( net-libs/libsmi ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) - ) -" -DEPEND=" - ${RDEPEND} - drop-root? ( virtual/pkgconfig ) - test? ( - >=net-libs/libpcap-1.9.1 - dev-lang/perl - || ( app-arch/sharutils sys-freebsd/freebsd-ubin ) - ) -" - -pkg_setup() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - -src_configure() { - if use drop-root; then - append-cppflags -DHAVE_CAP_NG_H - export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) - fi - - econf \ - $(use_enable samba smb) \ - $(use_with drop-root chroot '') \ - $(use_with smi) \ - $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=tcpdump" "") -} - -src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then - emake check - else - ewarn "If you want to run the test suite, make sure you either" - ewarn "set FEATURES=userpriv or set USE=-drop-root" - fi -} - -src_install() { - dosbin tcpdump - doman tcpdump.1 - dodoc *.awk - dodoc CHANGES CREDITS README.md - - if use suid; then - fowners root:tcpdump /usr/sbin/tcpdump - fperms 4110 /usr/sbin/tcpdump - fi -} - -pkg_preinst() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - -pkg_postinst() { - use suid && elog "To let normal users run tcpdump add them into tcpdump group." -} diff --git a/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild new file mode 100644 index 000000000000..84162ab068b5 --- /dev/null +++ b/net-analyzer/tcpdump/tcpdump-4.99.4-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="A tool for network monitoring and data acquisition" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+drop-root +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=net-libs/libpcap-1.10.1 + drop-root? ( + acct-group/pcap + acct-user/pcap + sys-libs/libcap-ng + ) + smi? ( net-libs/libsmi ) + ssl? ( + >=dev-libs/openssl-0.9.6m:= + ) + suid? ( + acct-group/pcap + acct-user/pcap + ) +" +DEPEND=" + ${RDEPEND} + test? ( + dev-lang/perl + ) +" +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-4.99.4-lfs.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ + $(use_with drop-root chroot '') \ + $(use_with smi) \ + $(use_with ssl crypto "${ESYSROOT}/usr") \ + $(usex drop-root "--with-user=pcap" "") +} + +src_test() { + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then + emake check + else + ewarn "If you want to run the test suite, make sure you either" + ewarn "set FEATURES=userpriv or set USE=-drop-root" + fi +} + +src_install() { + dosbin tcpdump + doman tcpdump.1 + dodoc *.awk + dodoc CHANGES CREDITS README.md + + if use suid ; then + fowners root:pcap /usr/sbin/tcpdump + fperms 4110 /usr/sbin/tcpdump + fi +} + +pkg_postinst() { + use suid && elog "To let normal users run tcpdump, add them to the pcap group." +} diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild index cb1394377af7..6d223129b9ed 100644 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild @@ -1,81 +1,83 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit flag-o-matic toolchain-funcs user +EAPI=8 -DESCRIPTION="A Tool for network monitoring and data acquisition" -EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" -HOMEPAGE=" - https://www.tcpdump.org/ - https://github.com/the-tcpdump-group/tcpdump -" +inherit autotools -LICENSE="BSD" -SLOT="0" -IUSE="+drop-root libressl smi ssl samba suid test" -RESTRICT="!test? ( test )" -if [[ ${PV} == "9999" ]] ; then +DESCRIPTION="A tool for network monitoring and data acquisition" +HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump" + +if [[ ${PV} == *9999* ]] ; then inherit git-r3 - KEYWORDS="" + + EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump" else - SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc + inherit verify-sig + + SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz" + SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi +LICENSE="BSD" +SLOT="0" +IUSE="+drop-root +smi +ssl +samba suid test" +REQUIRED_USE="test? ( samba )" +RESTRICT="!test? ( test )" + RDEPEND=" - drop-root? ( sys-libs/libcap-ng ) - net-libs/libpcap + >=net-libs/libpcap-1.10.1 + drop-root? ( + acct-group/pcap + acct-user/pcap + sys-libs/libcap-ng + ) smi? ( net-libs/libsmi ) ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) - libressl? ( dev-libs/libressl:= ) + >=dev-libs/openssl-0.9.6m:= + ) + suid? ( + acct-group/pcap + acct-user/pcap ) " DEPEND=" ${RDEPEND} - drop-root? ( virtual/pkgconfig ) test? ( - >=net-libs/libpcap-1.9.1 dev-lang/perl ) " +BDEPEND="drop-root? ( virtual/pkgconfig )" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +fi + PATCHES=( "${FILESDIR}"/${PN}-9999-libdir.patch + "${FILESDIR}"/${PN}-9999-lfs.patch ) -pkg_setup() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - src_prepare() { default - - sed -i -e '/^eapon1/d;' tests/TESTLIST || die - - # bug 630394 - sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die + eautoreconf } src_configure() { - if use drop-root; then - append-cppflags -DHAVE_CAP_NG_H - export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng ) - fi - econf \ $(use_enable samba smb) \ + $(use_with drop-root cap-ng) \ $(use_with drop-root chroot '') \ $(use_with smi) \ $(use_with ssl crypto "${ESYSROOT}/usr") \ - $(usex drop-root "--with-user=tcpdump" "") + $(usex drop-root "--with-user=pcap" "") } src_test() { - if [[ ${EUID} -ne 0 ]] || ! use drop-root; then + if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then emake check else ewarn "If you want to run the test suite, make sure you either" @@ -89,19 +91,12 @@ src_install() { dodoc *.awk dodoc CHANGES CREDITS README.md - if use suid; then - fowners root:tcpdump /usr/sbin/tcpdump + if use suid ; then + fowners root:pcap /usr/sbin/tcpdump fperms 4110 /usr/sbin/tcpdump fi } -pkg_preinst() { - if use drop-root || use suid; then - enewgroup tcpdump - enewuser tcpdump -1 -1 -1 tcpdump - fi -} - pkg_postinst() { - use suid && elog "To let normal users run tcpdump add them into tcpdump group." + use suid && elog "To let normal users run tcpdump, add them to the pcap group." } diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest index fb353514e5a1..849f6a69a642 100644 --- a/net-analyzer/tcpflow/Manifest +++ b/net-analyzer/tcpflow/Manifest @@ -1,3 +1,3 @@ DIST be13_api-20170924.tar.gz 75724 BLAKE2B a5257346b9c0740d9758543fe7772c960e1941735abefe4d24d347631b35d1511fde8eb5a58dbb2824c54e78ee0d686a2549ceea2c1dc91e05ef92899c8b3c2d SHA512 5bf0d28f23df9436304245ccbdbf4af5b0f65e62b92e3039cfb9a70fe2056aa90dcce906db02f3df83fcf2a415c8a46f0f75468d48e13b15673d11c447a4c9c4 DIST dfxml-20170921.tar.gz 163616 BLAKE2B 17214d15596a136efb2afc7246ee0f5696620b5aac7c2d78e37764f51487ff816de5a7c0f59e7484d358a8cd8eab34841716970cd859f0ce868ac29c8532754c SHA512 0885947aaf8efe639c13324413ef0cca49750027b48b434f226fb9fbfba494e84e245da879dc0d77b46bddc27798f7f5df12590fce47b096683034bbc61280e1 -DIST tcpflow-1.5.2.tar.gz 788545 BLAKE2B b3995cf0f4bedce207dcac19de3d57920231cab75df030da1cf93fb815999de602fd1e3f0955c82effff88f9a3945a891c3b3f0e08449cf366de4bb8269a6452 SHA512 e060779c78f79ba6efdf5f9d8ff490823ff06051a7089247b8155c03f487776fa1896e487e8dca1d5842b617fc5d9056e043f01ac3276edeec1d394ed24bc7e9 +DIST tcpflow-1.6.1-tag.tar.gz 915245 BLAKE2B 22a1540415d6321d4ba43035f386aaea177e9d3244ff1dcdedcb0c8a72f487a969372b76b85f6acec4f0f1430b51230ceb665466af388d2bfe123a57dcd4224b SHA512 9c0357ca816bf4316ce7a461e5d18c5043a6938828ce83a613a952d5804cc6b701028a666b352da922d69447ab7f5d4c9f66585872e7b116c0f1aebebc38682b diff --git a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch index de0864004a0c..e6748c019688 100644 --- a/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch +++ b/net-analyzer/tcpflow/files/tcpflow-1.5.2-gentoo.patch @@ -22,17 +22,34 @@ ################################################################ # Specify our other headers +--- a/src/scan_http.cpp ++++ b/src/scan_http.cpp +@@ -11,7 +11,11 @@ + #include "tcpip.h" + #include "tcpdemux.h" + ++#ifdef HAVE_HTTP_PARSER_H ++#include "http_parser.h" ++#else + #include "http-parser/http_parser.h" ++#endif + + #include "mime_map.h" + +diff --git a/src/Makefile.am b/src/Makefile.am +index 793ec1a..ecac7a9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -90,20 +90,12 @@ +@@ -98,8 +98,6 @@ tcpflow_SOURCES = \ scan_netviz.cpp \ pcap_writer.h \ iptree.h \ - http-parser/http_parser.c \ - http-parser/http_parser.h \ mime_map.cpp \ - mime_map.h + mime_map.h +@@ -110,12 +108,6 @@ tcpflow_SOURCES = \ EXTRA_DIST =\ inet_ntop.c \ inet_ntop.h \ @@ -45,17 +62,3 @@ wifipcap/README.txt \ wifipcap/TimeVal.cpp \ wifipcap/TimeVal.h \ ---- a/src/scan_http.cpp -+++ b/src/scan_http.cpp -@@ -11,7 +11,11 @@ - #include "tcpip.h" - #include "tcpdemux.h" - -+#ifdef HAVE_HTTP_PARSER_H -+#include "http_parser.h" -+#else - #include "http-parser/http_parser.h" -+#endif - - #include "mime_map.h" - diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch new file mode 100644 index 000000000000..d3b6b63920f1 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-gcc13.patch @@ -0,0 +1,22 @@ +https://github.com/simsong/tcpflow/pull/252 + +From 51973125e3961569b83bd4fdde65272a3843a6a3 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 15 Apr 2023 09:54:14 +0100 +Subject: [PATCH] Fix build with GCC 13 + +GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included. + +See https://gnu.org/software/gcc/gcc-13/porting_to.html. +Bug: https://bugs.gentoo.org/895282 +--- a/src/netviz/plot_view.h ++++ b/src/netviz/plot_view.h +@@ -23,6 +23,7 @@ + #include <cairo/cairo-pdf.h> + #endif + ++#include <cstdint> + #include <vector> + #include <string> + #include <math.h> + diff --git a/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch new file mode 100644 index 000000000000..092a08dd7664 --- /dev/null +++ b/net-analyzer/tcpflow/files/tcpflow-1.6.1-wformat-security.patch @@ -0,0 +1,24 @@ +https://github.com/simsong/tcpflow/issues/238 +https://github.com/simsong/tcpflow/commit/a0697509c4657e2fd94f941e43a2d4c86ddf9fe4 + +From: "Simson L. Garfinkel" <simsong@acm.org> +Date: Thu, 11 Mar 2021 19:30:54 -0500 +Subject: [PATCH] Update datalink.cpp (#239) + +per https://salsa.debian.org/debian/tcpflow/-/blob/master/debian/patches/fix-werror-format-security.patch +Closes https://github.com/simsong/tcpflow/issues/238 +--- a/src/datalink.cpp ++++ b/src/datalink.cpp +@@ -171,10 +171,7 @@ void dl_ethernet(u_char *user, const struct pcap_pkthdr *h, const u_char *p) + break; + } + } catch( std::logic_error e){ +- std::string s(std::string("warning: caught std::logic_error ") +- + e.what() +- + std::string(" in packet")); +- DEBUG(6)(s.c_str()); ++ DEBUG(6)("Warning: caught std::logic_error %s in packet",e.what()); + } + } + + diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml index d0b78340e0f1..e3c9b6ed920b 100644 --- a/net-analyzer/tcpflow/metadata.xml +++ b/net-analyzer/tcpflow/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild index 1b29c9fe64b0..ab313f301712 100644 --- a/net-analyzer/tcpflow/tcpflow-1.5.2-r1.ebuild +++ b/net-analyzer/tcpflow/tcpflow-1.6.1-r1.ebuild @@ -1,30 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python2_7 ) -inherit autotools flag-o-matic python-single-r1 +EAPI=8 + +inherit autotools flag-o-matic DESCRIPTION="A tool for monitoring, capturing and storing TCP connections flows" HOMEPAGE="https://github.com/simsong/tcpflow" SRC_URI=" https://api.github.com/repos/simsong/be13_api/tarball/c81521d768bb78499c069fcd7c47adc8eee0350c -> be13_api-20170924.tar.gz https://api.github.com/repos/simsong/dfxml/tarball/7d11eaa7da8d31f588ce8aecb4b4f5e7e8169ba6 -> dfxml-20170921.tar.gz - https://dev.gentoo.org/~jer/be13_api-20170924.tar.gz - https://dev.gentoo.org/~jer/dfxml-20170921.tar.gz - https://github.com/simsong/${PN}/archive/${P/_/}.tar.gz + https://github.com/simsong/tcpflow/archive/refs/tags/${P}.tar.gz -> ${P}-tag.tar.gz " +S="${WORKDIR}"/${PN}-${P} LICENSE="GPL-3" -KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" -RDEPEND=" - ${PYTHON_DEPS} - dev-db/sqlite +RDEPEND="dev-db/sqlite dev-libs/boost:= dev-libs/openssl:= net-libs/http-parser:= @@ -33,22 +29,18 @@ RDEPEND=" sys-libs/zlib:= cairo? ( x11-libs/cairo - ) -" -DEPEND=" - ${RDEPEND} - test? ( sys-apps/coreutils ) -" -S=${WORKDIR}/${PN}-${P/_/} + )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/coreutils )" + PATCHES=( "${FILESDIR}"/${PN}-1.5.0_alpha-libcapng.patch "${FILESDIR}"/${PN}-1.5.2-gentoo.patch + "${FILESDIR}"/${PN}-1.6.1-wformat-security.patch + "${FILESDIR}"/${PN}-1.6.1-gcc13.patch ) src_prepare() { - mv "${WORKDIR}"/simsong-dfxml-7d11eaa/* src/dfxml/ || die - mv "${WORKDIR}"/simsong-be13_api-c81521d/* src/be13_api/ || die - default eautoreconf @@ -56,5 +48,10 @@ src_prepare() { src_configure() { append-cxxflags -fpermissive - econf $(usex cairo --enable-cairo=true --enable-cairo=false) + + # Disable Python because it's Python 2.7 only, even as of 1.6.1! + export ac_cv_header_python2_7_Python_h=no + export ac_cv_lib_python2_7_Py_Initialize=no + + CONFIG_SHELL="${BROOT}"/bin/bash econf $(usex cairo --enable-cairo=true --enable-cairo=false) } diff --git a/net-analyzer/tcping/Manifest b/net-analyzer/tcping/Manifest index 9cf79e025059..6efff5e7cf56 100644 --- a/net-analyzer/tcping/Manifest +++ b/net-analyzer/tcping/Manifest @@ -1 +1 @@ -DIST tcping-1.3.5.tar.gz 5889 BLAKE2B 8636d1fa4ff65eb14c8fe3c8d6e5b31740b84f0ccc1517b8b35ac613ace3be4b7584b6b7ccd5cf7737c7b7fea678d8d85ac54c00186ce79920dd1756c8c66fd3 SHA512 729360cd1f820ec7c68e2c64365caf60daace8c486c64fe96a88d1037b9818dd27603408962842b74d0db1ee2306ef68522f3f3369c1390e4554929297de760d +DIST tcping-1.3.6.tar.gz 3329 BLAKE2B cd69e259d930532810bf3b19d22db981d644051e472d6356e442df2074ebd6fe675b62540190f465127bdcd0c248f329b3e5c167a6c4408acfef029297b5e181 SHA512 74c65f292d6521dfbf8784ae9e1988a12ad224c81f6575ada1cae55b079cf9c13707be52cb9147abe02c8787ebbedb0d9fca1f2c27fb57c32eea5817c7042992 diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml index 12edb2ee98a0..821122387993 100644 --- a/net-analyzer/tcping/metadata.xml +++ b/net-analyzer/tcping/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type='project'> -<email>netmon@gentoo.org</email> +<maintainer type="project"> + <email>netmon@gentoo.org</email> </maintainer> +<upstream> + <remote-id type="github">mkirchner/tcping</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild b/net-analyzer/tcping/tcping-1.3.6.ebuild index 956a3556561e..e581a8a8dbf9 100644 --- a/net-analyzer/tcping/tcping-1.3.5-r1.ebuild +++ b/net-analyzer/tcping/tcping-1.3.6.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="Ping implementation that uses the TCP protocol" +DESCRIPTION="Check if a desired port is reachable via TCP" HOMEPAGE="https://github.com/mkirchner/tcping" -SRC_URI="https://web.archive.org/web/20160316191549/http://linuxco.de/tcping/tcping-1.3.5.tar.gz" +SRC_URI="https://github.com/mkirchner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="LGPL-3" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcpreen/metadata.xml +++ b/net-analyzer/tcpreen/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild index 3aa79a2d98df..3191689b7a26 100644 --- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild +++ b/net-analyzer/tcpreen/tcpreen-1.4.4-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2018 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="TCP network re-engineering tool" @@ -12,13 +13,10 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="nls" -DEPEND=" - nls? ( sys-devel/gettext ) -" -DOCS=( AUTHORS NEWS README THANKS TODO ) -PATCHES=( - "${FILESDIR}"/${P}-literal-suffix.patch -) + +BDEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( "${FILESDIR}"/${P}-literal-suffix.patch ) src_configure() { econf $(use_enable nls) diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 6dd98931a73c..821f42c144ad 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1 +1,2 @@ -DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9 +DIST tcpreplay-4.4.3.tar.xz 750072 BLAKE2B 218fe1c5faab0fdd75a031afce8f468c85886a4cf21a4d9bd34089bd106756ee0e65e0df605efecb3260ccff266553a44d8ee10249b35524a044c6c5db86fcc7 SHA512 d8186a5faf3fbe5505da34cfc466c0375c4f298c997fe85505ea898c8c1241c16f98269596b682983a3e5cbd8493882334c925ff750d95995f3b13c5b83357cf +DIST tcpreplay-4.4.4.tar.xz 748344 BLAKE2B 05f586c9d68e1ee47fc5dfdbf14d866ccbd921a5734a52de4ba6c1f33f37628e510eddbf9059130c9858207690ec2c14dfbf3819f923436aa64fcc3fc2ce074d SHA512 a6907c98779c96b2acf53e2f13e832f2c9a7ee840acc40d23c7290c2ceefb5885d314453dec9463069218011bee86bb7df057966120aacd6cddda942821aea9b diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml index e53da7185c86..f49b7430b798 100644 --- a/net-analyzer/tcpreplay/metadata.xml +++ b/net-analyzer/tcpreplay/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.3.ebuild index 003400e4ef70..98be0bac5446 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.3.ebuild @@ -1,36 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit autotools flag-o-matic -DESCRIPTION="utilities for editing and replaying previously captured network traffic" +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" -SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ~sparc x86" +fi + +S="${WORKDIR}"/${P/_/-} +LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" IUSE="debug pcapnav +tcpdump" -DEPEND=" +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) + elibc_musl? ( sys-libs/fts-standalone ) pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) " RDEPEND="${DEPEND}" -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch ) -S=${WORKDIR}/${P/_/-} - src_prepare() { default @@ -47,11 +57,12 @@ src_prepare() { } src_configure() { - # By default it uses static linking. Avoid that, bug 252940 + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 econf \ $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ --enable-dynamic-link \ --enable-local-libopts \ --enable-shared \ @@ -61,14 +72,15 @@ src_configure() { } src_test() { - if [[ ! ${EUID} -eq 0 ]]; then + if [[ ! ${EUID} -eq 0 ]] ; then ewarn "Some tests were disabled due to FEATURES=userpriv" ewarn "To run all tests issue the following command as root:" ewarn " # make -C ${S}/test" emake -j1 -C test tcpprep else emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } fi } diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild index 9e2776949df2..98be0bac5446 100644 --- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.4.4.ebuild @@ -1,35 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit autotools flag-o-matic git-r3 +EAPI=8 -DESCRIPTION="utilities for editing and replaying previously captured network traffic" +inherit autotools flag-o-matic + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" -EGIT_REPO_URI="https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="amd64 ~arm ~sparc x86" +fi +S="${WORKDIR}"/${P/_/-} + +LICENSE="BSD GPL-3" SLOT="0" -KEYWORDS="" IUSE="debug pcapnav +tcpdump" -DEPEND=" +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" dev-libs/libdnet >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) + elibc_musl? ( sys-libs/fts-standalone ) pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) " RDEPEND="${DEPEND}" -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + PATCHES=( "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch ) -S=${WORKDIR}/${P/_/-} - src_prepare() { default @@ -46,13 +57,14 @@ src_prepare() { } src_configure() { - # By default it uses static linking. Avoid that, bug 252940 + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 econf \ $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ - --disable-local-libopts \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ --enable-dynamic-link \ + --enable-local-libopts \ --enable-shared \ --with-libdnet \ --with-testnic2=lo \ @@ -60,14 +72,15 @@ src_configure() { } src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests will be disabled due to FEATURES=userpriv" + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" ewarn "To run all tests issue the following command as root:" ewarn " # make -C ${S}/test" emake -j1 -C test tcpprep else emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } fi } diff --git a/net-analyzer/tcpreplay/tcpreplay-9999.ebuild b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild new file mode 100644 index 000000000000..28758be51d1b --- /dev/null +++ b/net-analyzer/tcpreplay/tcpreplay-9999.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic + +DESCRIPTION="Utilities for editing and replaying previously captured network traffic" +HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://github.com/appneta/tcpreplay" + inherit git-r3 +else + SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~sparc ~x86" +fi + +S="${WORKDIR}"/${P/_/-} + +LICENSE="BSD GPL-3" +SLOT="0" +IUSE="debug pcapnav +tcpdump" + +# libpcapnav for pcapnav-config +BDEPEND=" + net-libs/libpcapnav + >=sys-devel/autogen-5.18.4[libopts] +" +DEPEND=" + dev-libs/libdnet + >=net-libs/libpcap-0.9 + elibc_musl? ( sys-libs/fts-standalone ) + pcapnav? ( net-libs/libpcapnav ) + tcpdump? ( net-analyzer/tcpdump ) +" +RDEPEND="${DEPEND}" + +DOCS=( docs/{CHANGELOG,CREDIT,HACKING,TODO} ) + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch +) + +src_prepare() { + default + + sed -i \ + -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ + src/common/sendpacket.c || die + sed -i \ + -e 's|@\([A-Z_]*\)@|$(\1)|g' \ + -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ + -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ + src/Makefile.am || die + + eautoreconf +} + +src_configure() { + use elibc_musl && append-flags "-lfts" + # By default it uses static linking. Avoid that, bug #252940 + econf \ + $(use_enable debug) \ + $(use_with pcapnav pcapnav-config "${BROOT}"/usr/bin/pcapnav-config) \ + $(use_with tcpdump tcpdump "${ESYSROOT}"/usr/sbin/tcpdump) \ + --enable-dynamic-link \ + --enable-local-libopts \ + --enable-shared \ + --with-libdnet \ + --with-testnic2=lo \ + --with-testnic=lo +} + +src_test() { + if [[ ! ${EUID} -eq 0 ]] ; then + ewarn "Some tests were disabled due to FEATURES=userpriv" + ewarn "To run all tests issue the following command as root:" + ewarn " # make -C ${S}/test" + emake -j1 -C test tcpprep + else + emake -j1 test || { + ewarn "Note that some tests require eth0 iface to be up." + die "self test failed - see ${S}/test/test.log" + } + fi +} diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest index 41ade7a38751..39cd37ea07e5 100644 --- a/net-analyzer/tcpslice/Manifest +++ b/net-analyzer/tcpslice/Manifest @@ -1,2 +1,4 @@ -DIST tcpslice_1.2a3-4.debian.tar.gz 5784 BLAKE2B c85beab03b494984d721ca64fb75ccb29746dee4184e4daecf2703e80f3b3d3e4330b911831960caa17d631a4760a21d17368cd7017e61c05766fd1f50c66e0e SHA512 43a0ad5811c84639be0c6d162ea92101e73240e9689e4b647ee060697382062ec0e22dcb951ca000e05bac829455b7aa37f8dd73c5b1dd87f55e6d61a8a9b59b -DIST tcpslice_1.2a3.orig.tar.gz 76879 BLAKE2B 38b20ef09c2c0fc2c956c421d131ce27748bea684bb459da13f0d29b008a4561b7f61381cfbdb9c1dbdf53478c55b412efa9af689d5425f7fbfc9f0ee32016d5 SHA512 04e12d592807022c78eb4941580ed103995680c69af885bb8f13828a12ec570f7fe93c34c1b20a01d3d99f445d5da17a1fcfbe25b2e3b41abe28304c034654c5 +DIST tcpslice-1.5.tar.gz 136597 BLAKE2B 04512feb49d905458b06150846ea1ae5439db42567e652afb49ddfca179f60fef425db71c0a1ea0aa8c4863e170385bb0f57599ae50cc2417b2fd16e57bd02da SHA512 b9d8192c6aea60661898633a47679c8890813530c7ef7a331c1e3b711127028ccc90e6748cbf23666d74f1639ce8f71d4d7703aac707821d8abf9b9c73f2402e +DIST tcpslice-1.5.tar.gz.sig 442 BLAKE2B c7fb1b09c9fe2c0dbfd9728ff95d2414a583ed95a21c1e0476e0ed2a7b32eff2c8cf848fdb52414162e7c7df480e722f28063905e9e03093814590a474da86bc SHA512 4b948ac72672066ba679aa58b6e7fdb672d5be36ae24a503fe4093b67185d0f9466c7fe820199fb1043e6c21e015be07cf9ed020414ebf0c801aac30e3b84afe +DIST tcpslice-1.7.tar.xz 109272 BLAKE2B 5443afac3a4013ee2794084eb4f3b9e61aa6c3aab5e29b021b4e3e1248dc51a62e0a2ef3e742bc6e90392487fd6cae7888cb3ad031ef3daeaf6ae57dc92aef01 SHA512 9359daf309c962205c7503192a477a8a57f35c527d762c665f6181a0160a0f773cf5f186910ee548787fa0af2489d173872cd3dea05fa2073ea77a03a7d9c7a3 +DIST tcpslice-1.7.tar.xz.sig 442 BLAKE2B 96d77b64bb2a166d6017323a22f110f7015ef5866279ef1b3abb020704a93f98f72f4bb4d8214a57b1e6c782950c8894176c376f49cf0be5419d8874cdf280d3 SHA512 9ea7ec8a2709091d5726210517702fa808d0009a2761a6962a9225cc5598dfd7474f57c36207fdbef0d10ccf2abb4e1c0c6a825eec88445f8e86393cd89a388b diff --git a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch b/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch deleted file mode 100644 index befcfdc9defe..000000000000 --- a/net-analyzer/tcpslice/files/tcpslice-1.2a_p3-exit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/util.c -+++ b/util.c -@@ -25,6 +25,7 @@ - #endif - - #include <sys/types.h> -+#include <stdlib.h> /* exit() */ - - #include <stdio.h> - #if __STDC__ diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml index f932bb378f35..d2be3b66d6ab 100644 --- a/net-analyzer/tcpslice/metadata.xml +++ b/net-analyzer/tcpslice/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild deleted file mode 100644 index 706c33979464..000000000000 --- a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -MY_P="${PN}_${PV/_p/}" - -DESCRIPTION="Extract and concatenate portions of pcap files" -HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" -LICENSE="BSD" -SLOT="0" -SRC_URI="mirror://debian/pool/main/t/${PN}/${MY_P}.orig.tar.gz - mirror://debian/pool/main/t/${PN}/${MY_P}-4.debian.tar.gz" -KEYWORDS="~amd64 ~ppc x86" - -RDEPEND="net-libs/libpcap" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P/_/-}" - -src_prepare() { - epatch \ - "${WORKDIR}"/debian/patches/[0-]* \ - "${FILESDIR}"/${P}-exit.patch - eautoreconf -} - -src_install() { - dosbin tcpslice - doman tcpslice.1 - dodoc README -} diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild deleted file mode 100644 index c348b112eb35..000000000000 --- a/net-analyzer/tcpslice/tcpslice-1.2a_p3_p4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -MY_P="${PN}_$(ver_cut 1).$(ver_cut 2-3)$(ver_cut 5)" - -DESCRIPTION="Extract and concatenate portions of pcap files" -HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" -LICENSE="BSD" -SLOT="0" -SRC_URI=" - mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz - mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-$(ver_cut 7).debian.tar.gz -" -KEYWORDS="~amd64 ~ppc ~x86" - -RDEPEND=" - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} -" -S=${WORKDIR}/${MY_P/_/-} - -src_prepare() { - eapply \ - "${WORKDIR}"/debian/patches/[0-]* \ - "${FILESDIR}"/${PN}-1.2a_p3-exit.patch - eapply_user - sed -i -e 's|ifndef lint|if 0|g' *.c || die - eautoconf -} - -src_install() { - dosbin tcpslice - doman tcpslice.1 - dodoc README -} diff --git a/net-analyzer/tcpslice/tcpslice-1.5.ebuild b/net-analyzer/tcpslice/tcpslice-1.5.ebuild new file mode 100644 index 000000000000..d6ef4a8164f7 --- /dev/null +++ b/net-analyzer/tcpslice/tcpslice-1.5.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit verify-sig + +DESCRIPTION="Extract and concatenate portions of pcap files" +HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" +SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz + verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc x86" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-tcpdump )" +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tcpdump.asc" diff --git a/net-analyzer/tcpslice/tcpslice-1.7.ebuild b/net-analyzer/tcpslice/tcpslice-1.7.ebuild new file mode 100644 index 000000000000..addd46fe7ec6 --- /dev/null +++ b/net-analyzer/tcpslice/tcpslice-1.7.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tcpdump.asc" +inherit verify-sig + +DESCRIPTION="Extract and concatenate portions of pcap files" +HOMEPAGE="http://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpslice" +SRC_URI=" + https://www.tcpdump.org/release/${P}.tar.xz + verify-sig? ( https://www.tcpdump.org/release/${P}.tar.xz.sig ) +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND="net-libs/libpcap" +DEPEND="${RDEPEND}" +BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tcpdump-20240308 )" diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch deleted file mode 100644 index e3e0df933d5c..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -68,7 +68,7 @@ - case $my_build_os in - aix*) AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;; - osf1*) AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;; -- linux*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;; -+ linux*) AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;; - bsd/os*) ;; - freebsd*) ;; - sunos*) ;; diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch deleted file mode 100644 index 88e668e1a4a5..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -84,15 +84,26 @@ - dnl ####################### - dnl Checks for header files - dnl ####################### - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h) -+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h) - - dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it - AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h) - -+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval ) -+if test "$ip6" = "yes" -+then -+ AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] ) -+elif test "$ip6" != "no" -+then -+ AC_CHECK_HEADER(netinet/ip6.h) -+ -+fi -+ -+ - dnl ############################################################# - dnl Checks for typedefs, structures, and compiler characteristics - dnl ############################################################# - AC_C_CONST - AC_TYPE_SIZE_T -@@ -147,34 +158,11 @@ - If you already have... then please rerun configure with the option - --with-pcap-lib=DIR - with "DIR" being where libpcap is found.]) - ]) - --dnl look for dbopen for tcpprof --TCPPROF="" --LD_TCPPROF="" --AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [ -- AC_CHECK_LIB(db1, dbopen, [ -- TCPPROF=tcpprof -- LD_TCPPROF="-ldb1" -- AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ]) -- ], [ -- AC_MSG_WARN([ -- -- *** WARNING *** -- I couldn't locate the Berkeley DB library. The extra utility -- "tcpprof" will not be built. THIS IS OK!!! "tcpstat" will -- continue to be built as if this never happened. -- -- If you wish to use the extra "tcpprof" program, please install -- the Berkeley DB library from: -- ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz -- ]) -- ]) --]) - AC_SUBST(TCPPROF) --AC_SUBST(LD_TCPPROF) - AC_SUBST(MATHLIB) - - AC_CONFIG_FILES([ - Makefile - doc/Makefile ---- a/lib/process.c -+++ b/lib/process.c -@@ -230,12 +230,12 @@ - * calls a user function pointing to the data - * - * XXX: filter is not used. capture_seconds also isn't, but snoop is - * always read from a file. - */ --int get_snoop_data(char *fname, char *filter, int flags, -- Double capture_seconds, void (*hook)(packet_data *, void **), -+int get_snoop_data(char *fname, char *filter __attribute__((unused)), int flags, -+ Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **), - void **args) { - - u_char *packet; - int fd, len, blen, ret = 0; - struct snoop_file_header fh; ---- a/lib/tcpseq.c -+++ b/lib/tcpseq.c -@@ -54,11 +54,10 @@ - u_char flags; - struct tcpseq_ha test_ha; - struct tcphdr *tp = NULL; - struct ip *ip; - #ifdef INET6 -- int is_ip6 = 0; - struct ip6_hdr *ip6; - - ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr; - if (is_ip6_packet(pd)) - tp= &(pd->data.ip6.body.tcphdr); ---- a/src/catpcap.c -+++ b/src/catpcap.c -@@ -50,11 +50,11 @@ - if (c == ' ') return c; - if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c; - return '.'; - } - --void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) { -+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) { - u_int length = h->caplen, i, j, k, step; - u_char *r, *s; - char c; - - r = (u_char *)p; -@@ -90,11 +90,11 @@ - } - /* - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - int run = 1, i; - pcap_t *pd; - char ebuf[PCAP_ERRBUF_SIZE]; - struct bpf_program bpf_prog; - ---- a/src/dump.c -+++ b/src/dump.c -@@ -37,21 +37,21 @@ - char filterexpr[BUF_SIZ] = ""; - int get_tcp_flags = 0; - int what_to_show = 0; - int packet_number = 0; - --void my_hook(packet_data *pd, void **args) { -+void my_hook(packet_data *pd) { - printf("PACKET NUMBER: %d\n", ++packet_number); - print_packet(pd, what_to_show); - printf("-------------------\n"); - } - - /* - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - get_dump_data(fname, filterexpr, get_tcp_flags, - -1.0, my_hook, NULL); - } - - int parse_show_types(char *in) { ---- a/src/tcpstat.c -+++ b/src/tcpstat.c -@@ -421,11 +421,11 @@ - } - - /* - * process_file() gets the data, and then displays the statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - void *argv[2]; - statistics stats; - Double x; - - signal(SIGUSR1, catch_signal); diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcpstat/metadata.xml +++ b/net-analyzer/tcpstat/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild deleted file mode 100644 index ce12a85db51b..000000000000 --- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Reports network interface statistics" -HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/" -SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) -PATCHES=( - "${FILESDIR}"/${P}-db.patch - "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -Wall -Wextra - econf \ - $(use_enable ipv6) \ - --with-pcap-include='' \ - --with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)" -} - -src_install() { - default - dobin src/{catpcap,packetdump} - newdoc src/README README.src -} diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild index a7ffbe9723e3..6be8bb24a4b0 100644 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Reports network interface statistics" @@ -10,20 +11,22 @@ SRC_URI=" https://www.frenchfries.net/paul/tcpstat/${P/_p*}.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-$(ver_cut 4).debian.tar.xz " +S="${WORKDIR}"/${P/_p*} LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ppc64 sparc x86" IUSE="ipv6" DEPEND=" net-libs/libpcap sys-libs/db:* " -RDEPEND=" - ${DEPEND} -" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) + PATCHES=( "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch "${FILESDIR}"/${P}-ipv6.patch @@ -31,7 +34,6 @@ PATCHES=( "${FILESDIR}"/${P}-off-by-one.patch "${FILESDIR}"/${P}-unused.patch ) -S=${WORKDIR}/${P/_p*} src_prepare() { eapply $( @@ -39,8 +41,8 @@ src_prepare() { do echo "${WORKDIR}"/debian/patches/${patch} done ) ${PATCHES[@]} - eapply_user + eapply_user eautoreconf } diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest index 38a5487049c3..0c533e08f0ef 100644 --- a/net-analyzer/tcptrace/Manifest +++ b/net-analyzer/tcptrace/Manifest @@ -1,3 +1,2 @@ DIST tcptrace-6.6.7.tar.gz 3773308 BLAKE2B cae5816cb25c33f71c316d14de3c18ff26f0e7452375a962b88c4818ca7c43425e7298e788bd8cb43f2e22ac7dc9b89ed1921b7bd70d0e8befab3ee791453fb1 SHA512 3638770c342aea6c71aa556e758ed22e1fd44730f6c652cf82d3861eb1c31b186952c660071bd1df45020b80eaf9dd090a4ff58c979cc907eb8154dcb7b9b432 -DIST tcptrace_6.6.7-4.1.diff.gz 29161 BLAKE2B 83768d0a6f14525f20b484421181078a3cf7ac3adeada3cf02a7441530593632743c6e515dd8738f5a4692422d97f4eb718dda076a234489096a10defb97dd5f SHA512 2f6dfeb8e15faa0151bdbb18194587e51de040f63117eb1b469a826091d5c1e5eb41a306bdc94e89ce993d0d04ec31324e5f7eea0a1a52852e07ee80006b2087 -DIST tcptrace_6.6.7-5.debian.tar.xz 6236 BLAKE2B 21d35b625fdc7b94c29b2be595ac39488578f08c53e5dde98953bbebaa2d8d96de968b746dd107ea78365a77f1fe7aa5abfeb3aeef4473c9020587f93066000c SHA512 6265d0bfb25f256c8f356cda731c48f869fe3e9d9504ed6afd0e98a3c2caf5dbcff73373c338be111712713b9a501fae886bb06723796103bac4dec5d8fcfaf6 +DIST tcptrace_6.6.7-6.debian.tar.xz 6056 BLAKE2B a46a8a8a8f804066486566bccd10e33dc372a1fc30f37f401913c2b3038cf917891472e93a509cac8bdd2928d473c3ce21d0c4048c96ae54967fc48780384221 SHA512 82eebc2e297130cbafab0bb1757402d8b210885320ded1cd9b7ff064248d145c93196820564d4d1d7f1b1f7391cc5f734a0e0bf6275ddcae106d0bd540e32b61 diff --git a/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch new file mode 100644 index 000000000000..d9158bae6981 --- /dev/null +++ b/net-analyzer/tcptrace/files/0001-configure.in-fix-implicit-function-declaration-causi.patch @@ -0,0 +1,26 @@ +From f199970cdb38259f0748e79ece844dc2cd676cdf Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz93@gmail.com> +Date: Tue, 19 Mar 2024 21:39:10 -0400 +Subject: [PATCH] configure.in: fix implicit function declaration causing test + to mistest + +--- + configure.in | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.in b/configure.in +index 38132e0..e973815 100644 +--- a/configure.in ++++ b/configure.in +@@ -51,6 +51,8 @@ dnl If strcmp returns 0, we are on an enironment that uses %llu, otherwise + dnl we are on a MacOSX environment that uses %qu + AC_TRY_RUN([ + #include <stdio.h> ++#include <string.h> ++#include <stdlib.h> + + #define NIX "%llu" + +-- +2.43.2 + diff --git a/net-analyzer/tcptrace/files/tcptrace-6.6.7-fix-build-clang16.patch b/net-analyzer/tcptrace/files/tcptrace-6.6.7-fix-build-clang16.patch new file mode 100644 index 000000000000..fa1fd322c83e --- /dev/null +++ b/net-analyzer/tcptrace/files/tcptrace-6.6.7-fix-build-clang16.patch @@ -0,0 +1,30 @@ +Bug: https://bugs.gentoo.org/897830 +--- a/compress.c ++++ b/compress.c +@@ -61,6 +61,8 @@ static char const GCC_UNUSED rcsid[] = + + #include "compress.h" + #include <sys/wait.h> ++#include <stdio.h> ++#include <stdio_ext.h> + + /* + * OK, this stuff is a little complicated. Here's why: +@@ -240,7 +242,7 @@ CompReopenFile( + /* erase the file buffer and reposition to the front */ + #ifdef HAVE_FPURGE + /* needed for NetBSD and FreeBSD (at least) */ +- fpurge(stdin); /* discard input buffer */ ++ __fpurge(stdin); /* discard input buffer */ + #else /* HAVE_FPURGE */ + fflush(stdin); /* discard input buffer */ + #endif /* HAVE_FPURGE */ +@@ -599,7 +601,7 @@ PipeHelper(void) + // read end of the pipe, fdpipe[0] + + #ifdef HAVE_FPURGE +- fpurge(stdin); // needed for NetBSD/FreeBSD ++ __fpurge(stdin); // needed for NetBSD/FreeBSD + #else + fflush(stdin); + #endif diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcptrace/metadata.xml +++ b/net-analyzer/tcptrace/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild index 9e42190df0b0..5453f2914699 100644 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r1.ebuild @@ -1,21 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit autotools eutils flag-o-matic versionator - -TT_DEB_MAJOR=$(get_version_component_range 4) -TT_DEB_MAJOR=${TT_DEB_MAJOR/p} -TT_DEB_MINOR=$(get_version_component_range 5) -TT_DEB_MINOR=${TT_DEB_MINOR/p} -TT_VER=$(get_version_component_range 1-3) +EAPI=8 +inherit autotools flag-o-matic DESCRIPTION="A Tool for analyzing network packet dumps" HOMEPAGE="http://www.tcptrace.org/" SRC_URI=" - http://www.tcptrace.org/download/${PN}-${TT_VER}.tar.gz - http://www.tcptrace.org/download/old/6.6/${PN}-${TT_VER}.tar.gz - mirror://debian/pool/main/t/${PN}/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff.gz + http://www.tcptrace.org/download/${P/_p*}.tar.gz + http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz + mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz " SLOT="0" @@ -28,20 +22,35 @@ DEPEND=" RDEPEND=" ${DEPEND} " - -S=${WORKDIR}/${PN}-${TT_VER} +PATCHES=( + "${FILESDIR}"/${P/_p*}-cross-compile.patch + "${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch + "${FILESDIR}"/${P/_p*}-fix-build-clang16.patch +) +S=${WORKDIR}/${P/_p*} src_prepare() { - eapply "${FILESDIR}"/${PN}-${TT_VER}-cross-compile.patch - eapply "${WORKDIR}"/${PN}_${TT_VER}-${TT_DEB_MAJOR}.${TT_DEB_MINOR}.diff - - eapply_user + default - append-cppflags -D_DEFAULT_SOURCE + eapply \ + $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series) eautoreconf } +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861260 + # + # Upstream site no longer exists. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + src_compile() { emake CCOPT="${CFLAGS}" } diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild new file mode 100644 index 000000000000..c8fbb4f76e81 --- /dev/null +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit autotools flag-o-matic + +DESCRIPTION="A Tool for analyzing network packet dumps" +HOMEPAGE="http://www.tcptrace.org/" +SRC_URI=" + http://www.tcptrace.org/download/${P/_p*}.tar.gz + http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz + mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz +" +S=${WORKDIR}/${P/_p*} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc ppc64 x86" + +DEPEND=" + net-libs/libpcap +" +RDEPEND=" + ${DEPEND} +" + +PATCHES=( + "${FILESDIR}"/${P/_p*}-cross-compile.patch + "${FILESDIR}"/${P/_p*}-_DEFAULT_SOURCE.patch + "${FILESDIR}"/${P/_p*}-fix-build-clang16.patch + "${FILESDIR}"/0001-configure.in-fix-implicit-function-declaration-causi.patch +) + +src_prepare() { + default + + eapply \ + $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series) + + eautoreconf +} + +src_configure() { + # -Werror=strict-aliasing + # https://bugs.gentoo.org/861260 + # + # Upstream site no longer exists. + # + # Do not trust with LTO either. + append-flags -fno-strict-aliasing + filter-lto + + default +} + +src_compile() { + emake CCOPT="${CFLAGS}" +} + +src_install() { + dobin tcptrace xpl2gpl + + newman tcptrace.man tcptrace.1 + dodoc CHANGES COPYRIGHT FAQ README* THANKS WWW +} + +pkg_postinst() { + if ! has_version ${CATEGORY}/${PN}; then + elog "Note: tcptrace outputs its graphs in the xpl (xplot)" + elog "format. Since xplot is unavailable, you will have to" + elog "use the included xpl2gpl utility to convert it to" + elog "the gnuplot format." + fi +} diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild index acb7c415420a..fe3dd350d447 100644 --- a/net-analyzer/tcptrace/tcptrace-6.6.7_p5.ebuild +++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,13 +8,13 @@ DESCRIPTION="A Tool for analyzing network packet dumps" HOMEPAGE="http://www.tcptrace.org/" SRC_URI=" http://www.tcptrace.org/download/${P/_p*}.tar.gz - http://www.tcptrace.org/download/old/6.6/${P/_p*}.tar.gz + http://www.tcptrace.org/download/old/$(ver_cut 1-2)/${P/_p*}.tar.gz mirror://debian/pool/main/t/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz " SLOT="0" LICENSE="GPL-2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ppc64 x86" DEPEND=" net-libs/libpcap diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml index 027df8340d8d..3be0eb6a1a60 100644 --- a/net-analyzer/tcptraceroute/metadata.xml +++ b/net-analyzer/tcptraceroute/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild index f5b06925a972..bb25e818fc32 100644 --- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild +++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r3.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils - -MY_P=${P/_beta/beta} +EAPI=7 +inherit autotools DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets" HOMEPAGE="https://github.com/mct/tcptraceroute" -SRC_URI="https://codeload.github.com/mct/${PN}/tar.gz/${MY_P} -> ${P}.tar.gz" +SRC_URI="https://github.com/mct/${PN}/archive/${P/_}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" DEPEND=" net-libs/libnet:1.1 net-libs/libpcap " RDEPEND="${DEPEND}" - -# michael.toren.net is no longer available RESTRICT="test" - -S=${WORKDIR}/${PN}-${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-cross-compile-checks.patch +) +S=${WORKDIR}/${PN}-${P/_} src_prepare() { - epatch "${FILESDIR}"/${P}-cross-compile-checks.patch + default eautoreconf } @@ -36,5 +34,6 @@ src_install() { fperms 4710 /usr/sbin/tcptraceroute doman tcptraceroute.1 dodoc examples.txt README ChangeLog - dohtml tcptraceroute.1.html + docinto html + dodoc tcptraceroute.1.html } diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tcptrack/metadata.xml +++ b/net-analyzer/tcptrack/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild index 235ac5dff8d2..30fbb10604a6 100644 --- a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild +++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="Passive per-connection tcp bandwidth monitor" HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/" @@ -12,17 +13,23 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc x86" +BDEPEND="virtual/pkgconfig" DEPEND=" net-libs/libpcap sys-libs/ncurses " -RDEPEND=" - ${DEPEND} - virtual/pkgconfig -" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default + sed -i src/Makefile.am -e 's| -Werror||g' || die + + mv configure.{in,ac} || die + eautoreconf } diff --git a/net-analyzer/telegraf/Manifest b/net-analyzer/telegraf/Manifest index 2ab9ba3fa0b0..a6c34e66b3be 100644 --- a/net-analyzer/telegraf/Manifest +++ b/net-analyzer/telegraf/Manifest @@ -1,212 +1,4 @@ -DIST github.com-Azure-go-autorest-1f7cd6cfe0adea687ad44a512dfe76140f804318.tar.gz 118485 BLAKE2B af45364ae0cffabcb3764e2a404a259b85b1eb64bd056240f7c1029f5dd1988a975646834d043f450463903021758ad83ea05724648a176159ae6b872e91c8cd SHA512 27846dddbee560f02991e99f4d213a38415a08b18e1a47314eb6e6525f38eb71ac531493bdbb2e2639dc2c5f4f2c464afd799a504a5b8047c7f4bab46c2cac09 -DIST github.com-GoogleCloudPlatform-google-cloud-go-c728a003b238b26cef9ab6753a5dc424b331c3ad.tar.gz 1794432 BLAKE2B 4e784865d117c2cd3e875dfdafd63ec2567179efecf3268da4038e7bdf65d8ce812a0aafce00898531f61b773d6751806c20b8c736a68891b4bb6a004c20eef1 SHA512 87c3db99c87af834e556a651fb25789dbf9b9b2297d60236cc25c46fcbbcb22ed0536f002765de88051dac23f81c2d10e6584df5e00783c797dd24d6821c67d6 -DIST github.com-Microsoft-ApplicationInsights-Go-d2df5d440eda5372f24fcac03839a64d6cb5f7e5.tar.gz 51031 BLAKE2B 8dbd6bd9a74e878e0a9cbe75785a671700b1d4a4480af5e88d540584fcebeeecd92c210c48cacc2fa3de37851bcbaf3db22aa9c3a5a02a554450c5a01f2f2485 SHA512 7a0d82b582f0a5ee793479865d7af4b9fff58e631f84d80665396ba8a83ec98b0f0358c864cc6795d05c5d1a06d9664031b189e2e50d2c6b6a00a3bee45b6030 -DIST github.com-Microsoft-go-winio-a6d595ae73cf27a1b8fc32930668708f45ce1c85.tar.gz 79423 BLAKE2B 8de3be319fa8a6af9781701aa973911c96bf9e9d5771cf1ed84f43d3b5af15416178fb323054b6269ae71b8b2627577f247544ef2e67277df47bc2c675c8843b SHA512 481e45fbeed1ae8f1656d31a069ed02855d98503be4e7f8d00055a4409eb3ea030ddfa63cd3b9e8db09e53f760c64f8313cf03fcd64c7f9534d433ab50daae51 -DIST github.com-Microsoft-go-winio-ce2922f643c8fd76b46cadc7f404a06282678b34.tar.gz 67431 BLAKE2B ee5d72b2ce6bad4d7f753a1fd4aa9c8715b90400f6ea3e6f091c18c959504027d7077b2903d4bfb18f41ed9885af1e56e7ef16cbca0545760e5edb58d12847ec SHA512 ee5020a00ec765d1a71d7b548497fe6c7cdc053b6d5d9adfc0955eca2d6fd3232b64c1a00ffe3346612eb23427b13eae298ef80b4786cdb2bbcd859de62badb4 -DIST github.com-Shopify-sarama-3b1b38866a79f06deddf0487d5c27ba0697ccd65.tar.gz 141370 BLAKE2B e291afcbb0d903bd6a2c16b4baf529c46d39c1c16cb410b7314f66b4b9c31e9feafbd7763d79232128f836fa9024a776d17378adf9205da632a9d10c798e8cca SHA512 45e71fa70a6296f88b1b71f27ede68a9b9eb20b0ead4c704fc54adcb24e01b96d07c4f5f9d9fbdbcb71ced865d19660f3852d74b43ba26e2826baf303f8ad705 -DIST github.com-Shopify-sarama-a6144ae922fd99dd0ea5046c8137acfb7fab0914.tar.gz 170978 BLAKE2B c1847e193abf447699ae50d31c8f0c73c798a047217752ee6799da8e0988e7ea2d7e9d083623bd5e637a358c33a6c05c549fd3d0c97a3fab1c805f3234de59b7 SHA512 0ef24203f88d89e40cec508025a480ec2daf5d2b3186d7f5acf0a6c8b51da82f4a62638bdb9341dc93e262e0e2cc85f15656643288d884e2da12e99226f41a3d -DIST github.com-Sirupsen-logrus-61e43dc76f7ee59a82bdf3d71033dc12bea4c77d.tar.gz 25127 BLAKE2B 490fc2c87ea6471ebd094b43f37dc568ed38cf44be0d66ceb6ab37e22d6ce4a001a2f61820ecd171545c2f24489705bf38cbea129bcffb7a663f06bd456d1fa0 SHA512 ac8b2606945a50398736eb257762798662d7894cd71a7c6f52811a43bccfe920ae0b8ca1c6a03f91f114e6d09b85b262322b49b40ae1c7c77b21a962425079ab -DIST github.com-StackExchange-wmi-5d049714c4a64225c3c79a7cf7d02f7fb5b96338.tar.gz 11236 BLAKE2B 823d78d8f875feb77830e8e9c69e7c7efb54b2077e8048572764207ebab93388c29fda2a75e30e3a54cb93a55687838bcb2f4c9fe592e149ab44ae6d5de5db02 SHA512 b9f1d7579eb128b0ee4397366b373a4a015712ad6414af18528d4d43dbad2ef0809ea051d0b5880a760065bd8296286e051cacca1ce5832f449d775087f0c1d0 -DIST github.com-StackExchange-wmi-f3e2bae1e0cb5aef83e319133eabfee30013a4a5.tar.gz 6835 BLAKE2B 4d38c8389973f3cee2346354096923c1e3dbdab9db6fe6eb86b18cbfa3158fec069b124e04f2b87ecc84bb3cb1de7d27065c0427d2ba618da0e9f91ed274c212 SHA512 d432d6ea5330db910942aef22f416d78efe03dc034f8449df4aa86026cf9c97c1e8e43987425f6b713f1a57b6d930994ad97aa13809996c4d22dea6d4d4cc314 -DIST github.com-aerospike-aerospike-client-go-1dc8cf203d24cd454e71ce40ab4cd0bf3112df90.tar.gz 230591 BLAKE2B 9015081f41d2b738d7edc89dc188730353c2a50cf9999411899c9e81c6077fab2ffc93df8dafb2e7c5e2683f556c87ab7176d0458c834228b6d98de601e2ed2e SHA512 f42d984dc5ef3ac63756ef7a5c01a140b9fc6c8803e286c66baab9f4736f8452240a2e4c3c56a94e20d6e49ff955d3328cd0beddfd150bcea755135047d457bd -DIST github.com-aerospike-aerospike-client-go-95e1ad7791bdbca44707fedbb29be42024900d9c.tar.gz 209254 BLAKE2B 62f74fae376ad21326bfc7d984db3f4b88bb47bee1dfae12444784687f4b67bbc81645ddd42c1989be8dcbe169c589051e2d18a6d7b82b1a6a199e8463b7763f SHA512 a173bd06445d45e64d34fbcbf7736c7dbe58045d2b20dc9d3f3759b5ba33dc7bba3c4bcf3d226fd06f0c151cad7cb11645f0996f0b814386a0e7ab50ccc30fdf -DIST github.com-alecthomas-kingpin-947dcec5ba9c011838740e680966fd7087a71d0d.tar.gz 44386 BLAKE2B 6bdff266da6f9b96cd8c3c04e0a09333ba3435228f3bcd1cb65372dc8ff9955524179ef5f122998925fb3d91b536598b5312eda41418082771c4a9c16bbbb2c0 SHA512 e143600cb6591aeb6f4bea461f866fdfb5563778d1c472d27c2d37db50bed74de6e3874c204795aea0a8132b4d6511795bce25e689f74400b0254288d11fdaef -DIST github.com-alecthomas-template-a0175ee3bccc567396460bf5acd36800cb10c49c.tar.gz 55291 BLAKE2B fbd48545b6a5809d210629ca3aeb03c366051601d5b2f7718f79a96ec18fa09f18922c1a3ffcbac3abcd9b8955871b5bb4c71c23a1839cf7f17d8372bc3478fe SHA512 5ca546170725c3bdd4d9b27ca3976d6dc6376be8db685e6e26cfaef4a51560f78702b7babbe5ed0b2d934d0c32867bc69b11ae757071dc143a4453e6e7ffabdf -DIST github.com-alecthomas-units-2efee857e7cfd4f3d0138cc3cbb1b4966962b93a.tar.gz 3442 BLAKE2B bb3a4acac34764b249cbec5f21fd260ab6dea6810183d12e13943657037903b874a209686b6913e8529a578cec4fb364adad475577c28456bf92add7f5ac9498 SHA512 855f15eeb83bdc16981694f522aa1e200a3857ed11ae87fca9b0cc70734eac76f5082bc3ed92f843b818da14b58dc921dbb1aed4ea35de056c087a64b7e25fe4 -DIST github.com-amir-raidman-1ccc43bfb9c93cb401a4025e49c64ba71e5e668b.tar.gz 6584 BLAKE2B 9a77fbed7d39d6a06a17f2d17ec664f883df668e4f14513e79ee1789e5771e16c8b8ff87f60fbb7006bd33e8cfd1af5f5dd68ce8bbd55dbe22dde3b42cdb321b SHA512 9ef07792b0d8a6e9d43f0061cde0a8bf072e3df35f01a6ba27293061cd9b52964bbeb3c9172d1147d379dd8d07ebec2137360ccf38297b04b57e69685c6eb998 -DIST github.com-amir-raidman-c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985.tar.gz 6591 BLAKE2B 7fde57e3264ad140c4f153be833cdd767b4bebf4a857b82d0de0cdc4d6615b69eda11c3e8bedad8ae64dfd7f62b895dfcdac3445e3d9047a67981f3148cf5f6d SHA512 fe97f600a25d1d8341953b2e58b58dd1664d5cde5d39a7a14e04799fc9035ca66654b1de52a82be729a289b21419791558eb71910f43bcb9af797456710bc383 -DIST github.com-apache-thrift-4aaa92ece8503a6da9bc6701604f69acf2b99d07.tar.gz 2557988 BLAKE2B 41bd5325d9058225a5839485c67fa0d083d27ebe61ee332348848a0df362f190cf508d7993ee407ff514fffc4e7da8f488fced01695a8f6831e610c4a1007438 SHA512 a2d07f458e2249e1a0213be9aaae6b85e7ab69678b4ea2d5bed75b66657d364c9fe542a7b678546d60b27078582791ec59ea4f59f566dad58cc5ea8c60d65654 -DIST github.com-apache-thrift-f2867c24984aa53edec54a138c03db934221bdea.tar.gz 2916311 BLAKE2B 6b0944fb0942c271ba097525eba10fc2dcefea0064a5b46f5ed2ef6ae063a13fd06b4cdaa7f12c91eeb5e9a3d27ae3bf301eb4fcdcc750f392b60d4fb22cd0b5 SHA512 1a8a0cd26ca8514e9b7e09e1aa9d913b70aad8206384029cf852fca9a45dd7c3e5f20fdca84e5db688561784556410f6057acf542575fea0e5dce8b03e4d5a48 -DIST github.com-aws-aws-sdk-go-bf8067ceb6e7f51e150c218972dccfeeed892b85.tar.gz 9019902 BLAKE2B f85d28f2398af1f6deb22310419a66fa6c762413ca40f10e9afb7e8dfe83a46ce3fbcd88cb5de17d543366df47f28dcc3b97e2548485ca672e5ca2b6c279781b SHA512 c78192b79cf34fc7313ca6248b35f3b214cf4e001aa40a71b6f6f0d408aafa568ed1cc877d6f6dcfe0536896fa7cc617384dbe63009fb8c4eb8b38be7c078bec -DIST github.com-aws-aws-sdk-go-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0.tar.gz 6859427 BLAKE2B e57030e7ddd23ec8e062eee9a9b655c7cb691700f1c62ef1a5b0a92f905a1885ae77b44af8fb4e30120459de5597aab66ce0234a535d5211c3b1ae723d3aa547 SHA512 3686b29ec19de99f5c7202ac8690fcbb492e9abcb7ada354ac558b1b9654e81e6826ee3067cf7f541a6f0e25a5c0e071ddfa1aaaa7f980c06f990859992f2218 -DIST github.com-beorn7-perks-3a771d992973f24aa725d07868b467d1ddfceafb.tar.gz 10800 BLAKE2B 5487155a4d010af70b6ea2625d10ae03b6642507902d7dc168edb5d7cf0efa1777b248d0df34ed1a2564950b12613256c1c6ce1d8c9723cc34977ed883b21c8d SHA512 c6aa5df262ab607c0a5f64372fc2fec1ddda9e5624e9d9a22cdd1bc11822c99736d88bdf5e3fc6050217b5084548417cb2926c3940e156da9397d828d59ce277 -DIST github.com-beorn7-perks-4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9.tar.gz 10593 BLAKE2B 057738aefe26d3d42ba1bc0906675403512a7bab1161bc1015f6d833296778f2236cb2b99bbebd5c7db2384634fef62d2afbfc8dd59bfb1320bc6184105aa437 SHA512 ecac8d361b4695b1fc32a9aaf9e0785201d1bebbf270226540e2c3fe193ad21f4fe8aed4e01937bd1e7273ca394455ca6fd7cf29418710f279cbb8eb92939e32 -DIST github.com-bsm-sarama-cluster-abf039439f66c1ce78017f560b490612552f6472.tar.gz 22134 BLAKE2B 9cdceb4334eeb28362c574036cdfe6bc270930fafdaddb47c10fd629e650d9cc2f8a4984699897629064549fb8b5f069b345ca3aa7ffa1f058718c7e8575c88f SHA512 a7b1516d7a617d5bae2f0148b4f1c6f38f949a80f679bbc5ef27842b92270f5f3d3e3cb1b7a707f89bcafe11ad3f0061d5cb47ac03b980a3a430c1b6d7fc67f6 -DIST github.com-bsm-sarama-cluster-cf455bc755fe41ac9bb2861e7a961833d9c2ecc3.tar.gz 22553 BLAKE2B a3f225becfed01f5a093534ba7fe88efd3a5bb98f2a88b97db72acf5558fb7b54bfc5a2bfd2f2ba7cd6ad1b9d67ebd713db8827086329c11214d200fac3e7b47 SHA512 e6719c4a37244cc8b25a27e51feda64afb6eddccddfdd91290bbc0b60099b77379aba6fffc4c4318a2d279d157dbc3e2eb0462beeeb8e1aaee4de39415edd6e8 -DIST github.com-cenkalti-backoff-2ea60e5f094469f9e65adb9cd103795b73ae743e.tar.gz 8626 BLAKE2B a0d63dddc908f19f3fa6f3ef93efa6451ba3d16672b8fbd7bf216771c640c31b5108fabd19aca5629afc11e2c1216e2b8fe41db2e7d2e42fdabc9f9bdd5af350 SHA512 0f3318068b7ea39957e8f0d218babc395fb344d574ce66ceec584f887575b0ec41f67a407bf749b4224d12ef20d4f01436478b44802473c1dbd08c115ea62e14 -DIST github.com-cenkalti-backoff-b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3.tar.gz 6958 BLAKE2B 167cf39e313c76eeee19bf95ef9a1593cd983e04735d50c24355a0b9c8828c8004250f8e9d5d6b714b84d488e11f5ca4a7f7c6a3f8dcc7a5e1bd45d0f71b3edb SHA512 31904daa591594b0297afbcd99c2cfff7441ed8a1aac0de40b7bfa78622a1fefe672522315f26f583098ea9db23de7d902e801a369a83770566463eaaf12a175 -DIST github.com-census-ecosystem-opencensus-go-exporter-stackdriver-2b93072101d466aa4120b3c23c2e1b08af01541c.tar.gz 5184517 BLAKE2B 4445e2b7606520a84f4b236f6de54c18c4cee0a57a145ab50f990dd2a690f224baa1757e338207b10756a2f0887f192e922d61244a448081dc7c4b5b094c3a7d SHA512 e45aa8880957a627b8f398f87cfb60e1c7c2e8cb322899d55f544e9173a96660543432d2c382ae3263ab83a67118ec305a8076a0755a6eeb9ab0fe90ad330744 -DIST github.com-census-instrumentation-opencensus-go-79993219becaa7e29e3b60cb67f5b8e82dee11d6.tar.gz 188031 BLAKE2B 6410a5b2e358cdd0fbb8a68ad9ccdf3e27138de129ea4a0fdf49038e844b473b0efa3e1aa7a4f09b362349c0ec86bc96e050893f3cba8ac6a18bb6293b3cebdd SHA512 f97265ca88f2826751bdba9a83597028aa5bef65cca6a39de1593030e50a3f73cc653b881406ab8ef87d88ca30cbb6d8a37bf32e75b093dcff9d236c3d573873 -DIST github.com-cloudfoundry-clock-02e53af36e6c978af692887ed449b74026d76fec.tar.gz 8352 BLAKE2B ddb2b4cc238b52cc39852e100f7450bf97fe358231951a86844a5079a6310c3f5d729311e18f9ed85dbab5089a563ef17ca098adfa8993d9f0e6d177ff9ac464 SHA512 3abec5c46831abf5e1b18acea6933cc0cf6a8da6a0b6af200172ee1f6cfac529448c291d11ec21d1647b226140c9da0a7164930cf913790ad1ece9c058862e47 -DIST github.com-collectd-go-collectd-2ce144541b8903101fb8f1483cc0497a68798122.tar.gz 39616 BLAKE2B db86cbb25478c4e581488e463d48503dce3dafca6a3a8450e79089a975cf75c1cb5e87adea9007775243eb84a5e78ff093878e627b460cfcac60037008a2cdd9 SHA512 d692043922de0661b8bbf0e72866d6cdc16560ee6ab852a926edc77c1a4fc7830623b6471a05fd26269d6b7724bbd4dd9014302ecfe479addf142b945cb11487 -DIST github.com-couchbase-go-couchbase-16db1f1fe037412f12738fa4d8448c549c4edd77.tar.gz 80066 BLAKE2B 42ed47abc61976607719f87b1ee90bc3f37c3297c8c747f795c09e406e179ab0ea21e3566a09d8ee167d18b8b95acef76a231b179dc5f1b26fcd7e773935aedd SHA512 13fdf5290ead5e927d6bdb8a55250b75aa05708697eb7fac0c5ac0b9f220ff1e5f5f391f1a0d662c1d1aeb4b10c8627c7e4db5c4e3ec9f2699e4ac8e91972e9c -DIST github.com-couchbase-go-couchbase-bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28.tar.gz 74563 BLAKE2B 2795db925b046efea5a79e96cd0c49b254a2f18eaf34cf659dffd1bf3bbd7fba820717bc65dfeaafdd6711f29cbe511ae534b5a076977d976a989b7f74e4eb23 SHA512 e2dcc40a483df2f321bbe449c85d68e42fa694697f7bbc78505ab63f0588104c91ab09595d23270b6c011fb6fe26db37d6eb63d421178cc2f9a92282e281f122 -DIST github.com-couchbase-gomemcached-0da75df145308b9a4e6704d762ca9d9b77752efc.tar.gz 39732 BLAKE2B 07851cd9d5f0e474f5dd45685ff3b360a5f785dd09e329d3e1d691db01f7c02226d896c760b45b25824a12d46e3bd9e1da93a6902d40083be62a064ea4c815c3 SHA512 cce17d904402e45ef2f36d324f53b8b325e85f2975e73d732728a7c80aafe3cad169f1c072edce6475cf26f0f8a5c468a3718e4ecacaee779656e066f0a515d5 -DIST github.com-couchbase-gomemcached-4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29.tar.gz 31063 BLAKE2B 1448b4c68b0c2b7ca7d1c851820a51415436da3395210a7338ea4bc29fae426e8db7332b3d33429cc2e1d4f6f1590569720b4327a27ed78175335d89e6026146 SHA512 1ab837f46ca83374ff6a3577ea6095f1062427f9d12c9e82e94deb53630de84edbadee5142baff58050df4edbc5edc9a8e59efd48038fa9543650b8591ee39f4 -DIST github.com-couchbase-goutils-5823a0cbaaa9008406021dc5daf80125ea30bba6.tar.gz 8514 BLAKE2B ca139ff49eefe4df49da8296874881bcc5bc34e31de461bce1db71e34d5b8c399c153519d0d6f46831f7fc4814bfa394e26def66a7ea203e8b9016a3c83339c4 SHA512 ac9b0b643e12edeeaead60d6ad83bf4a14cc24c256ad63d4284954bfa54547f103495c924614db9d283339602bf54be4c519b952808437994a65c5be30743f49 -DIST github.com-couchbase-goutils-e865a1461c8ac0032bd37e2d4dab3289faea3873.tar.gz 12120 BLAKE2B ec04863aba2ca17da03428f4d63426ce4b9c4bec2981a3dc75b26b1001c0062dd72273a5cbeab001591b1d52d11d49def2e799297b245a8d175dacac84858784 SHA512 849f51102104d6c764eba5cf4746fbfa32289b6121089700880df264cf8c806e6e3122260fb6b3d63519fe0565f4ed1b61e0c83dac67aa3f31381e59c6a01149 -DIST github.com-davecgh-go-spew-346938d642f2ec3594ed81d874461961cd0faa76.tar.gz 42402 BLAKE2B e12d244274de239df8b72a2f020ed1f21a2dd2ebaf0448a431a9ec9d9d91a7face3f24936f3359fde39247c03c5aa5a61d2cc81bdf6bb668338cd81097bdfe7f SHA512 80b9f535dd85685cfd346b3c7f946fbc8b44d0537b7a3b7827103237a85f718fee2059067a7e1f21db13322f0d3ed1f7c44c36b451b8a6b5a0f6cf4e4db6553b -DIST github.com-denisenkom-go-mssqldb-1eb28afdf9b6e56cf673badd47545f844fe81103.tar.gz 494653 BLAKE2B 26ee26ec208e9ebf9c422a56c73cd0b4927fc2b0ec51b8fcaff70a3ec3729017f2c246133ea1f8dc5dcd1df57fc3dd079ad46b91a94be2447c8dabc1d3eba6ac SHA512 c3444b03f534a4b0d799b7ff26e17dc83cff28b9df5b1f6c1f1bb69aba7dd0e96cd293f39868cae0b51abe12e4b773e038043ad53ca103d882a7baa59d91a6dc -DIST github.com-dgrijalva-jwt-go-06ea1031745cb8b3dab3f6a236daf2b0aa468b7e.tar.gz 36975 BLAKE2B 8d6ae74ef5b5a07af42a81a6902cbb0dd73054a7c678f35bfc6397d7f9abd79e79204f1eb4aa46cb42f1314122c2a84134d6cdc22cdd987d1040d056143730a7 SHA512 4a46ca539ec70e5e8352621cba3b1da20ba3799bf7615b1842991471f812cb4877dc053e915def3d70120170cf9c6c25b5bfdbfaab92e0537835ad66f52cf732 -DIST github.com-dgrijalva-jwt-go-dbeaa9332f19a944acb5736b4456cfcc02140e29.tar.gz 34023 BLAKE2B 7afe737200300a7f05970a5d8b945a9f75e685ad3a17caabd8c4ef5d6c8916a4b743c17ad91a5947c4e63483d825ba00fb8d972a7c06557aa4b71326a24b7089 SHA512 f6b60a99250c37e9e3d983eab48dcb2f000415a7df3015f9ea2d1ed5e4f16e38bcc631f71dee30740f8b05faa3b2695144cd2de46ca487dadabc2eebf108d807 -DIST github.com-dimchansky-utfbom-6c6132ff69f0f6c088739067407b5d32c52e1d0f.tar.gz 8261 BLAKE2B 37171fb74a3a89a4f8707fca7ed05bd9ccac517722c383d2d6bc9abcaed0dd1dde5b129c799f2e81de67ee85039840aa1ff1e32f5dd8138da5f01322c104ee84 SHA512 80cabb8b8e3b420adee1701655429d72d6741652d41dd5f0ccb54983fb3fc8b30ca1e6522e99b0ca602d0478f18aa98be74442626bb3faafd9e90260f430964e -DIST github.com-docker-distribution-edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c.tar.gz 1769777 BLAKE2B 235216295ebfcf61e6fe3cd8f81ac66a0bfd9a67da6b8c6ead4c778e0fcd7ecb519bbb67711d502f5f253a4e98604fba3b055458931ab7a03b4d61fb380c8169 SHA512 05caa27ac0c8e16c7a7c1d0de0f3c0f560be51d0bf5f487f370a0b99971f88e3134448a2fd34af694f124f60515ce38923686ca4fedc8141c5bf4d74f85b0141 -DIST github.com-docker-docker-ed7b6428c133e7c59404251a09b7d6b02fa83cc2.tar.gz 7349111 BLAKE2B 5bef0acc62648953a158da9e4bfc51f191c76abefa1012ddd55bc26706b156fcb7d551404cf92ba812b81f44c9356c1aeba0c466255b6374832d1ce46db9d0c4 SHA512 fd13b9ce6fdbddd19d890d039561a558da23c8b2fdb4df746d346884dfd6cbc60c06c05d303bfbc6ff8ea2ef5ca144d49a88e9168c9f7d985f0985eb3acd4c95 -DIST github.com-docker-docker-f5ec1e2936dcbe7b5001c2b817188b095c700c27.tar.gz 7785640 BLAKE2B 64f137c9d8d781ddfac41651c01d0453c83ade6cc6bbdf36cd64f0080fc7b4c166d1655945b57701292d337938dc6624e2deed9fefd054e2053162ca7aac0d3b SHA512 ea0444b07d0fdbc7e88ea0a967861ac26ae8a33ae1113d8e32620b838ac5508e186017552454cd7f54676bd34f239324a72d976b94cdf997c8c2b666d6146c69 -DIST github.com-docker-go-connections-3ede32e2033de7505e6500d6c868c2b9ed9f169d.tar.gz 29802 BLAKE2B 60514b59195e988e236db3bac4e3a75991ee24d2e4fc404f60d6dbc332479d91564e30d7f3e8080bc251aaf532be47f242b2ee06c6c44668d14f52db9985d96d SHA512 67e1b3bdda441127e2aa72a3d7552e9a9477324db35d706c0ea84fa37953ad50b4770eb49c6cb56b9765ff57f9a47e8313941d29527224cbf587a6856d0762ca -DIST github.com-docker-go-connections-990a1a1a70b0da4c4cb70e117971a4f0babfbf1a.tar.gz 21638 BLAKE2B 078a0e1b9dc7cc80d36d41144edc772f72da9ea4ad498c615e6cfece24363e5481b54fcf0ba061121faf32118141d5671611b815a697d865f03e485912cec6f7 SHA512 08df73a0178f5da2042fc13b4ecc72fbc4e83aed984da74b6082ac7718dab1014c27a9ee4b556d53da8dd3c5afed8c8ca62441d46f5c1c39f7f6690f44c480ed -DIST github.com-docker-go-units-47565b4f722fb6ceae66b95f853feed578a4a51c.tar.gz 11225 BLAKE2B 2ffbe3d6877bed76f7b91f3d1aba481f5143d7f1b0703ae1fb4798cd09fb1c6a0c07572a40659c1604f12087aedc5c9e342903f22b71dbfdb6c17f3a85898c29 SHA512 e83bbe0227e6c27d1562cb858b678bcd26a89430b7d829b38d5dd8c441fc28da7e969b23cd1a3dbb5ecb5f68cf078e6e0958a971428e0260b4b3c2c16a3ea15e -DIST github.com-docker-libnetwork-d7b61745d16675c9f548b19f06fda80d422a74f0.tar.gz 2725037 BLAKE2B 7614de4ebae6868caa8d84b2b8c569573af60bda0a599c6d842b3423a60bbf8849f51287589c9404295cbf5da9badd22c9b2e56b77c9d68778becd031c39a958 SHA512 dbae386bb01f65547ad94a5742a83e6aa15ea7306ac8ed8c77d98c624d031ad9a0ada6eb57b48aa13fc636e0ee47fb00ce83c930ef69c6f04ff3143af559d779 -DIST github.com-eapache-go-resiliency-b86b1ec0dd4209a588dc1285cdd471e73525c0b3.tar.gz 9581 BLAKE2B 85ff289383893cd9c5a0dd6a49c6b1d519f8808aa22a79fe60e6a4a747daaf21d00bcb66ff40ce197cff029d4f8657746e05e88dbec52eaa01b7a75995770c84 SHA512 eb180b57409e85e6299f4276ea98f0fc390d2ffc67d1f371f5675cebe25d9e50fe8bbd4d5dfd11e960817f5ae42e0790e4dd7264946efd8c42680514976d6fda -DIST github.com-eapache-go-resiliency-ea41b0fad31007accc7f806884dcdf3da98b79ce.tar.gz 9875 BLAKE2B 20c62c28e7ba1b2db02b1817e3340791a3ae8b4715702a86d24d6ce9dd7b506a2a6b269dc63d68271f9fcc4c17674eb7701088e1eb8111869178a8ede25f8a21 SHA512 4e258a2a67208384aa48f54064eaf63e9e62502aca87e06442b1ce0c123202f278afa505608bdaacc6e47707bc9d8bbdf6205791f52c3c458cc9e69b485107c7 -DIST github.com-eapache-go-xerial-snappy-040cc1a32f578808623071247fdbd5cc43f37f5f.tar.gz 6678 BLAKE2B bf85ef01896a7b64677ba227cf75708da9c2210eb7cc243eb42c8ea89c472d8cb03999bc5c9d1acded002f0093744200f061477614974a4440b873dd84a9a74d SHA512 41f406db3571e640f0f4ee14878988cc7a9a7e012814cf83e3da4d96e17e5fc48d3824120534980e0050dad03571c2b9c54de953612a2c5bcb08cacc01bef9f8 -DIST github.com-eapache-go-xerial-snappy-bb955e01b9346ac19dc29eb16586c90ded99a98c.tar.gz 4098 BLAKE2B 81ca12d160ecbf83856080839df3ce2f500106bfc5a0be73f8f2f415c7fa98556fb9c1ef3d2243d8bebaf7fe0e26adb356191dfb12e0726c65bdc56cc4db89dd SHA512 2c3547cb00a1c606f2006412931360f17d7eb1a56e3bf764941cadc899f98098d49b74d1a54abe2195bbaa16ee1530a9654ebd19306466a411b392e43408fd63 -DIST github.com-eapache-queue-44cc805cf13205b55f69e14bcb69867d1ae92f98.tar.gz 3504 BLAKE2B 3e0149532ffb89b5bd6ff3c53689e659f6d4bb9eec5d6b50b8afce2c56fcabfc4e3b3ccb5fe0a2b86adf5a758c1acb36ab733efc1dd10adaf47e4a80d594c88f SHA512 5641abf798c2e238885f692262d5b6932c41c770f9a2a6806c764a31a14e14b99eccc59d3571a83919aaeaa619fe1f8e5e492d245c6d6d41fdc03c45d2b69670 -DIST github.com-eclipse-paho.mqtt.golang-36d01c2b4cbeb3d2a12063e4880ce30800af9560.tar.gz 69531 BLAKE2B 6e925b822832a1e0d2e412cb6358bd604071c86069c04e76e90b93023f61f976b6107f72ac23f401357fb6b4f3a202d6a0d2bfe8c29a074d15241dcd83c70bfd SHA512 04a4c579c00fd1e650006dfdf5df160915b2d0f60ded558a01b75c26b5192fbf2986c8dbce8dce2fdae3e45be002f73e4f72172e86feec762d713db9c878dbfe -DIST github.com-eclipse-paho.mqtt.golang-d4f545eb108a2d19f9b1a735689dbfb719bc21fb.tar.gz 66660 BLAKE2B dc2bda173e612925a54661581226f90059104de6810556517cb7edbe1cafbf232c0acdad293a4293dcfb0c24d755e8e29d8464690b3c71a08b3ffc5c47322d04 SHA512 97231deee501309fad3d462d0325e007a24b297e75a2a6df93354a3ad2a716badb9f0129649f8efe8b673f4f220fc953127c9b0dd2582fea246d5836f10d37ff -DIST github.com-fatih-pool-010e0b745d12eaf8426c95f9c3924d81dd0b668f.tar.gz 4998 BLAKE2B dbb6d34fe885d0067074de82be81ba11b09fa611a7a7637703329f5c5254ae20c59a130b3d08d58138d9d0eb3d665e7bf608efb567b061163d446e26d7546ddb SHA512 2f09663bb4e7529e0969675ecc374f634d385b0d791c3f02e3c9c6ad1a5f471f0e7b59be5975a32487019807aec5504adfe63400192ae4f96bc9d850d84ceac1 -DIST github.com-fatih-pool-6e328e67893eb46323ad06f0e92cb9536babbabc.tar.gz 4879 BLAKE2B f2a9ceb7a5cfbf5c97f4e36501ad0d3398e12b84c27d24703270af8d5f923674d129b239789df23bf852ce99cc088fbc7c2ebd65f4fc2dd442efab4e86432d03 SHA512 e2c189b201faba0547b28c1a5aad21b83435a6dbd917c6d473f9b20e76162b4a669d0d7f082a67bf49b00622b568425937e706bb786d9c3a0907e794979b0d04 -DIST github.com-fsnotify-fsnotify-a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb.tar.gz 28484 BLAKE2B c3b970c1327735b7b04c0eaa47fa0b75b98418124fc39ce9942c1886151f4f4a1aee3fb17f689fd3840b5fe43752253c2b40b0345f2c1a4d7d9b7141d4e94d2d SHA512 32a5c8757310a7f28f9cba4db45d1222aee6435c70d86284b5997088a6c12d2e8bc807aba88bc067069ffb39f18db9304b8133521e05d690e01566f568d8624e -DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8 -DIST github.com-go-asn1-ber-asn1-ber-379148ca0225df7a432012b8df0355c2a2063ac0.tar.gz 12439 BLAKE2B d49535fe09010e4c4b824d012079f0dc80ea6b6509bdaddf82f59e13920e2594cba07129499f6e6c933d39e5bc8590d856b51626972e5b42bc63cd3edaf1e1cb SHA512 472e259cd7aaf4c6270a85b7ade4392218a51c6309b1203c0aa7770bd431c0c8365c1e588bf15bf67e5298c9b7ad821d83dc97f11361bf623df28a0bb33c484a -DIST github.com-go-asn1-ber-asn1-ber-4e86f4367175e39f69d9358a5f17b4dda270378d.tar.gz 12329 BLAKE2B 2863e7dc689c46de8bedba9216ef9a9489b81d267475891e6113438e17e272b04278d1c8199281af6a9daa9e9eaecbe8cf26f2c8b130906c9c9e62c12eb4b2d4 SHA512 fbba36ee6fd0d33558d4f13b6327a1385bde914c1c40954da19039bb55dc10d0166a1dd7a8650cb9776f2aad6f03ad110fd550a49e9c934446d23cd8eb3279fb -DIST github.com-go-ini-ini-358ee7663966325963d4e8b2e1fbd570c5195153.tar.gz 34504 BLAKE2B 7c8d8552e126baa82bf9c9cc15061fbc275a730bd86ac66728328ed3fc9a457f901e864938c8a30696ccbd37c5a1504f638b96e19d5ad2af91263eb6e58be357 SHA512 47923f499ef8f3e75c3a6dcfc0e94524955f3ebfd4eba65c999bab2f89b234de5c86aef356e07043bc7cf22249c1d891b14affe9d0b1791abaa43a4a5a70fea5 -DIST github.com-go-ini-ini-9144852efba7c4daf409943ee90767da62d55438.tar.gz 32715 BLAKE2B a1aa4dbb8a77fbf6a4f1abb6a06156ae23c221077d500bc304c921d9b11dfcdfce2191e4f6d9fc94fb0f1213c53d3135b0b530ec5070a3d3fa38b81b0f843757 SHA512 ec5d6e814b34c948e2b7acb0d79f481e2d3ac4c7be79e99f6eab8f3ecf014bce35271d9a630c8dedd8c8d61fef81d90c942e08243bc33619dd140b85c06338cd -DIST github.com-go-ldap-ldap-8168ee085ee43257585e50c6441aadf54ecb2c9f.tar.gz 35732 BLAKE2B 8676f22542449d6de2b15eab088377696df3bb01daadb3f52a111fc8f87dc1ab62ccfe6f25fa0687bd161271a8564d092ec5ca10680cdcc09d6710a9f1ab48bc SHA512 892476cb567338cff9a2c46699f9b2ed85a2e9951e222f190733cb17d4c7c15be709256235f3c8d0bcac9cf2a46133eaa593051acfa204b27b2595349210c635 -DIST github.com-go-ldap-ldap-bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9.tar.gz 36405 BLAKE2B 9d246e5f7504ea880405318643dccc141b3c9fa97dfa9ca5de5f8c21d68debbe1ea6d0d40e87181694835e33bfa05696e62764b28312ef8a43e89d4c262d8ea6 SHA512 b065f966d14c216a9e4e6f58a3f17d63f952c8ce25ffe464774c6f8cc69676f2e786afec2d253eb2efe223dc3502b284cbd34465cf18b74c621073ca20dd5ffb -DIST github.com-go-logfmt-logfmt-390ab7935ee28ec6b286364bba9b4dd6410cb3d5.tar.gz 11549 BLAKE2B 19c5b90e9c8161cab97798f105c31e7f80fa4e3eb0df42b70b64dec03da057d37884c96ac849a1ae07d75ad5240ecbb48860fd306c5c3555b69ad5d499656ea2 SHA512 9d67369c83385dbba9f7d7af7b33d2beb1739d996dd1f887057f98d7c2538bb6686f71155652f67f09dc4d850dd9fa6a9c8b8ab4f646c5f1b0f6547bfbfc2f92 -DIST github.com-go-mgo-mgo-3f83fa5005286a7fe593b055f0d7771a7dce4655.tar.gz 376880 BLAKE2B 800038e0870d8b943604bc5edf9ba566d20fed75f445834801955a19da6add891f96cbf5e19a93d520d90ccc4e9da911ab02cccb710fee67b3fe60e4409a717f SHA512 f0e7948d4672d29d3d0a741961ff8a75d30c556e157698118a32de10e2af8eb2ae6a61feea1c93aff313596d285a048a70dae7339c66760ebb91a1aecfb05845 -DIST github.com-go-mgo-mgo-9856a29383ce1c59f308dd1cf0363a79b5bef6b5.tar.gz 376888 BLAKE2B c7a56c91b149f4a9465a3bbcd3dde6e5e05936c64eeedb20bb0beac3f8e49f5594db30b74f0a276e782fc49d0c38863b845984ca5968890971778af9af41b3d4 SHA512 5f9a56a750ac6bdf70f7d879f988d744fd94d85de2dfdbef9e40e69384e36fea558a0abcf7c28fe9f1dac4df2d9d1b042fb1c9a55308539766cbd26b2a38d482 -DIST github.com-go-ole-go-ole-a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506.tar.gz 51315 BLAKE2B 305b69a9ea950a496fa0479629a7a681ffd7cbe86742d94946dc6890a55b35c4c30a7317cdc336d3de372d980a60787e54b6334575a9b21b2abb00a7d99a8aaa SHA512 907c608344085cd0883a48e81ab7b366d79b70966d345541a030c827c372abbefe5b5fa4743f4d7911fc25d925c01e624d9205d6d43780294e2f99509e466b66 -DIST github.com-go-ole-go-ole-be49f7c07711fcb603cff39e1de7c67926dc0ba7.tar.gz 50568 BLAKE2B 21a9357584b08c97154907b8708916f4ee773adc6fcbcea55f5561d27392f56b698a8dbad5a47874f8b52fe5a952973a712d32c00327d9e880abcb095ee20762 SHA512 1e299650a92bfbccf88c54b6df3e0611e9d6e1ab549a0226d69aa84e1bd6ff1d6d486e6b6b5e4dc92f1d5dd292104f1970acedf2ba9f7f2eca2d9f7ac0ce7530 -DIST github.com-go-redis-redis-83fb42932f6145ce52df09860384a4653d2d332a.tar.gz 79768 BLAKE2B aa45f2cf3a78015375d827b2fd9c5c3a199914c5788f2d021de09a010e853a3bcf81f213a5743b33fdaf4357aef730d629c982afdc21d7dd1863d6f8f82b842e SHA512 653d700a5d53d843aa5e517253876973b2dda4f95740da4ea0df8c0af89e836c9c04e25554ec9c3cfa4d2103d009f953624008e7b00990c5021aaf7f04ffe61f -DIST github.com-go-sql-driver-mysql-2e00b5cd70399450106cec6431c2e2ce3cae5034.tar.gz 59901 BLAKE2B 75e2b9addf9cdfd5196f2f2716e62146fbab00f20b54ddfe7b847143d1009f2007d5b97a1e916a63c48e6d500e5f206f8134ffd872f0d81733a58548935bd85f SHA512 2289e238aa27509ba0024481384bb622736eb4e498e0982a595f8f5ff81a3dddca2ee7a49e4ace7512de2eae79d2ea0d72eefea19ee090b4412e862ce17660a8 -DIST github.com-go-sql-driver-mysql-d523deb1b23d913de5bdada721a6071e71283618.tar.gz 82956 BLAKE2B b8012edb9b6143be0da8fe6e25d9a3db8dba32366cfeaa5db8ef4c4aed48a5daf8cc5281ae75061feeb82cbed51471454fb22085b91609fe2d0d84b5ba2f47c1 SHA512 749db46ce9860da193045098000810efab954448812bf6ff9e82d958c107c1dd10926148dd7ef4f7f9c565ba2203b2b41878bb074afd4376ae6c84fa46cd4ff8 -DIST github.com-go-tomb-tomb-dd632973f1e7218eb1089048e0798ec9ae7dceb8.tar.gz 3633 BLAKE2B 2a534367618bbe36a99fd681725951e3d85d51e4e09178fbf4dc17a13f430276d12329f8a1ea59e22a555b2c8ac82253b6727e646dd1acabe3c5d945466954aa SHA512 4d566a0f57513f11666fa43c3b991d2356007db54df4f38b97b9719d623b123a6a8a5ed02d14b5d6020fe39162bb3247a7ee1e4054493ff89a4de2cbbe156e89 -DIST github.com-go-yaml-yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz 60827 BLAKE2B 3af244685ebd6846ce1120a31ef7e6c54b3b4e47be7c92a7251a1e626e875999b6e201dc99f773a60a90768e4dd885af67bc5bdb3802d327cc80894b392385df SHA512 7b02a88190835a9ed9ee099d4f8b244fad74575fd896fed4d780bfc94b0b16a6cfcee73b5afd993f2f55e66a5d25acabab24b6cb042280e5aa1eaced56da0e5b -DIST github.com-go-yaml-yaml-5420a8b6744d3b0345ab293f6fcba19c978f1183.tar.gz 70322 BLAKE2B e4284bbc1825c0e78cf2818091d2d25c581fd5da86d66eb8f91877b8a92f62400962391efb911ff33ffbe3db1de432a892dcc3670f96710fdb7c2cb191309697 SHA512 a5c4cbfc12e932f161c827537ad8366d8c003f40c3959c39bba9b6032e3d381516998a046429ef0980072b717dab0ab1df6b1ef24a43e66e1bf4bda176302b49 -DIST github.com-gobwas-glob-5ccd90ef52e1e632236f7326478d4faa74f99438.tar.gz 25955 BLAKE2B d6c9b20f80800396ebc3eba2b08ad48522d297bd0da90ed32d6ea2ea4e575e9feea112513332a3c55bbeae2569770433466536698084e787127866efaf0d25c2 SHA512 e5767898e8aaeff59219e0a0578586b63717d5c8507c74ecb813e8e8a7b02470b10df0452cc378c7f0a4b9bec030be22deb3c3ce7c5ae88fd739271cf05e36ad -DIST github.com-gobwas-glob-bea32b9cd2d6f55753d94a28e959b13f0244797a.tar.gz 25066 BLAKE2B 3560652d11e0048723a132111e168249bec29c10b2102c921763ca3db29d4981c39bca78a2665455e32fac1281baf843ea7308345de5b4ecad1b5553651fa8d0 SHA512 f4df44130776dba33d4b3879be4de1900815eb6320ec588781e180864dbfa827514b36dd74c1a310442c4fe0a0642a91b79b216541ac433efd87747641eced6c -DIST github.com-gogo-protobuf-636bf0302bc95575d69441b25a2603156ffdddf1.tar.gz 1869095 BLAKE2B 519d4e2a9973edd74093ef63628def02c2f9a89bd6554f07499e691cdff1a595abcca23bff81d5b92b375327545c01dd2807ffbcdb74c75607a4e7623638fc98 SHA512 f78b2f44ae3b90e12f3374d9be41d186b9478a0d24f5086d5dde0618db4ba093c4fc707a1b32a1db7009efc639024f198696a4b99e2c1782a949bc5f9a3e885a -DIST github.com-gogo-protobuf-7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8.tar.gz 2457526 BLAKE2B 0bf30d4796425fb74891e69f3ad825c21475bb1ae9ab432e3283184787199b31115dfbca6e3afa4bd88eed5c86a916d632f964581dea021c1d93f1d6288106f2 SHA512 ccff6a1eb46eb4e893e80088a13a5b2eee3be63fa8357f9a1feff260af1501b1fef36f4318044993cbded9c225f1555044109389dd4a542b7e229d0d0898f3b2 -DIST github.com-golang-appengine-b1f26356af11148e710935ed1ac8a7f5702c7612.tar.gz 302797 BLAKE2B 45f8cbed2aa2120f8f82aa21a9f3bdf3009d729ef879c8054188312182ee937d6060d5f95cb246405bc4f8de92d95a65205744922495b91a12625af8e39e81cb SHA512 fd833262e344fd866b2c9f69461f5ea71a14478da293361daa539e5f1ecfa5021441354e50ef636579666081668b322a867be6d493bb273a4162b93f2a170455 -DIST github.com-golang-crypto-a2144134853fc9a27a7b1e3eb4f19f1a76df13c9.tar.gz 1617611 BLAKE2B dda7ccdb3288f715c690a61c5b2a6a4aaaf636d8b12379ae09dda8901ef84c8761eaa0da664bc965e6a6b25961b71ff571e00184eea4add3455a175022e1b546 SHA512 4c38f7f4dd8a61ece0faf7b1399cc7adb5e445c59190ef42bf953a8872c0e52bdf6afdf2b2bbd921e76917385f67308377b6d6bddf8466e6c363994155bd5948 -DIST github.com-golang-crypto-dc137beb6cce2043eb6b5f223ab8bf51c32459f4.tar.gz 1306030 BLAKE2B d504e9205dc7532b6735d97d2c761bf19bdf1ac2677f32515c298502e65d03287333af9458d9052b14ac520733dfd5c31d824c007bf68d20dbc0a9607dc64de1 SHA512 17d6ec6de00372b4c7ebc19a6d17410ac4da431f226a61b7a0e11e5fa3d0ec33b3baa99488b5e5f9fb2662313d0d6d9dc6bb5044499b8efe9c3c55718415491c -DIST github.com-golang-net-a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1.tar.gz 964430 BLAKE2B 0bfffcb7969c3f77ba87a04e6ee7ae68b265f73cf87fe9e7e580641b1c657001e8449443fdc08d9f37805e1be19b0722d7d08eb4968a289a4013a7c2718d4ddc SHA512 f8028e92d0908f265e3366ae87ba9a3cbad6028f1dd26abde1c51b4b1b3d1e982a1b4db6831bfc15a429a2f1505d149cd192d1d6d9dae9a6ae1f40408a6a654f -DIST github.com-golang-net-f2499483f923065a842d38eb4c7f1927e6fc6e6d.tar.gz 768453 BLAKE2B d65875956c833884b408e2515ba032ecf2138153e4ca71821fd48aea6603312a8a5c68a6212676cdd09255d19785aa4552c867383b157368b0dbf42e7f5b157e SHA512 ad0b00afcfd95101939ec307eb6413f638797ce464cd13c4b5810032f633538be297bb30a785bde7623da8eeb6007814f0531572acd67b1b5c5ce0aa1de819cf -DIST github.com-golang-oauth2-d2e6202438beef2727060aa7cabdd924d92ebfd9.tar.gz 43155 BLAKE2B e4455c5b5ed4cb05ebd3ca1fcf453ab6a0818c7a9b3b7b3151ce51778118f240041f3e27107bd81152576ed3b669103a020f06a5185f6f8c7d246fb47b9d416d SHA512 bf4e293ea8687854f8f5eaf3bf1fc127f5a0faa6d97f69f7891d9716348b583fc4b20ebfb6f527ace295e704cf4b12eeb8764ffe53fb0e2e973f11c7b8d5c650 -DIST github.com-golang-protobuf-8ee79997227bf9b34611aee7946ae64735e6fd93.tar.gz 245349 BLAKE2B a0d22b7082457695943afbfd1a8fa64f4aa1c4e26ba793e46d0234f1491775299bb9e554bb425e2dca6ffdbc7a93257b9ed9475082b9ad2b8721719d666712eb SHA512 2961830ee5655aa456a6a38abf304bd242869568f4dd8e527dcf7118badffc037f85db43807cc6ec68a7cc40459e0e277e646df7798cc217cc8f94e9f5782d09 -DIST github.com-golang-protobuf-b4deda0973fb4c70b50d226b1af49f3da59f5265.tar.gz 325072 BLAKE2B bfd31df93d9f3452fe440fa1d8070a8361ac127b620cceb1e63cd71b2e7c744c9324a9388cd07264a243ca7195a8874c73a13651b0d66a69a5d81a4898019d09 SHA512 3fd4fb54d58943fd20b040913a7276f1ce69f7caec9cdd760da3a71ac469479dbf52a74f83e4e9c13282cf553ac109048cf047532cd331393b0881ab08684a98 -DIST github.com-golang-snappy-2e65f85255dbc3072edf28d6b5b8efc472979f5a.tar.gz 62611 BLAKE2B 70e476136c4ab621c38e1335a61673fba0fa085dbfadef480b75d06b1d6759abda7db2566938a9af1112302217af87f015fa9be2c28c1e9a80288158ac28cf18 SHA512 3f0be750c0e40266a4c621c5bbcf4fccf574350a6d1bef00ed9c64492767ef77073a17401115c5dee30e61570cc50ff433c17a3fa9c0bec7b3d2a7b9db4483f0 -DIST github.com-golang-snappy-7db9049039a047d955fe8c19b83c8ff5abd765c7.tar.gz 62082 BLAKE2B 9d54c5fc6331498a2a5f39e498b4be5e6a5401baac89604c13c6ae51dfd98b1c6ecc06b3599b490cde1f698fbbc58339eb613ca28ac3353a922f0b52abf05756 SHA512 ea9a2c789339d3622d20ba7863056ee6a64f53fd5f44c0ca9a75b06f1631160f3f8954fe54538e5a89145b6ac164f388d301bb1c160c25b16f25c895e2c9899f -DIST github.com-golang-sys-739734461d1c916b6c72a63d7efda2b27edb369f.tar.gz 721157 BLAKE2B a78916105f6c59222db0a03862f33c144cfb2965279c2106618ccd61ed65b43a1b164e47d44f49ed81317cf8dfb886049c225df580d03e6a3d3fa9b24b5ef9df SHA512 fe73054e5faa53c518304965703d35538218950ea90aadddba4b21dd6979cf0a576da83ff66edf51d3c507f388874d56e22c93e67d59ffee7d1571ece793203b -DIST github.com-golang-sys-ac767d655b305d4e9612f5f6e33120b9176c4ad4.tar.gz 982222 BLAKE2B 2a44257a019bbfbe512c92a1cae87f3c47eb84141a555fa91b3bda1d8c1875430f297624701f24e7b5251cf317b5ac0eb97d1a7390c14df2735a1a7aaa5cf8bd SHA512 5c99ea8cd842a56380f19c08c24d4476c490f76c87083825db00b40ef24f29c2bb24eb695513895cc8151b98b8b9449db12489e59b6faa528cf81294026ed6b6 -DIST github.com-golang-text-506f9d5c962f284575e88337e7d9296d27e729d3.tar.gz 4529172 BLAKE2B 9afdf1edc0e31d2a1744d85e42f075eacb3b784d21d732022d6e5bfdba95a75a5d56711050e96aa954a290ebee0f602cfa08bf66c4d427db86ee9813a2bd8925 SHA512 301be86bc78e711046b3a1e5dedfbe53729a4ab72830beb9246617e4699a979669d6659102fdb2eea27d98784ebb3bea3f360d55ec589c7c0d601a9e4756a5f3 -DIST github.com-golang-text-f21a4dfb5e38f5895301dc265a8def02365cc3d0.tar.gz 6104978 BLAKE2B d8fde4e6ebb493541a73eeaf273b02f37ffd2dd83ade91ae37c16d19c719a017e3e22b9927bccefeb2f29c703f784dadc12bc616d2a7005352ce3e21a59a9357 SHA512 582eeaf7e65e1ba4ec7bb18f7b429984b3566dc6e5cab3c88910c5d66c0d0fbaf900daa26cd5a0e708cadb695501e2557016d138150b1084ebc8a37ea02a40e5 -DIST github.com-google-go-cmp-3af367b6b30c263d47e8895973edcca9a49cf029.tar.gz 57938 BLAKE2B a10efa5d85685480d114cbb963f62caeee730fcc65ee4214d7fc2730d343708c0448947ea6bddda53cd4e02908cb0e7c665829b72a5c40646d01eff2438b8bc2 SHA512 9b4e5d4a2f224863a41e68ed7ab45356a44da0a176b51493a5c59c19239e2311d734304a1fbf60569d6efd6fb190d09f5dee0672314ad6dcc68d179b61defef9 -DIST github.com-google-go-cmp-f94e52cad91c65a63acc1e75d4be223ea22e99bc.tar.gz 55190 BLAKE2B 96192c137d06707b736f948a3ebef8fe596eb6fb8126ae6fb31875f1c683c06bbb9d3f6c01f67764556f04b09af16a040c36d2f7fbfd562366b77381d6749c3b SHA512 908c0df04a7db9127a67f74af83ea4ae00e5661cff66e8aa033b6bcd8ba9df70ad6a90c2d6b1c3372cf62f6890837abdfaaacdbc4318905f9e72f2b8dba15485 -DIST github.com-google-go-genproto-fedd2861243fd1a8152376292b921b394c7bef7e.tar.gz 2093876 BLAKE2B 1677b947d29629b176212b51c56f0ce0cae918f9c37c35f7e5aac121114cbf6dbbe81881df94c272242bf49d51ae125ca6ecea98294cecd253ffae6c1e3d0f52 SHA512 81079873a66d3e2bff33e7fdbd64a63f086db110bbdf89dc0520e7646d29d78b1990abd1725c2b2fd3eb3203c271bd0b0b85e0583ee42769df708cdce69530ad -DIST github.com-google-uuid-064e2069ce9c359c118179501254f67d7d37ba24.tar.gz 12733 BLAKE2B fb29066f37f5f7d6aa5c7e0cf4a90b9b16de012d809034aaaf10ed4a43b5941e68c8925fe991ce5b25fde56995e8e66317fcab2caf97a722b12cc03825190488 SHA512 d3c2b411793681cf5b55438e3ba23512b6edbc48677c2efdbaea02d226519690525aba848cfde45205dafa39fda9f2868960b39f744aec80222b61dc42b77da7 -DIST github.com-googleapis-gax-go-317e0006254c44a0ac427cc52a0e083ff0b9622f.tar.gz 6194 BLAKE2B 1989ec7d4037c79b9bff29517e710003c52930e43f80f6c3afffa88a97ae4dffa073122326b7544cef3e86d72025707a5f888e6df0d934bb629078fa7aaaa821 SHA512 880d9a46a9ed3814546049f50b71824f9b59bd89dfc8c8d0d2710a69eef5036f70a553495c72783d9d8336d05a6caf89bcecc2be2f5ad2667d1380d4ad8ac2e3 -DIST github.com-googleapis-google-api-go-client-19ff8768a5c0b8e46ea281065664787eefc24121.tar.gz 9556400 BLAKE2B 5f6a7d36aef23f605759f1edd6d0c1ea3a4e997cee69e0be40352a5903675ae5efa530fdccddfa3dacd94386d4123b487e6cb1078984ed16114eccd0249e96f2 SHA512 8ffe18134e23cae721c1cb52ff7b4421715505bbb8bfdfd8135b0ba9a87b2ccd1e5b85656394c1fe3a1e515d00fbbd80b9d757c963d42398cb50390f7acec160 -DIST github.com-gorethink-gorethink-7ab832f7b65573104a555d84a27992ae9ea1f659.tar.gz 276321 BLAKE2B e12a4077d72f2f0dac7bdb374498ca91acbe0ebb6d2937cfec31db99b3420315f241125d4b5b027d2da8bce754a5e7d4221840843c7272414343c046487f9029 SHA512 21b4df7644cf280d072f9abb8a099b2ff19548be6b80e13ce089d2fd052459084ac10c1b40233ac8d0ebd865f9d0f1db99e30c9cf01f2983acc26990c7274102 -DIST github.com-gorethink-gorethink-7f5bdfd858bb064d80559b2a32b86669c5de5d3b.tar.gz 277174 BLAKE2B ce301454d8a63c3848d386885123044621bb7f6c2e941eb550332d72bfae04997831e73986d2eb4a017014a5f62acfb1e912cc0c0deda072943c88aa980ad6b6 SHA512 f6213bd6e8d07733cc207b07582543bef1d82e613e1d1cc3ac7efb69da22cf70209184220055eb1dfede530e54cdddefdfb5532aca0e35da114907a2cab21687 -DIST github.com-gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz 4578 BLAKE2B 21223f052ee73eb2e6b3c20f705f7470f6d1d528f8cf99ca9b62cbce84b8a97aa951f0dc768ef7e5234b8e1e11d08c8b2ac6a12350722742ef1164988bd8ccfc SHA512 12bc7a9c828c450e1b2734273d7791dacb50ba0056922b63e73f96878a2b6ceeb8718caf71421c099d38991954030601b72b30d930e222af161eb3d39bd94ea2 -DIST github.com-gorilla-mux-392c28fe23e1c45ddba891b0320b3b5df220beea.tar.gz 27866 BLAKE2B 2cab1558f5c4d6c298ffc63257deafdec390220d965185cc9fc3bd6c30f49fb59f30d3a4b93741e52b284d70e152f02178045fb89f0c3795779b346e9929456b SHA512 6f2f0727b5e7e62ff51a5c1ebd7fe0790571172010b5c14adc7e1ebe5b74a4cbad37ecdf6e9cd76b0eeac6d4372b887907376100436bafa06377f1c9e03cce59 -DIST github.com-gorilla-mux-e3702bed27f0d39777b0b37b664b6280e8ef8fbf.tar.gz 38111 BLAKE2B 67c8a01011e5b6ccfd96b71c09eb677a7b997e50cee9ce3d19ac089ba1eef2e1d0b7a561071d28dbf313df2792ca6d321ce257eff2e48f708ef0180f026b2d11 SHA512 0659510f74d26810b1be9435fb980f58e01b6343a158f8f86734a7790f3f6e5a4cee333479e2c1b77ae19c26e00ec160f02c8be451fccb021d7e44a83ea0aa2a -DIST github.com-grpc-grpc-go-168a6198bcb0ef175f7dacec0b8691fc141dc9b8.tar.gz 495224 BLAKE2B 5556204bde86a7056b47e17aa057499d4d20a346943cb3c6c1de88abb86617afabcfecb4d18dafac3ad4639d85e500365e82d4aed7e1d49b9cbef1ed4db51afa SHA512 cce1598393f91cc511961ac894d606cd695ac274142116f0bc1cc360a25c46510804fa27e193db3ffba0544970be1514a43a4ee3d8df76646794b79d01ec19b5 -DIST github.com-hailocab-go-hostpool-e80d13ce29ede4452c43dea11e79b9bc8a15b478.tar.gz 7027 BLAKE2B 6857f6b8ab2e3d3ee2cb30503778931b560384d55e529c99df328804922c967edd93c9818622f86f5277f5ab5c055eadca23815110aa90c216a22a510e584fda SHA512 c006f41ead9e8e0a85a15a7e82e3c02dc251841e14d417fed776f4facccb7ca85d0ea8f8eb7d23332ab5061e31870759c0b214163fde683b6b9439682042997e -DIST github.com-hashicorp-consul-39f93f011e591c842acc8053a7f5972aa6e592fd.tar.gz 14832820 BLAKE2B 6c60b4a54a1ee17eb4521ab3c750bdee8e917d0249e72647a05207f3b846a271689b1a4762fa0b8f435031ac5d3b1ed5c4d3a811f9b36eae744673285ad94ada SHA512 db667c39e9679a9ff902f31157a95c30a474cd388200571a237f70202e35c5b78b5b3c07acaf536c218cf1bfccdc48f36b75a6347908ae4746cfa61655d4179a -DIST github.com-hashicorp-consul-63d2fc68239b996096a1c55a0d4b400ea4c2583f.tar.gz 5027123 BLAKE2B ccd76226e81cef368a69eb79d6f74247ced5d058d5520d6a4d3449d170dd644b9296f42af61dafe6e81cb877bc3738f0239e14d3ed725d3e2e502d5e922251a1 SHA512 73fb050f4ae50bd8eac040a0157574824aec4157f6c4527682b1d9759be4bdbed3ecf39ceb6f2ba3843230e9ceff4d33e261ee56ed7def66c71d67585b8634ac -DIST github.com-hashicorp-go-cleanhttp-d5fe4b57a186c716b0e00b8c301cbd9b4182694d.tar.gz 8013 BLAKE2B cdc755ebc4b23c6a82470c9269e388429bf81357f3eed8b27587b508747eb46b3f2b803efb0d13f8cc7df5b18eab1905d8c2cce64661acbc59d48c3d1375d580 SHA512 b782750269060a7ce7e15199fd440584b4f71cc60c7f39922cd7ba09dec4a17bc2b97c017d589b212cf4790df2baf28cc5633fcbbf81604df134ebec3d1ebbb4 -DIST github.com-hashicorp-go-rootcerts-6bb64b370b90e7ef1fa532be9e591a81c3493e00.tar.gz 11602 BLAKE2B 062c74e0d24d88106e64b9296f0827ac2e9ee3d11824c3a9f26ad4bf88a43284f46a6baaf738b071e15ef31200bb6df134181efc8e63a18b64d0af2d11bafc4c SHA512 46344ed3a666f78a4adf6a978e940be080f2619a476d025f2805c7e7a663f3fd85d26f5549aa02e3030ff43cc260d0dc3c78a5624d8545e5ab599290c73c0f39 -DIST github.com-hashicorp-serf-d6574a5bb1226678d7010325fb6c985db20ee458.tar.gz 1446430 BLAKE2B 9ca21732b529a5086aa239bd0eee88a6fd3615e1d69cf4b8cad848e1fd861bcb6f0457a2083d97b7e2ffc7d4c9a8c83ae239ce5cc106cbe3793a51b45dd1592a SHA512 31ce02bf02a9b6dba82a9cda4a816be2b1cfdb304ef1739af5d37fa702162c802d36e32e115cf985588df908b7e52d70c2f1384e68fbf924190c1dac220d085a -DIST github.com-influxdata-go-syslog-eecd51df3ad85464a2bab9b7d3a45bc1e299059e.tar.gz 105184 BLAKE2B 91c3ef440bdcef520c12262d24efc25ee1aac881c5da30046f78c938024d8296b75c9f8a8eca773370ab409088b8f862b80f3c5f96f902857b3926f0737d82ee SHA512 9373151efefef9abec874b79eacbdd0d218ce11662d353c3c8a5155baf44121a8fe18b652a116ddb5ff2401511c171ace7973b7c9b25b0d9c23188a31e078b2a -DIST github.com-influxdata-tail-a395bf99fe07c233f41fba0735fa2b13b58588ea.tar.gz 38156 BLAKE2B d4d58b09c4348743583d3f51101e75a9ba2cbabf68a888448e4f8d03059da6e18a45ff476f55ece01be517d76eec56daec19987ca10e6563bc135c08d0f25637 SHA512 fbbf6dd993e2fea9f0b5680dde8e71225ed05553399dfc0f3997646bdf9ef7a7d547dccbf48c54b18181f992b98aaa3a4d229b4a785c43fe61da7c6e23874b00 -DIST github.com-influxdata-tail-c43482518d410361b6c383d7aebce33d0471d7bc.tar.gz 38193 BLAKE2B 0f6897c7d93549412ae8e615253cb7b5662477207b754b5fd4947b9027e24d3777d2e46da18d6641a29e4a7a894f410c498e7d71ee9e7ca85da264a2ed508ac6 SHA512 c5194630564620cc860aaa1b2aa333731a54c1ccecef8f73c723b1e808ce33c86ec12b846adb746f1d8110ce5fa98b5fefd2331e69e840a212a89424781640d0 -DIST github.com-influxdata-toml-2a2e3012f7cfbef64091cc79776311e65dfa211b.tar.gz 34658 BLAKE2B 9a12af23ef2bd7279f33a1d4f5f4801898ca46675861234694e04d4f44859932883c04cffb395a60a3131949ff7237ccc25719fd3952311de43ec11d3fb312d0 SHA512 afb0cb4bd9f8a995f0354ed03774dfe3414c00608ab3cb28661e2e34d42a9e8341a4c7c0efe98b3fdacfe097d143f2ed94562e84f202b239b6376a2badea5612 -DIST github.com-influxdata-toml-5d1d907f22ead1cd47adde17ceec5bda9cacaf8f.tar.gz 34616 BLAKE2B ee4e675c5602a919a4a5fe01e9a70d2c9ce9efbb9350377aa2851b2cdf3499f5615336cd538a8611b5fd5f6315de081eff980628d4a65707f735bc7aa09fd7da SHA512 ab37be1fcd5fd63df37f51bfd2a51949f3b3740bb006e3e786008aa5877be440f185f67be39709a8ac8aa6a44f515b162fb318a8cf29da77925c6943e37ddab1 -DIST github.com-influxdata-wlog-7c63b0a71ef8300adc255344d275e10e5c3a71ec.tar.gz 2720 BLAKE2B 30b034d4e560f7cdd9f99d1f1a7a0bfdccb58692e5b78f083f9e828352e88cf5a21ecbb20882d36b273aa41a9f447637e74e621944dd790129bf39401288afbe SHA512 40e5e310ed371fe0c43bb15d926b44a5ff1fb4d79b39864ff957e2d45fb1d509c542098ad701f5b5ccdcd000ab52d03eebdf81296122255b3709125dade4d9f3 -DIST github.com-jackc-pgx-63f58fd32edb5684b9e9f4cfaac847c6b42b3917.tar.gz 178235 BLAKE2B 3ebbc4e93e4b3a88dfad9d0986ab2705f9e3ed25fe5401e983652aa75df22185f86b72a20d17f5019264a908109e5466800bd5259cc4a453683ce1aa8cf68dbc SHA512 532d8379b951a33e47011f5d60ea0ad4f028054c0d44f29d179bebba19a5c1da37c6ce615e5c20ea575824138907f47c45219527a1d925b2b055155358a14fef -DIST github.com-jackc-pgx-da3231b0b66e2e74cdb779f1d46c5e958ba8be27.tar.gz 187396 BLAKE2B 6f65acd50ac2ed6409f0d5849245b9c2f75b848287b5a4fb85bb5e6a2e95d5e25a4bdd42e7423a684c02b0459d6475d6ee03d185fbd8f5ff4a5624ddd352c616 SHA512 70a672b4e23a79675a40d187d3b26de1126af3d7b39bbb8c46b9fc0a0c939bb849ae1a9884645b4edd8a7d98aea5f9ef7becbc2ba04b232f248d6e3051f170b3 -DIST github.com-jmespath-go-jmespath-0b12d6b5.tar.gz 48285 BLAKE2B 3dd3d6729fef9fa3f5f7aa09fb9114267202a90d5beb44f996406f9a45c02a281d8a1eae3f5125d03ff267b9eee874b6415891fad21bfaf4e3d7e09125d90419 SHA512 e5c1e322b1f9506edcc1f1bb4efc2d3a6fa440abff16fa3557f4ecb3e82b0be1cb9511712d3ece32e7c247c58ea3aa07197bab0ae2e7aef262aa97adf83dc253 -DIST github.com-jmespath-go-jmespath-bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d.tar.gz 48281 BLAKE2B faf0626c889aa412c439c5e81b001f7605ee6010f5ff4614933c4c1b43e00af605f221dd1a85977a930b65aea385944ec6ae9ef787a47f67159a3852dc2dd340 SHA512 55d78af08f936ed24ca8dfbbc20176f6b3145bb5ff68da9be47ca8be106b99d79364efd1d7044f605396729c1fcc9948bef233520bb3b8ebcbc5cb999579d05a -DIST github.com-kardianos-osext-ae77be60afb1dcacde03767a8c37337fad28ac14.tar.gz 4860 BLAKE2B 8f5958f711e86899267876fa27d534a34e8d48d07eddb14a82cdad1bd4056e525e74e41161be398e7da9c8c4bf7e03a1dd90e897bda7463dd7c425a20b94c8f3 SHA512 924fb47d68a300e7a17e67259c1ca6f395c23a2d630cabccdcea7ff76a9087597b317c2cdc9cecc42d885ce1e8faab338539f210681f02c695657d7b17039bc7 -DIST github.com-kardianos-osext-c2c54e542fb797ad986b31721e1baedf214ca413.tar.gz 4725 BLAKE2B 6987a7b1fa546260189b272f6650fa738499230e08c9140ece62f1d9c4d65db7be10b37784b742ce15764aab51c43df99e9f2b61ef038ba4048482bf442d1c37 SHA512 178531aa30f0d67c452ffa247845a66f92a9831a5a96e67a2ad7102bd38edbdffba5277c3338e84960ced5cc2923534210bbf8787422fdd3035a6c6dd8d8dc93 -DIST github.com-kardianos-service-615a14ed75099c9eaac6949e22ac2341bf9d3197.tar.gz 16622 BLAKE2B 77b144ab1d7aa1250b8f35548d7b6285724f1a9b6a741097841650d2fd10dd39add968a75241e3c9a02fdae52334e225d639e319fad81dbf06feb192983a7571 SHA512 079b67f5f11ff0d4d4b22d3b415aa5c052e8f1f086adfd371d8a34eead2f8aabb73fc15e2fc1f6b6c1dc59f49a12801d6cb750d5a43a115877dd395fdaaf8948 -DIST github.com-kardianos-service-6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893.tar.gz 15922 BLAKE2B 7a6b29b75214b95a49830d498d1dddd09610c46a9dbf30cc55dd16452137843c54fffa467050e5a3942cf3aee286b3478d306d08962a8dbc6eb20e91a8fcef9f SHA512 5c801f4bacd1e27e06b0a74dc6cea3a580a4cdd399b458839c801426ed9752e9d7ca6bfba10c396b32d79026a302ca3df2990f2909d6c5aa7d5bee80dc3cb14b -DIST github.com-kballard-go-shellquote-95032a82bc518f77982ea72343cc1ade730072f0.tar.gz 4327 BLAKE2B ca31068aeb60ebea4568901fe91de1aedb6842533c98a9b2cfe2a989d6f0a3dc76cb113989c84acae934150f599173af186b7886661ba94a549dedd3508b3cf5 SHA512 6fc381005c055aff7e451145bd2dd5a20591481b416d2d94c1c05ddcfac84c76e3915046d86073f3ace97ddb38eeb6e8a925825ca4629f1687b7f274809d9c83 -DIST github.com-kballard-go-shellquote-d8ec1a69a250a17bb0e419c386eac1f3711dc142.tar.gz 4202 BLAKE2B 8f40c6208af2312edc64666aac781b429199d6a02a5d6efcf30550557760b648d19f178978eea6fa5075cb62fb35fba45deeb97516eef18fb1d2f3523193d9b0 SHA512 ec09244c4cfda891e4978573fd427972d2a85e48ac66b91736b2a5d158f5e6b511e83294e813fb867cee7e8fe05341b429de857c6b7ff5b4f8581722de66529a -DIST github.com-kr-logfmt-b84e30acd515aadc4b783ad4ff83aff3299bdfe0.tar.gz 6414 BLAKE2B b0d633853512aeafdede7ca3d4fafc0f94d250c2705e9d3978397731f5d6797e3e37df5f7dfb0e7462d3b539b0fb9ef80235d232bbac5da3c9a22571b2a509d2 SHA512 852c5952a322eaca5b43c5d9162d7e83032dc9ec4c48b4d5086221bfd965783f70487591899a4ad2e752ec66081bf839ba104bdbaa3fae638b1c0ad6fa63172b -DIST github.com-mailru-easyjson-efc7eb8984d6655c26b5c9d2e65c024e5767c37c.tar.gz 74245 BLAKE2B 2399117b6dc83eca81f2216eb263c896ff5d324a3f592b84fb7056da7634065ca79087d47d8ce165e801b0c3409e5124d6b794ee807b39b722bf75d21de29910 SHA512 84d8e7f2aa5d70487f35dd8db71b3a13cd01a24a32f663ecf2fa76e789ad5700c76d83dc54958a1dcafc8fe764064258759940f3883f18fe65fdca3ad4107f71 -DIST github.com-matttproud-golang_protobuf_extensions-c12348ce28de40eed0136aa2b644d0ee0650e56c.tar.gz 37215 BLAKE2B b3b007f925a4a1c1862c8cbe34c5cd225dfa610ad8c56b5328e6920a44b507680daeea97209370bd6b259654d0ca5791f4bcc54b8bd8970b9aaf994eada16d4f SHA512 2f78290d1448cfc041d10210092d6da6f3df2b9b6c16ff730750e976e450dafe2645ba945319a0a3064c88f9c18652c69c0e0cf69d8931c08d23ffe65a8cc07d -DIST github.com-miekg-dns-5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1.tar.gz 2522486 BLAKE2B eb77d61519b72d059e7058fd4064edef049f523e04d84374cfc1f05b419ec258c7d38bd039e4e89287c572cf989a4cc91b1e163ea25d33db8b5b48e27b73532b SHA512 1f1e140de386daff78612cf66fa4083a42be91221b09cda8e81cd614566202b704f9ce9bbdb1afa7049eb539c4b888517f29e746aa4f8e259f04937c9d00ce5e -DIST github.com-miekg-dns-99f84ae56e75126dd77e5de4fae2ea034a468ca1.tar.gz 170747 BLAKE2B c89f7b33be4cc560387eb4d81cf19fe7e73632c3683a48a9d39084e5f8710ee334e8510525ede01ac160a034b91a08c80a289a803813af8b374150085108c4ca SHA512 5f6ee2f3c7d120a5eebb40515fcc0fbf27e465c24c464f95756a7a959b61b1c5bc598a5a8aabbab96e5a9a34b745365b1da88fe59a2411c72b7a2e193138b2c9 -DIST github.com-mitchellh-go-homedir-3864e76763d94a6df2f9960b16a20a33da9f9a66.tar.gz 3174 BLAKE2B d48095240a966184f05e8cc555f437cf7a20a43ecec22baeee3eefe6b7357ca551cbaca7ba878da51c420357ead39d9afed3511f61142c622964b40047e9bc2a SHA512 1e670fb90aaea6dc6bdfe86aba9fcd9692d38176604b9e960aac08f9bb9c836bebe9559807530641cf8a64a9a74de571afd59284de8441ce148405f4198cfcdb -DIST github.com-mitchellh-mapstructure-d0303fe809921458f417bcf828397a65db30a7e4.tar.gz 15563 BLAKE2B 18413ac854e81ae19576dd7be5d6e2c09bdb6ec8c2c72770ccf1c3a4bca1d7c4f03065a94fc966a22800102c6aeafc43438c50aa8bd88785849316f2d8a5226b SHA512 f4a77684d2919f48c274df444525772e0714d600fa64523cbe0598ff6294e0806d7ce7cddd34b87b852526c0d7ddf9ac2b65e38ade9de8b86d7cf04165886287 -DIST github.com-mitchellh-mapstructure-f15292f7a699fcc1a38a80977f80a046874ba8ac.tar.gz 18797 BLAKE2B 6ed634b5d0e7a4fc586f30bfc5b4c5767e3f17d5fc61e51fea9bd2840bb1707256998cabf64f9deb08b9cd12a3d903f188d7850be0fd9f99f6a25279cfeac8d6 SHA512 36dbf10aff4ba4ce64f4a6a6d83842304b0c4610ab13b0d6d1a10f618775b5cd67714ba50580fb37708cf3e36c3d6253281bd98882000a72fac7c8f50fbc6f21 -DIST github.com-multiplay-go-ts3-07477f49b8dfa3ada231afc7b7b17617d42afe8e.tar.gz 14599 BLAKE2B 34c80983a5f2901ab06914458bbd06dab07b82265daeb8aac4551ad2b207dd1ec0acb2e24fe105afe9e4dc39bdf70ffc66a865b3b00eba0a3cf473de5bbce0cc SHA512 e3af204913206ecc47bc47c45ff0280caff5e8b50b16b36f572ae7de068607962139b59ecc37d0d88b99080c22b19603878a864f82bf75ba8140e22efaf250cf -DIST github.com-multiplay-go-ts3-d0d44555495c8776880a17e439399e715a4ef319.tar.gz 16536 BLAKE2B 9448f9665eef35ada25a9545796226ebf9823f6bc8da506fe1512c4df6fc7dc2cdeadd61a51d1f4f5631f2a839aeeb6b375de7ae182d5814bc5bc9b84d3899b5 SHA512 0803b6c78d4d50c1cb220ba1d575cc69d4dbbf1537539f5d27ee4dda40ca1ed39e6758bea3a0e745365e67a7b477a9e1071b1d4294144fa89dbe66e55677df9b -DIST github.com-naoina-go-stringutil-6b638e95a32d0c1131db0e7fe83775cbea4a0d0b.tar.gz 6142 BLAKE2B 0d210f98f23ebf6f0a4ce27341aa204018d26f2bda017694cb856b6dac2fabe9865369ff80c73bed4801f4cc6c1c2fd7a6567835b80e42ce20a46cff296f6426 SHA512 cef5fa3926a464cfc655345d429644f1082211b003de64e4f2de5809fbee68c4935c2474ad502b56112132149c87a66c9cc353523c526359bf46bdfe0a766fbd -DIST github.com-nats-io-gnatsd-6608e9ac3be979dcb0614b772cc86a87b71acaa3.tar.gz 362095 BLAKE2B b78271ce401998eeb075b0eb365b1f23a3e16d6a08075ca8c97cbaa576e0997ea39905d23d627afb8de3ed68b725c3cc12158a54558faa73d92f9fed449f4691 SHA512 942508ebed3b5ae8a291588f59aa5dd4c70da8b022ce27424045dae504604865f048c1f34cb195ee5839df25b60a3306bcb1a1359514a7ebcbbe3653deba04b8 -DIST github.com-nats-io-go-nats-062418ea1c2181f52dc0f954f6204370519a868b.tar.gz 100264 BLAKE2B 50001e442608abb02d22af11e01d14a2c94a192b41dee6e16c9ad385a2caa5cca505126f1e070d7c4499709c4c2e076f9385d289b6af898b1c8a70a8adc8c3b9 SHA512 d4deae5b279f076c783985f1428b143ca90fcdf4e543551a059979def542812fc0cf71432ee3d2d254db372ba446ffa3dfdcba5e98c61b95993e9aee675607fa -DIST github.com-nats-io-go-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz 82096 BLAKE2B a6e36320c2ce772120b8eefe76a343785fcdff5e8f8ae382cf978a2376458a2ab2bdb7ac06923fd609ab61d9e4666c977d1bc774ae019cdaefec991dfdd030cf SHA512 7490c5dc832a18410a60b64b931452d840d422a469c3540d89e1579692211a1599eaa6e372bc9cf7c2827109b35d65d661a0546b4fb989e5dfd5d8f3b2d1343c -DIST github.com-nats-io-nats-ea9585611a4ab58a205b9b125ebd74c389a6b898.tar.gz 82096 BLAKE2B a6e36320c2ce772120b8eefe76a343785fcdff5e8f8ae382cf978a2376458a2ab2bdb7ac06923fd609ab61d9e4666c977d1bc774ae019cdaefec991dfdd030cf SHA512 7490c5dc832a18410a60b64b931452d840d422a469c3540d89e1579692211a1599eaa6e372bc9cf7c2827109b35d65d661a0546b4fb989e5dfd5d8f3b2d1343c -DIST github.com-nats-io-nuid-289cccf02c178dc782430d534e3c1f5b72af807f.tar.gz 4011 BLAKE2B 2972e86d5df8ce662e6f7a987830621c58d7c8ee16afe8fbbac53c5df5857f8d821c069ae9a4552ce298286ab7899319935a0e804f9d8f1b4575f347d8358ff0 SHA512 cc5cc701c66d4d72c4e479a912beb07bef1f32eea76f5efa86e7a62b69cabaf71c5d4ff382d42de2f1e49c8618d76d0c0dbee2ef6f8b745a7f69e33223dfa4e7 -DIST github.com-nsqio-go-nsq-eee57a3ac4174c55924125bb15eeeda8cffb6e6f.tar.gz 44818 BLAKE2B ab4e74b319f50708ecf95365873bf3b49a940716af731acf5467b845b5a9c92e9ccc8312f3ae54c3f63738101582448ad4d9293a2e9a1174f06376b1a3f7350a SHA512 93aa5fae0b51e8149728523df0393a12f8387b0c08417acaf3224b3ce61265f96bdfc5296a4add19f7eda5e5a2e4896830f959e1b30c299eacfc24dafa80d501 -DIST github.com-olivere-elastic-3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26.tar.gz 282703 BLAKE2B 6b42a133004daee2f667565da80f91520943c499ba8fe221af8cfb0fc461532d22aaa8c6040f1e2d6e94bf3679ebe4b412c5bf5e5521a541803268de92f085ae SHA512 b0c8af12cb0f407b7e5fdd3b8cdb2fc117aaaa96c2b0a5bf6661f897b3964f25532d1ca4ea88aa3622f497ca97a0702fa8bd2f41d52c3f81c5b7900eeadf4163 -DIST github.com-olivere-elastic-52741dc2ce53629cbe1e673869040d886cba2cd5.tar.gz 309228 BLAKE2B ea5eff42cf212d4f6c785545cc2eba1074d605a5148267ebd30d229a86a8a8887dd85d1ca2c75e8e6f95d33a2d02dc9c0c92e3ea0c7e256265146c4b31106368 SHA512 9ca7f4e4dfc316b9d319b33f2c4c48daae4aba60162625a1cc2b72a2ff10418d7cbcf51e0dc22f663878032de16e55d6290faf164e07f2daefa80ae6e3301beb -DIST github.com-opencontainers-go-digest-279bed98673dd5bef374d3b6e4b09e2af76183bf.tar.gz 19205 BLAKE2B 752148dc0119bbfe1c956fe157b205e25fc4cadc71289bff0b3c4fe12a6ad5d8e555d0d782df33172a3619f022ab2b698c1671eb05b0ecc9e500e9829584ce46 SHA512 2a3f4eae058d7379be5495f2b253990dbb59bbc394b5cc2adb948be41e1e4cab76efe388eb9ccc1cb30cb51e0a9d9cb07357b6e24d07afdd52aa08a77ec8e01f -DIST github.com-opencontainers-image-spec-d60099175f88c47cd379c4738d158884749ed235.tar.gz 138697 BLAKE2B cb138a1a060f2a57dba4fe80b6eee332a8e44cea2ebd9a612fda14bbce15811ec3b3145e5d9b40cf5dabecd6c3e3400a3a14d1fc58c717153b6c4458982a5ba4 SHA512 01ea314a0e5529994c8afb5a4a2a3ec58342746b94a2bd357212e448be30e8dc580d9dfee0da7f53a68461125819ff55b6a7e073c18f8d22219919b218988d34 -DIST github.com-opencontainers-runc-89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8.tar.gz 535810 BLAKE2B 20f22f434220f37a6e6b845953d38fb333e3425ea62ab404b836129bf491583b26b02f9a5cb079129d7e9af4d721afa41bee631459036c7e0443e13cb49556cb SHA512 a57eaa9f9272015ec3260341da0d3114a258d770d38fc32b115fa40ed5cfefb5a6ea94bab3c35a6cb683b94d52d7aa9f741c8f3a7b6f9f13f5d02b6fa7774602 -DIST github.com-opentracing-contrib-go-observer-a52f2342449246d5bcc273e65cbdcfa5f7d6c63c.tar.gz 6147 BLAKE2B 65337406aa23a734adb0e6ae1095b8ac25870fcb4a35076dcebbf4e5aecac655dcd7f2b3bd497cac2ef8e1063229527b702df48b8b30e97f776bd500f58f9671 SHA512 054c9c08cab440af3d77c86635b69d3d57e5c9c788486e5eaf3300508d6167a1190618ee55003cb95d943d468e94ac2392a26e9f8665aeac479910979dd31755 -DIST github.com-opentracing-opentracing-go-06f47b42c792fef2796e9681353e1d908c417827.tar.gz 24493 BLAKE2B 8e871a0ce28f8384dc17b5cc307a63c2dc5769730bb7c12000a89631311def9ad03eeb7de1a52eb58053761bfe3948fd01f4e1716b57695412459f666013a871 SHA512 632f168b37066ebaa92b93d93cca227b55121c68eea472fac6874157842e7e22bbf8f84811ecb450ad14da44503e86075cdf0aca4303b88f676b234589ad6418 -DIST github.com-opentracing-opentracing-go-1949ddbfd147afd4d964a9f00b24eb291e0e7c38.tar.gz 24070 BLAKE2B c69d6de528457d95129a0d652372349a928533cb456c93d8be06ed0ed91587c71634da4800d75b92be3bcf3f959d3afdaa6aa7942535c14dab4dc1200fa2bcf8 SHA512 805abab86f21c206b56b565f427c039c78822e268a6296d89825f50e144f294ba6c1e34ba6bf3f4345dfd7b28d69d16229b07ce16ea7b0404c413de96134f0a5 -DIST github.com-openzipkin-zipkin-go-opentracing-1cafbdfde94fbf2b373534764e0863aa3bd0bf7b.tar.gz 61620 BLAKE2B b8608c91155010a2071779bd075f698e8f2548ab3d5c818403f9c414c5c9b4a20cf22b46fc361b0f88a22159fb894f28f9b0e9bc5c69f4d2c2d0959f80ec965b SHA512 47735260f1732f4f0bfc8e5227c5f06c054878d26581be64a65593cbc0e907fe0d6585fa0df58bb3920a96ebf32b7efe64ca89613b5d802acef56a0e8c639380 -DIST github.com-openzipkin-zipkin-go-opentracing-26cf9707480e6b90e5eff22cf0bbf05319154232.tar.gz 62532 BLAKE2B a1c1775062f1832a093069bc69f64dacc683dd72ce872a1cd5fd99b7ea69dd1e6c13a1d479eee00171bf10dc45fac16f8d9a8abf763ec9a8b89305d672591e53 SHA512 da9c5f1220818cbcbaa370277412319706ccf506853c738313bc97aed6f84b4f313b5d13aef5225f10241740e004846b4df4fbb5e831f3cfc820ac5b6b542c99 -DIST github.com-pierrec-lz4-1958fd8fff7f115e79725b1288e0b878b3e06b00.tar.gz 3555076 BLAKE2B 2eec2b9cf97c7fb2961cf873f15bb368da45691c32a242848ed8db839b461caa96d8cd93ce3e434cb52f2ddf84583f8f856595fb6bbbc07df1b86166482b96dc SHA512 b70cf3a555b72d8fc4479a09616c6090405386c9270b84028825cd5635d4d007cd797ab0fa1743e0aeddbfdfbf7546f9d15b17f411103c7206f8f4bac810912c -DIST github.com-pierrec-lz4-5c9560bfa9ace2bf86080bf40d46b34ae44604df.tar.gz 2638854 BLAKE2B a5f10226d5175404a9709a831f8eeed05ebaa8309379f384b0eedf34b67da90e99d2a73434cc355b2b554c1cf4b8ab542f7b0790b83e77633bde8d1e14c9cff7 SHA512 c30d947cb3769ccc0d8d2c34305074078c8ea3989b0fbe367c14bdc83329ac686ca4629ca246e7bc70986fa9388f781a013475837a897e82987a202fd12dd566 -DIST github.com-pierrec-xxHash-5a004441f897722c627870a981d02b29924215fa.tar.gz 6112 BLAKE2B 41c8bd119d1582afe388e16ddb8c606b7999c241807a2bb41c9a9127323fc6c4e69ec863cfe27e6391d80488bb394fb7ce479880d6660ed83c997ab2cf13a056 SHA512 7aab1fcdf17faac932b67c6df42556feec6037f51c9e710f2c56909970f36110391a4649635277acbfce2d710ef7d1176b8ddf145fb51594d4e5dea542aad397 -DIST github.com-pkg-errors-645ef00459ed84a119197bfb8d8205042c6df63d.tar.gz 11345 BLAKE2B 9f25872e040b5e0602e658fa728e93a300c00ed1064966370e1b676eea6a94d6bca491b2f6c33a9f2c4d1c522a3ceee540aede2dc638eed238de8485500821e9 SHA512 fa82643f622150b44b198451c1e41e042fd7ceefad9d68e32238d48c9a29c6fb14780fca9d9a7dec660365062d4089c638196960fac056b685e7543410774228 -DIST github.com-pmezard-go-difflib-792786c7400a136282c1664665ae0a8db921c6c2.tar.gz 11399 BLAKE2B ac265a73d47b98740a067a2aa94f46aacb520e11795994109152feee990f6c4d6a97478333ef703543c38f997b11d0c7ea007326710804f881bca34a559651c3 SHA512 5f7a1a04981834f0e4cebf8b31c7070718c45ef549d8770b69c45c35c68417ac44b205057253a20cebd66db26c58cef6878d6832919b8a3e1283bc3d2af45df1 -DIST github.com-prometheus-client_golang-c317fb74746eac4fc65fe3909195f4cf67c5562a.tar.gz 83229 BLAKE2B e85b4eda68ab9d653a3a34fdd177d1b74b765044391f457f5436ca6c872c2fa85ea4e3fc5afd0aaa4faaf44651c859a27c4ccd1359ff82f68b7accbdac82ba2c SHA512 aa5945e00e9bd182cc016722a754b531662402a7e620549c97ad5cf24dfaf603911d585a35bd7da63cbde033b7a64181c179724f4dc167b12d537fada4df80ae -DIST github.com-prometheus-client_golang-c5b7fccd204277076155f10851dad72b76a49317.tar.gz 75589 BLAKE2B b739cbfdbdc070aeae55f25d263ae74fa07cb4af0b8d7b9504ccb954c4df7c8bd40f6e2392f16f63cb0f3f41c282e16655ab0d04ffddab241e3472cb6ef04faa SHA512 5fe34c1cbd9aee1d1e50424aec83a1e72d834b25208e35c1af8b30519f6db26a6d54adeacf40006f4d04539c1d2e8f577641c8d796314cd71e9b87b20847b2d7 -DIST github.com-prometheus-client_model-5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f.tar.gz 57195 BLAKE2B 08fa9bf28957a15e543e2d86e5a19fc302f7ef5284796d6dec24c182ce7a3889a5bbe53d58fc018cabbd0bc717b36533043c3ccb3e3355d8434fa7e3dd399b50 SHA512 e44828e3790282e088bedd5c8786948192beb5061e8dedd4f0b2508e31f641569c2c2a7e3899c2eebf4aac0c0fb3a22fc9172e0460fa2372fa876e23807d23b8 -DIST github.com-prometheus-client_model-fa8ad6fec33561be4280a8f0514318c79d7f6cb6.tar.gz 54855 BLAKE2B 2a7fd47a9e1dbc794f5de84d5ee3512b282f5f94d044dd9b471ab5ad138ebf2940c4441e6b4d89404f3443f0ba466fdab8fcf58c92d9c85798f23b5a0c57a6fd SHA512 9d4d52142888edff091f23496aad70ab2924dff3a27930cb6df81c5452ca897b9d61eff74fbd092372ecb4bb005b4d362ea6b0602e1764ea4f2a30e23048a81d -DIST github.com-prometheus-common-7600349dcfe1abd18d72d3a1770870d9800a7801.tar.gz 77798 BLAKE2B 3e8daf72d7ca8d702898349617c48a62d4dd7cc5ebeb65bd63d38978f5d8f05e6d0f02237e1fe285630da198aba90783e27eee69ac6a06f90e1a7be3fad50b4c SHA512 bdf0b2f818f9df4685ec7536a7478cb86ab8a8297081c618d92b14bc0296c2c66c9ccb403b2f4af42a7fed769f3ce2020082e2e983e3f2668e14776a6d26828b -DIST github.com-prometheus-common-dd2f054febf4a6c00f2343686efb775948a8bff4.tar.gz 59072 BLAKE2B 1c93ed6c724d8b537f867f85242c600f003838df7aee8547c8029eddaaa067ac85a63c1486f4376dfd919cfec77ce471bf88966d52e6b40d234237546c6adba3 SHA512 c5184258aae6c7c89b7cdb54dfefee3488e86b6ce7534e48b295e925f9918438e187b6e2e9f121f46e132d51f0b9dd603ff2f8c88855e23eeba39dc6b157dc4a -DIST github.com-prometheus-procfs-1878d9fbb537119d24b21ca07effd591627cd160.tar.gz 24846 BLAKE2B 4f061ca5b3677b6c002824b7b119e451ea95bbb7ff938fab308156c0d289c8addc53b1228340fc1d02710d9f233fb1974a28654b67fc34e8e20aeddf22d2be3b SHA512 3029cbf9b7ff78251964defc3bb537883def3cf810bb06755447c819b7b042d897f3a93f0d9f6096dac07bcd304a75c358cb81477c84802091d0c6540adc67b7 -DIST github.com-prometheus-procfs-ae68e2d4c00fed4943b5f6698d504a5fe083da8a.tar.gz 57831 BLAKE2B e4583c8ef91a8780a4d0341325a205ee509ce61474e8da838f54c9ca651674cd0c368828fd3794121243c707c5e64f523d2483ae205e55b308620acd42e06bd7 SHA512 4362bae6cfe60b839e0b75ff3ae23a608a3e809aabb0460db48ba1b4dd300d6185b0dfc94e2877c60d8ae939a45608ddf09f298afdc0f5d8565a07d3cd942554 -DIST github.com-rcrowley-go-metrics-1f30fe9094a513ce4c700b9a54458bbb0c96996c.tar.gz 34843 BLAKE2B 9b7cb47d600f677b38fad805dba6f52439c84731ab7677ea179befbc6c77ce99ebb17c4dfd3d2e666895c373fe27b63212887be33d6cc17c05c57efdb466a68d SHA512 4b0390ffd6ed18dd8fa01f3379a4cfafad299ee6977b099a61114a478ff1e57020d9d616fdb75c4d2fd0bdf4a8fd8d21d7b91cd66886eed2a73761b7075eee51 -DIST github.com-rcrowley-go-metrics-e2704e165165ec55d062f5919b4b29494e9fa790.tar.gz 36765 BLAKE2B 6db2db27a22ea746e3b419adb4f8653dcf3517ee36e67eb5885d034babf71ebde2c61bfd2f6feb4213519382c12a29c5245c7961968140fc3b0f6e7697c9c16b SHA512 fe44cccac75cef2c9dac051fbf413420029e8316379e027b32114141cf00d370b0e72fcc05f26b18f35736b843fcf770b7587c81e31ab4521e317220050379ff -DIST github.com-samuel-go-zookeeper-1d7be4effb13d2d908342d349d71a284a7542693.tar.gz 32130 BLAKE2B 71edb2b08cce57314388c49cf5f13b65981e078890f348da4731dcc0f47d1894a42d0ef571007a5663082328538c78d51ad0b6aa46c4bd5f9622d2aaf6ea7425 SHA512 5a661d1a3d534875110e9bef59ce7395ae087112a10521092f9d42f59d7d01050a5acc1501473950ab2df3ceb78b4bd5ac3cf91fc2eccaee10ee8b163343c7b2 -DIST github.com-samuel-go-zookeeper-c4fab1ac1bec58281ad0667dc3f0907a9476ac47.tar.gz 37110 BLAKE2B 4c32afe54c27ed1532a50d386217bec3b477ceba3744bb415f906c5b0301db172289455a6631659e98b4600175ad391d09f7c60532bdc5754761a177482be37f SHA512 3dab581a699336979b7be6b9792a877eee9e9fe39157b0774e38831735e1148b522617d246c7c1d146cb8c6dd3faba20cb72b94e9bd85e532f11d20f97e755d9 -DIST github.com-satori-go.uuid-5bf94b69c6b68ee1b541973bb8e1144db23a194b.tar.gz 7605 BLAKE2B 2af1051b30423891093bc2652db9c96d67d0955c7e20d27a390e53b6dca4233266182489b6160d6429dede0cf86e83ef5f2f284e61126cb76e66838329b4326a SHA512 ce66fa5f54cb373e76a92258ba4b907ded9f4163469b2e949d608df4737b10e2e428ee973c7f8ae0a997f67d5b04f34e1d05ad60c2388fbd9bceeab8877bb8e9 -DIST github.com-satori-go.uuid-f58768cc1a7a7e77a3bd49e98cdd21419399b6a3.tar.gz 8292 BLAKE2B 7969a5837c0155661feb9113e44b146be87d2ea163bb045e57b194bf3f3957e641a7ce1c1e2fe1c363b5df48c46257ccdf8665ac36dd5a0d3174179b2734d5ea SHA512 7d2cb0674f523a19ca3f1564ad9b8b363f4b8c1a0eddc848f9ae927696d3408d8aaf6e9149816be4d3f8e9e996dcda025223aba7dfe63e8f87f8bc822a5ce6a2 -DIST github.com-shirou-gopsutil-384a55110aa5ae052eb93ea94940548c1e305a99.tar.gz 107137 BLAKE2B df3554441aeaa9864255d4a32c43ba20c17471af8b9af941c896b6ddaa991af0769c8c7455e06ec1999ec6e72d60c3823d5b97a9491a7795b8cb1aa6156a6815 SHA512 bf6ccdfedefd1ffe8422192fd5cc7bc76799e3fd5ee21c12fed08ab137add08e77157436387c92cb521634568668571d17b36068970593d51130cf42b4dd86ee -DIST github.com-shirou-gopsutil-8048a2e9c5773235122027dd585cf821b2af1249.tar.gz 110546 BLAKE2B 21a2d62fa98364d20c6aea586896d429a1b09fd367d9e9100ef4824acca8f6bcd8235dc7e88381125cbd382feed21518a7041300512aafc86e36abb24a7e7720 SHA512 cc49ce2875c8e3075108b91e12a7d4afee9a80da65745e32ac268401e95d5279bec27b42b7b87bb2705e190afe28c7553046e62c3ece455e323124002bf8f75a -DIST github.com-shirou-w32-3c9377fc6748f222729a8270fe2775d149a249ad.tar.gz 44339 BLAKE2B 864d60f85ff24f5a65e070722aad15bbbfe0fcee14f899b7761c1e836035b40f345fadd7ec6411b19ef8176f6ad00e4310d5598fab3e880ab139177cba97fdc3 SHA512 8ae5334c457276b39e94f3f9f286dffa9036a5e1be7127a155dbd737ecf6bd134c8efbebbe5ea913b7f1d9105e0e90b86ef4585676877641e9c156547758dcef -DIST github.com-shirou-w32-bb4de0191aa41b5507caa14b0650cdbddcd9280b.tar.gz 44378 BLAKE2B 2393a3a3bffd7e19db1a12d394abfc16c5f37b4c559793a819f29039db4a2de67be00986e9351f0d1cd6eb99ebe5becc4cbe69ec7d85b89637f8622ccd957489 SHA512 ded412374afa9afd363b972fb08b62d732d0f3e127848461ff924a106d27bf22a466331c89e547df3e8af50d5097923932c9e697645c9d29147b0bccc74a46c1 -DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926 -DIST github.com-soniah-gosnmp-5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15.tar.gz 42429 BLAKE2B 8b09338bea760784895fb4bd850e046baa88075ba2537c2ef7070ecc9d1a97365ce0c05601468cda844ee7e16df5b309b0967632e11422e16960a61e4473d8ea SHA512 df9da3793b12a2354b215489b258899d142a08d776279045b10c31ff9b0f8efb883d89d4f12fc5c76d46df45c316314438654e9777e25fe6617895436e42e9ca -DIST github.com-soniah-gosnmp-96b86229e9b3ffb4b954144cdc7f98fe3ee1003f.tar.gz 48054 BLAKE2B 33874390743d3a3b63298d331153c7c7aeba358bd7248bf746a287e400520fda57e64569428abb97fdcff415c11426aed36b6220ed574bb778c95668037d28b7 SHA512 9be123ac9e8e39504d70ce2534ede2e06c9e59d140d88c9361b04f3655ca42802fbc017a76b20bbb0cb022110afe105663a0098d457e996c356dd0c0fb07fc18 -DIST github.com-streadway-amqp-63795daa9a446c920826655f26ba31c81c860fd6.tar.gz 82926 BLAKE2B c83546b406081445f568903f98a682f74ba0e77d940d40caf488195713b6841a97905f415b286ef2a9fb642d2353a13a6658c2a3ec035e9bbe8361ab2a090a06 SHA512 2bdd05b728ff3be1f2192652756518e53b741ff7b359e74286e20faeac8423f80244c89927c1b4f1417b46fcc5bec4d6f8dd20ce9eb327d5a45ef513e48affcc -DIST github.com-streadway-amqp-e5adc2ada8b8efff032bf61173a233d143e9318e.tar.gz 85554 BLAKE2B a0f86ad59b5d29f4ade89f8e5d730ab09b5c15702ab9aaf202c7443e191516b2b317e543c6ec70f614a2c8dc273cd514cffbf0e19998fe1bcdc5d5b994779d24 SHA512 3b53c11f5d2e06cd48e58070b549c00d7c257c9cf300cc6ca9f7849df910787d8e193b003aa870ab981b0285b2f1927cd98010eb8a3dd49011459a0c407f3b36 -DIST github.com-stretchr-objx-1a9d0bb9f541897e62256577b352fdbc1fb4fd94.tar.gz 24009 BLAKE2B 55d77ee7460d4f777b3db315731a1ede311d3f6c22690143ebf17430890e0c343e64889098fb0d1145fae8caf920c6773571fb984684fa1edbac2b98e2b196b5 SHA512 c03858d1afea33ef4607c4dcd8da143b550bf5897c2567ceb7baa1b0caf81f4223ae1e0fd931b8ca8719ebc5e43c611aa5da7e5129d962573e422265e30b7f17 -DIST github.com-stretchr-objx-477a77ecc69700c7cdeb1fa9e129548e1c1c393c.tar.gz 75983 BLAKE2B 905b11298532bac35b3188b06dce111516bfb9f015d3e9b9d306e462bae917f522fb0ad944af31a86dbd24dd12f4974744d2a4bc9de1aca9501faf1359de5161 SHA512 319f08ca080465da0cfc530c435534e7744c78d1f7fee0d012d460589532b3256744b7c5f914b80488ab121ace026e565b167afdd0f926d1b984b1aa77b62285 -DIST github.com-stretchr-testify-4d4bfba8f1d1027c4fdbe371823030df51419987.tar.gz 85717 BLAKE2B c625bf222562e2fd66fd6723d81eba4be4414ab07a833bf12d19c1a413ed292ecbfe0bca3181784dd20ce2150cf41d2e8f7ea37b5187a0f2ebb9e2d0f63de7c4 SHA512 77bd69de4404288e110b11ce2f7c635e4111680a988f9d58fef82d8f3c8bea8aafc84747cf95183ec9b1b62b0241c4412ccd0e7a6f21db493e901de1d8772550 -DIST github.com-stretchr-testify-f35b8ab0b5a2cef36673838d662e249dd9c94686.tar.gz 101953 BLAKE2B 17c689b1113d3fc3e2fa1a3bcf3b0f55abd50d2799e5c57d26e04951badf8367fc7e8222ecbe036ee64b0a07524567bcd3e40266be407c3c561367474c6306e5 SHA512 36a556457ba481a24247bd97f0adf7e1b1c90e6ee1495755ee12bf774df3228c42d72d7051312bc0ed7a7b2d9e7a20b4b521c9fbb3e065ba10f6b0320a67df30 -DIST github.com-tidwall-gjson-f123b340873a0084cb27267eddd8ff615115fbff.tar.gz 40320 BLAKE2B a3a12aab47428c8309f0bda9b987aa3c37d4f20798cdaa214aa2f206533bfa4e44d879d5bb59e6f455682b333c44efb63843d3919958cf072d7cb137884ead1f SHA512 d633ecacb0f8a75ef8593c0f2e40a359b4d8dfa1733880cb7b3e63ac3cc2140a72495534c676cce0a96f94329d40516215b4cd5223e4b5752ad0ea025f006de3 -DIST github.com-tidwall-match-1731857f09b1f38450e2c12409748407822dc6be.tar.gz 4277 BLAKE2B fbb192bdf4f895f50cb305b62730b401ddc8f18c2c82bbb13d6963b1780afb9ce4a52f29375112aa6c3bb635742ba35e6711ed50ac0fc198217867772ebd7cad SHA512 e0828721a5cb51a4b638d2b485b80947910a4c057bb771ed9dc4781e9f2394d36a541c32dd75697547255ed547f218621b3aec72c2ffcf5ec9d56d10b68288f7 -DIST github.com-vishvananda-netlink-b2de5d10e38ecce8607e6b438b6d174f389a004e.tar.gz 108114 BLAKE2B a1d90a4d50c8596b33b51d7f82219bb368876cfc4d521548d3cc1c236e41e396bf97a241d9285688d76a09a2b6e3e0d01b1d24a8adc419b9dff35dd2b48e0048 SHA512 081d970d2f073e11130a18686981ab7eefaabdd25e8e1b8877c9bc1a13e5afd6ca6b3a69e2c722647c0d466cd53c4430ecc686b8935ac693af69c31c577cb9d4 -DIST github.com-vishvananda-netns-13995c7128ccc8e51e9a6bd2b551020a27180abd.tar.gz 7861 BLAKE2B f46ba34aebb326026e6482e208821ffb6aad1ea10a3fca65120d647b9eb73aecb3023757d799acc248916a9c79f13f0f9e8bc9644e205b185e14d132499aaf06 SHA512 82f70298ed3a458dd44f4d30d9e3a8d4033bdab55dfa7a56ea2557e743d5ea5a5bea254a48cccbef14bc35ebc031d894fd3a7f3a0eaa7a0e1036499ea836a3b6 -DIST github.com-vjeantet-grok-ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53.tar.gz 25832 BLAKE2B 0478a7024bb9814377350f8f2421507e1577af56283bdd0134d794310bda77b628a62e8ae95844bf615f8b2206061061accf7e52a052c9cdee99bcce7d40171e SHA512 ddf1bfa23c15fc2b6ef101e3d04101fc8bf823bce9fc33ddf20d995888a50f00531b221524a1f792fbc69aa47d5d6593566ccd4e233a8e7fd8d37e6075820793 -DIST github.com-vjeantet-grok-d73e972b60935c7fec0b4ffbc904ed39ecaf7efe.tar.gz 25776 BLAKE2B 41623a6fb359758ba14ed27dc311051635ae8ba64f27fa8eacb057cefb6702fd0396c3ec6b0869de84c7bbf8cd48610325639401c06c38d61693cc9d20855307 SHA512 96da8eaaee89a2d7040f93cd8ad09c66c960b16e2627ae920811c4dfbe4df061f355662cb428a19a1b533f942ce0112b83294e35f2ebaaf937a11db5b509b840 -DIST github.com-vmware-govmomi-e3a01f9611c32b2362366434bcd671516e78955d.tar.gz 952458 BLAKE2B 7dfe37f6a3e13b15266c76f7b5e83805d57a9671406eef7ab691af2f54ac843201665f588e34537f1a6952a4d878c7465858a044dca20404e9660fe20b831038 SHA512 dd6854f00ff209695865cd7e188b0542c9f1c164f34288454d6e265428a100dfbcf519f086ec2523f4951f596a43d4d18d6edb1b883df2a333028deb158d74b3 -DIST github.com-wvanbergen-kafka-bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee.tar.gz 16356 BLAKE2B 439bdd2d92347c4de1e9c13bee4f602ccda3ad9320dae51ad6f2bc9bc8136355e5a0f6dc569f0c5df7c328c981ef1da81324bbbf3a1b5cb4a14c2ed1089c5e77 SHA512 4026f9afb500f6a3f77413682d140ef03839995790cf99fc4065ee1411fb220c43301d7a72e6f1bc1e4cf6c0d20fc5eee69520770a07345f82bab34c73235630 -DIST github.com-wvanbergen-kafka-e2edea948ddfee841ea9a263b32ccca15f7d6c2f.tar.gz 16364 BLAKE2B 65ac8d6de5554a723a21bb6897880052ede741ce1e66c3722ff95f2772f6a6e57a3f0e86637554b70343d1a34a4963e5653ee63e2e3a3c06b2f146b0046671fe SHA512 61781e997bbf84f8842c16ae86b325c23aefb610403bbd93b77a74541f00d23149e39d69c1c4d24938bd61d6288eff732bcc14307b03114d041a5f37bc099b65 -DIST github.com-wvanbergen-kazoo-go-968957352185472eacb69215fa3dbfcfdbac1096.tar.gz 13302 BLAKE2B 27ffba23d1846a3360a89b37b8b8adbd7294e3dec11ff70fe6ea8e3e48103e55779fd6a6ff6c9646df24f2a24f109e152dffe996faed950dfb041a29a9e745cd SHA512 7ab52a44284a37f1b1b02cc91217f70296868417e0527e90655908b120a12f69af51cd194da057bf26784c3bd1a633ab1cda780397e04b9a8914eeada47ffd1d -DIST github.com-wvanbergen-kazoo-go-f72d8611297a7cf105da904c04198ad701a60101.tar.gz 17590 BLAKE2B 229694e1dee57bf76bbe58d06667eb119aa2fec34aa6f6b495d0ba39085378393b7157f60c5d319f947890ac1f26938771614fac9f060fac5754859eacf8dcd9 SHA512 f51fbbe84a053e8a88188b389497bd4af0e45ff0f7236fb8ea3074c457b66f7bff4080eccb854ffc7e1a3fe31e4f3276d6327450a8465909030a0fe087bfcc6b -DIST github.com-yuin-gopher-lua-46796da1b0b4794e1e341883a399f12cc7574b55.tar.gz 149759 BLAKE2B f182ad2096559c0069a8179f3b2bd3225cf1528290152e79aee1e827754135ffdeb5484174eda09762d758c9d790457a0262224c0162a5c82b5c13e06e16be5d SHA512 bc6d08287146e9a20cf22dc0ec4cca02003ce53a6a0609475aeb3319bb83e8bf9394d408ba9b25f347c4bb6d2fb817680746e0c7dab13a3c7351cf7d2119560f -DIST github.com-yuin-gopher-lua-66c871e454fcf10251c61bf8eff02d0978cae75a.tar.gz 148862 BLAKE2B b22c654322c0ba9722b7f10411fcc03e97dcbd937c6446e30b0ffebc63a4ddae5b3c86aebb2dd537f1b9e25aef57fec5a2966ebb76aa586f73e25eb1c7b2378b SHA512 8a57a8a180b684c1263bab7b98339554b0efc95a73fc3ac558ff9177f0a09f0bc41b24285c96dce6a114031b0166a384c2a8e9d169dbb3c643c9017dcc8d0c18 -DIST github.com-zensqlmonitor-go-mssqldb-ffe5510c6fa5e15e6d983210ab501c815b56b363.tar.gz 450131 BLAKE2B 6d9ced571d0db14cbd3223449734757e4b5c797cbdfdf10725f2d3cb7867093608a7fd3ca1a2c5398848c92090269b8d35f504de439ce2ca6b482ac8180697c9 SHA512 52ed5b9e8399f00a83c0a50f8fdd0ab5419005159aa5ef80c5d8ab76c37f319e1c4d3e0bd5e0ba25006fa790d3756d2788baf30b2ef79b1f86b001d64a702820 -DIST telegraf-1.10.4-vendor.tar.gz 69744868 BLAKE2B 97123bb14b89d28519c73426491189a9245450c72bd59e6745a76c61730a730cd5b2c59c7f205c0dfd058b3d5fce4d331a3e39ecc1a5da1ac439c8946e634fab SHA512 53f5bc9fc60ccae3a9549ab38cb4b558a331524351b70b83deb483090a45edf8868856c1311893d9d8e091e649769ccb580bb32cc46a16da1deb8390704a6c84 -DIST telegraf-1.10.4.tar.gz 1372505 BLAKE2B f3064cd71b1b6f9a8aae8e5425813386bd6d4e4f06c2e95f35c09d055aef6b811867bb1fe1724e88311f82e8214a1c7ae23a0b5ab8461cfa6b0adebe3b86cb28 SHA512 7e6c27bb5b94382f00f48ce98906f7e505abe734b47e29c2c07f245c2c5c12c522eb3f59be2773bfea78316b7b808d0d425d07fa7c247af7cd280a041759cc34 -DIST telegraf-1.11.5-vendor.tar.gz 70214304 BLAKE2B 64cfaa9f207835e043f5df002d140d572a95dc58b9310c860fc682f8cc3a02c77f8d2035576d296d89c3da30ebca2e6e3ce27b514419a60d6a82f3b9645bae3a SHA512 00e143110126c18bbe45ad0b14e6e688030c3f15366ae0e59ac157b49090644cbf96a4b95fa46eaa3fbbd1eb68c09c3747172585a42f65876e0d78a505b07363 -DIST telegraf-1.11.5.tar.gz 1471311 BLAKE2B 7c5b7c2b835ee8c943baf01bb3515fb724b10b04682254e0fd501c7f066fe67a4ef18c0d3442b676448ccb8cd0430099e56ad0cc3970eee3f9d80d540271f4df SHA512 1e6001981693e4612ba34a680f1c3349c2f203d8ba2983f3841fad08b68251a942beef6cc462cb64b95eba1412ea6a35a863ff9426270896c50c83e6f177ca5d -DIST telegraf-1.12.1-vendor.tar.gz 128021524 BLAKE2B f4db3e4d2998959c850a82ea77c1c02c5195e6bd5eef4d55521bbaa0e3355b21554e1a179585d57d8fce1fd061d8f157fddb2dde5091c15062811902c014b835 SHA512 2a501d9456a3a130a4202e87e2c0b44c9b2d5fefca12601f0a3fea6073c97fb7b40dd86546fe291b740b38ecf57843fff18a6f4280482af915b3be9e7270b597 -DIST telegraf-1.12.1.tar.gz 1561005 BLAKE2B 997e3deddc13acb6c0af41d5f622353facfd1c09e76640965c8ebe447e06a7cf5bb25753b8c67b2c7c1af7c3d50f787acc23e5b5a45253db943031a130c33d39 SHA512 8018d48482ec1cdada9d57bb6b8068a0758d58908a4c88deb089645282fde662191bd356e0081178b0e7bc1be6bb19cb2c29bba0039398b7d64f53de9fbf87d6 -DIST telegraf-1.13.3-vendor.tar.gz 142151740 BLAKE2B 9068835a6b75721732998ed50f23a6e6e90d92eee32c3ff1bb07fb19942e6f808289b459b34a6b83920c323c00063a91d2bb2e38d457a7a512b43715bc7d7dc0 SHA512 db56f4ecf1802a21405ae7db80281b5155b6f4922dd8e49aa48b554ff3bf179810fae3de3f6ea0e6ee661683e0e9f0536919fd912ea3de827f7c85aa314fff36 -DIST telegraf-1.13.3.tar.gz 1640358 BLAKE2B eda968676b42ddfd1f447326463feaabe0860425ea1688ccf19a248f652ec4828c5cae1c302a7129a62a6557eb2c0a206476bfc7082a89d4bffcd3113bad0e81 SHA512 ac71f054ffccf5f1d27db6e68989a2440b975087f91cce487b58df2bd6984378d86fb992f7a7f11aabf7b20937258d05893b74fb5d6f83a8db8449e80cf1d2fd -DIST telegraf-1.5.3.tar.gz 911976 BLAKE2B 3e67a037eb22be88de700131f15120faa13b7a9bd8404f76c29376e3e4da630d84767fd8cbff45b3e14e6ce836dcc68a2a87b462eb91d398d57370c1112879c0 SHA512 48e80a4f3f00b5c18f584e28836c36abd7b7f9bacb33dd90ff569dbdc0a5bf69e29d38ae2d74a9c14ee6dc3400dda91e586dd31bc11522257c2206efb3e93348 -DIST telegraf-1.8.3.tar.gz 1205303 BLAKE2B 60579cca57863362cb4003f8da4326cef0d1bc4986d07d38f4b594556736ad79e0363098df41c13a2d10bbeeccce20fabcd0b07c7e187cbeecb5c561008d587e SHA512 367069b3578529307d5fa6eb14eabf78a44743d75e5df7c3860b35de212b5809c54cd1a7c791076137f60096d227774b4d5206606cd3fad08594721b4b49de4e +DIST telegraf-1.18.3-deps.tar.xz 430779112 BLAKE2B c9e7f815e6e4070632b0edb2a53a65b9402828a39ee680c43a40dac0145423b45d1319f34faa8e9c1412f0cfb60ea90008b8bc98f9c3213de054897547a8e53c SHA512 2e9ad5110931a38195bf9b3e2f51684904ba86aa59f3e5acb87763c2260368f0456a122024607a58445df6ba26406206df0cbdcf1d297638e3b66f976830f3c8 +DIST telegraf-1.18.3.tar.gz 2647798 BLAKE2B 82556544d6a3e1f349c711a4964d842fbe245bef6f1801eefa4e52071410a77bd6ae9da33682966eaac2fda2d5ac3afb100de03ac5a0fa9ec4185524d15e68fc SHA512 e9e7aaf408aed62bebf2812db1f2ea6e0d744c30d53e03a5c203e79673871971121024ee4c57d3a919d31dbc83bbad3ffdece55ca2d94c62976329a0195d3b03 +DIST telegraf-1.26.3-deps.tar.xz 598542112 BLAKE2B 654e2543b79927409a7f51a3b13ca5d917ef35559351ee48a581b0699ec4fe1eece9f8a3278243b02c79e17b08557d6f3d23584050cdaf461077c61f3435743c SHA512 8afdec12df3105678fad3272d80ab86438546a7de5190b01cbb0bffc3443deb6f4fd9540432c3b6e06dbfbc0739167daf15934248dea73bd59b5b2376fe4b5d2 +DIST telegraf-1.26.3.tar.gz 3893039 BLAKE2B 4285416c2e2a6e63dfbb3261cb5ef90c5fc0d2752e78913a2d8cd59a45b990e9735d65e9c762188325cf5696ac6fb619ff1d88f0b0017445fe3039d56c488b27 SHA512 c153d7eb19319d669328a94eade041ecaa6a30cc180915ca2b51b67c2d1d2e98572573c8970b78f815e74dec814ea9c02f4170aff1021fcb9e97c8974a0d0d6e diff --git a/net-analyzer/telegraf/metadata.xml b/net-analyzer/telegraf/metadata.xml index 6c5cba3a54c0..894d232badaa 100644 --- a/net-analyzer/telegraf/metadata.xml +++ b/net-analyzer/telegraf/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>williamh@gentoo.org</email> <name>William Hubbs</name> </maintainer> - <longdescription lang="en"> - Telegraf is an agent written in Go for collecting, processing, - aggregating and writing metrics. - </longdescription> + <upstream> + <remote-id type="github">influxdata/telegraf</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/telegraf/telegraf-1.10.4.ebuild b/net-analyzer/telegraf/telegraf-1.10.4.ebuild deleted file mode 100644 index ed1cb6058ca1..000000000000 --- a/net-analyzer/telegraf/telegraf-1.10.4.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=3548ce47 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -VENDOR_URI="https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - ${VENDOR_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - ln -s ../vendor -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.11.5.ebuild b/net-analyzer/telegraf/telegraf-1.11.5.ebuild deleted file mode 100644 index b7f0834d1562..000000000000 --- a/net-analyzer/telegraf/telegraf-1.11.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=0ea49ea9 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.12.1.ebuild b/net-analyzer/telegraf/telegraf-1.12.1.ebuild deleted file mode 100644 index 2a16e0960f79..000000000000 --- a/net-analyzer/telegraf/telegraf-1.12.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd user - -MY_PV="${PV/_rc/-rc.}" -COMMIT=8de41160 -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -RESTRICT="strip" - -DEPEND="dev-lang/go" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_prepare() { - default - mv ../vendor . -} - -src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die -} - -src_install() { - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.13.3.ebuild b/net-analyzer/telegraf/telegraf-1.18.3.ebuild index 264ae05a70d3..2b39c65a9268 100644 --- a/net-analyzer/telegraf/telegraf-1.13.3.ebuild +++ b/net-analyzer/telegraf/telegraf-1.18.3.ebuild @@ -1,42 +1,36 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -EGO_PN=github.com/influxdata/telegraf - -inherit systemd - +inherit go-module systemd MY_PV="${PV/_rc/-rc.}" -COMMIT=da364558 +COMMIT=cd037b49 +BRANCH=release-1.18 +VERSION=v${MY_PV} -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." +DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics" HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://github.com/influxdata/telegraf/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.gz" + +SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64" -RESTRICT="strip" +RESTRICT+=" test" -BDEPEND="dev-lang/go" DEPEND="acct-group/telegraf acct-user/telegraf" RDEPEND="${DEPEND}" -src_prepare() { - default - mv ../vendor . -} - src_compile() { - echo module ${EGO_PN} > go.mod - set -- env GO111MODULE=on go build -mod vendor -v -x -o telegraf \ - -ldflags="-X main.commit=${COMMIT} -X main.version=${PV}" \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die + unset LDFLAGS + emake \ + COMMIT=${COMMIT} \ + BRANCH=${BRANCH} \ + VERSION=v${MY_PV} \ + telegraf } src_install() { @@ -48,7 +42,7 @@ src_install() { insinto /etc/logrotate.d doins etc/logrotate.d/telegraf -systemd_dounit scripts/telegraf.service + systemd_dounit scripts/telegraf.service newconfd "${FILESDIR}"/telegraf.confd telegraf newinitd "${FILESDIR}"/telegraf.rc telegraf diff --git a/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild new file mode 100644 index 000000000000..7cef4e8b9482 --- /dev/null +++ b/net-analyzer/telegraf/telegraf-1.26.3-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit go-module systemd +MY_PV="${PV/_rc/-rc.}" +COMMIT=90f4eb29 +BRANCH=HEAD +VERSION=v${MY_PV} + +DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics" +HOMEPAGE="https://github.com/influxdata/telegraf" + +SRC_URI="https://github.com/influxdata/telegraf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +RESTRICT+=" test" + +DEPEND="acct-group/telegraf + acct-user/telegraf" + RDEPEND="${DEPEND}" + +src_compile() { + unset LDFLAGS + emake -j1 \ + COMMIT=${COMMIT} \ + BRANCH=${BRANCH} \ + VERSION=v${MY_PV} +} + +src_install() { + dobin telegraf + insinto /etc/logrotate.d + doins etc/logrotate.d/telegraf + keepdir /etc/telegraf + keepdir /etc/telegraf/telegraf.d + systemd_dounit scripts/telegraf.service + newconfd "${FILESDIR}"/telegraf.confd telegraf + newinitd "${FILESDIR}"/telegraf.rc telegraf + dodoc -r *.md docs + keepdir /var/log/telegraf + fowners telegraf:telegraf /var/log/telegraf +} diff --git a/net-analyzer/telegraf/telegraf-1.5.3.ebuild b/net-analyzer/telegraf/telegraf-1.5.3.ebuild deleted file mode 100644 index ce6ec9900039..000000000000 --- a/net-analyzer/telegraf/telegraf-1.5.3.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/influxdata/telegraf" -EGO_VENDOR=( - "collectd.org 2ce144541b8903101fb8f1483cc0497a68798122 github.com/collectd/go-collectd" - "github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c" - "github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985" - "github.com/apache/thrift 4aaa92ece8503a6da9bc6701604f69acf2b99d07" - "github.com/aws/aws-sdk-go c861d27d0304a79f727e9a8a4e2ac1e74602fdc0" - "github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9" - "github.com/bsm/sarama-cluster abf039439f66c1ce78017f560b490612552f6472" - "github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3" - "github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28" - "github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29" - "github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6" - "github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76" - "github.com/dgrijalva/jwt-go dbeaa9332f19a944acb5736b4456cfcc02140e29" - "github.com/docker/docker f5ec1e2936dcbe7b5001c2b817188b095c700c27" - "github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a" - "github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3" - "github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c" - "github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98" - "github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb" - "github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5" - "github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034" - "github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a" - "github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438" - "github.com/gogo/protobuf 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8" - "github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93" - "github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7" - "github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7" - "github.com/google/go-cmp f94e52cad91c65a63acc1e75d4be223ea22e99bc" - "github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea" - "github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034" - "github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478" - "github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f" - "github.com/influxdata/tail a395bf99fe07c233f41fba0735fa2b13b58588ea" - "github.com/influxdata/toml 5d1d907f22ead1cd47adde17ceec5bda9cacaf8f" - "github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec" - "github.com/jackc/pgx 63f58fd32edb5684b9e9f4cfaac847c6b42b3917" - "github.com/jmespath/go-jmespath bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d" - "github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413" - "github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893" - "github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142" - "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c" - "github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34" - "github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1" - "github.com/mitchellh/mapstructure d0303fe809921458f417bcf828397a65db30a7e4" - "github.com/multiplay/go-ts3 07477f49b8dfa3ada231afc7b7b17617d42afe8e" - "github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b" - "github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898" - "github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898" - "github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8" - "github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c" - "github.com/opentracing/opentracing-go 06f47b42c792fef2796e9681353e1d908c417827" - "github.com/openzipkin/zipkin-go-opentracing 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b" - "github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df" - "github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa" - "github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d" - "github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2" - "github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a" - "github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6" - "github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4" - "github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160" - "github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c" - "github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693" - "github.com/satori/go.uuid 5bf94b69c6b68ee1b541973bb8e1144db23a194b" - "github.com/shirou/gopsutil 384a55110aa5ae052eb93ea94940548c1e305a99" - "github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad" - "github.com/Shopify/sarama 3b1b38866a79f06deddf0487d5c27ba0697ccd65" - "github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d" - "github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15" - "github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5" - "github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6" - "github.com/stretchr/objx 1a9d0bb9f541897e62256577b352fdbc1fb4fd94" - "github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987" - "github.com/vjeantet/grok d73e972b60935c7fec0b4ffbc904ed39ecaf7efe" - "github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee" - "github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096" - "github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a" - "github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363" - "golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4 github.com/golang/crypto" - "golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d github.com/golang/net" - "golang.org/x/sys 739734461d1c916b6c72a63d7efda2b27edb369f github.com/golang/sys" - "golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3 github.com/golang/text" - "gopkg.in/asn1-ber.v1 4e86f4367175e39f69d9358a5f17b4dda270378d github.com/go-asn1-ber/asn1-ber" - "gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc github.com/fatih/pool" - "gopkg.in/fsnotify.v1 a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb github.com/fsnotify/fsnotify" - "gopkg.in/gorethink/gorethink.v3 7ab832f7b65573104a555d84a27992ae9ea1f659 github.com/gorethink/gorethink" - "gopkg.in/ldap.v2 8168ee085ee43257585e50c6441aadf54ecb2c9f github.com/go-ldap/ldap" - "gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 github.com/go-mgo/mgo" - "gopkg.in/olivere/elastic.v5 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26 github.com/olivere/elastic" - "gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8 github.com/go-tomb/tomb" - "gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6 github.com/go-yaml/yaml" -) - -inherit golang-build golang-vcs-snapshot systemd user - -MY_PV="${PV/_rc/-rc.}" - -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_compile() { - pushd "src/${EGO_PN}" || die - pwd - find -iname telegraf.go - set -- env GOPATH="${S}" go build -i -v -work -x -o telegraf \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die - popd || die -} - -src_install() { - pushd "src/${EGO_PN}" || die - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/telegraf/telegraf-1.8.3.ebuild b/net-analyzer/telegraf/telegraf-1.8.3.ebuild deleted file mode 100644 index 7b33cbd377a8..000000000000 --- a/net-analyzer/telegraf/telegraf-1.8.3.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGO_PN="github.com/influxdata/telegraf" -EGO_VENDOR=( - "cloud.google.com/go c728a003b238b26cef9ab6753a5dc424b331c3ad github.com/GoogleCloudPlatform/google-cloud-go" - "code.cloudfoundry.org/clock 02e53af36e6c978af692887ed449b74026d76fec github.com/cloudfoundry/clock" - "collectd.org 2ce144541b8903101fb8f1483cc0497a68798122 github.com/collectd/go-collectd" - "contrib.go.opencensus.io/exporter/stackdriver 2b93072101d466aa4120b3c23c2e1b08af01541c github.com/census-ecosystem/opencensus-go-exporter-stackdriver" - "github.com/aerospike/aerospike-client-go 1dc8cf203d24cd454e71ce40ab4cd0bf3112df90" - "github.com/alecthomas/template a0175ee3bccc567396460bf5acd36800cb10c49c" - "github.com/alecthomas/units 2efee857e7cfd4f3d0138cc3cbb1b4966962b93a" - "github.com/amir/raidman 1ccc43bfb9c93cb401a4025e49c64ba71e5e668b" - "github.com/apache/thrift f2867c24984aa53edec54a138c03db934221bdea" - "github.com/aws/aws-sdk-go bf8067ceb6e7f51e150c218972dccfeeed892b85" - "github.com/Azure/go-autorest 1f7cd6cfe0adea687ad44a512dfe76140f804318" - "github.com/beorn7/perks 3a771d992973f24aa725d07868b467d1ddfceafb" - "github.com/bsm/sarama-cluster cf455bc755fe41ac9bb2861e7a961833d9c2ecc3" - "github.com/cenkalti/backoff 2ea60e5f094469f9e65adb9cd103795b73ae743e" - "github.com/couchbase/go-couchbase 16db1f1fe037412f12738fa4d8448c549c4edd77" - "github.com/couchbase/gomemcached 0da75df145308b9a4e6704d762ca9d9b77752efc" - "github.com/couchbase/goutils e865a1461c8ac0032bd37e2d4dab3289faea3873" - "github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76" - "github.com/denisenkom/go-mssqldb 1eb28afdf9b6e56cf673badd47545f844fe81103" - "github.com/dgrijalva/jwt-go 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - "github.com/dimchansky/utfbom 6c6132ff69f0f6c088739067407b5d32c52e1d0f" - "github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c" - "github.com/docker/docker ed7b6428c133e7c59404251a09b7d6b02fa83cc2" - "github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d" - "github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c" - "github.com/docker/libnetwork d7b61745d16675c9f548b19f06fda80d422a74f0" - "github.com/eapache/go-resiliency ea41b0fad31007accc7f806884dcdf3da98b79ce" - "github.com/eapache/go-xerial-snappy 040cc1a32f578808623071247fdbd5cc43f37f5f" - "github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98" - "github.com/eclipse/paho.mqtt.golang 36d01c2b4cbeb3d2a12063e4880ce30800af9560" - "github.com/gobwas/glob 5ccd90ef52e1e632236f7326478d4faa74f99438" - "github.com/gogo/protobuf 636bf0302bc95575d69441b25a2603156ffdddf1" - "github.com/go-ini/ini 358ee7663966325963d4e8b2e1fbd570c5195153" - "github.com/golang/protobuf b4deda0973fb4c70b50d226b1af49f3da59f5265" - "github.com/golang/snappy 2e65f85255dbc3072edf28d6b5b8efc472979f5a" - "github.com/go-logfmt/logfmt 390ab7935ee28ec6b286364bba9b4dd6410cb3d5" - "github.com/googleapis/gax-go 317e0006254c44a0ac427cc52a0e083ff0b9622f" - "github.com/google/go-cmp 3af367b6b30c263d47e8895973edcca9a49cf029" - "github.com/google/uuid 064e2069ce9c359c118179501254f67d7d37ba24" - "github.com/go-ole/go-ole a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506" - "github.com/go-redis/redis 83fb42932f6145ce52df09860384a4653d2d332a" - "github.com/gorilla/context 08b5f424b9271eedf6f9f0ce86cb9396ed337a42" - "github.com/gorilla/mux e3702bed27f0d39777b0b37b664b6280e8ef8fbf" - "github.com/go-sql-driver/mysql d523deb1b23d913de5bdada721a6071e71283618" - "github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478" - "github.com/hashicorp/consul 39f93f011e591c842acc8053a7f5972aa6e592fd" - "github.com/hashicorp/go-cleanhttp d5fe4b57a186c716b0e00b8c301cbd9b4182694d" - "github.com/hashicorp/go-rootcerts 6bb64b370b90e7ef1fa532be9e591a81c3493e00" - "github.com/hashicorp/serf d6574a5bb1226678d7010325fb6c985db20ee458" - "github.com/influxdata/go-syslog eecd51df3ad85464a2bab9b7d3a45bc1e299059e" - "github.com/influxdata/tail c43482518d410361b6c383d7aebce33d0471d7bc" - "github.com/influxdata/toml 2a2e3012f7cfbef64091cc79776311e65dfa211b" - "github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec" - "github.com/jackc/pgx da3231b0b66e2e74cdb779f1d46c5e958ba8be27" - "github.com/jmespath/go-jmespath 0b12d6b5" - "github.com/kardianos/osext ae77be60afb1dcacde03767a8c37337fad28ac14" - "github.com/kardianos/service 615a14ed75099c9eaac6949e22ac2341bf9d3197" - "github.com/kballard/go-shellquote 95032a82bc518f77982ea72343cc1ade730072f0" - "github.com/kr/logfmt b84e30acd515aadc4b783ad4ff83aff3299bdfe0" - "github.com/mailru/easyjson efc7eb8984d6655c26b5c9d2e65c024e5767c37c" - "github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c" - "github.com/Microsoft/ApplicationInsights-Go d2df5d440eda5372f24fcac03839a64d6cb5f7e5" - "github.com/Microsoft/go-winio a6d595ae73cf27a1b8fc32930668708f45ce1c85" - "github.com/miekg/dns 5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1" - "github.com/mitchellh/go-homedir 3864e76763d94a6df2f9960b16a20a33da9f9a66" - "github.com/mitchellh/mapstructure f15292f7a699fcc1a38a80977f80a046874ba8ac" - "github.com/multiplay/go-ts3 d0d44555495c8776880a17e439399e715a4ef319" - "github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b" - "github.com/nats-io/gnatsd 6608e9ac3be979dcb0614b772cc86a87b71acaa3" - "github.com/nats-io/go-nats 062418ea1c2181f52dc0f954f6204370519a868b" - "github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f" - "github.com/nsqio/go-nsq eee57a3ac4174c55924125bb15eeeda8cffb6e6f" - "github.com/opencontainers/go-digest 279bed98673dd5bef374d3b6e4b09e2af76183bf" - "github.com/opencontainers/image-spec d60099175f88c47cd379c4738d158884749ed235" - "github.com/opentracing-contrib/go-observer a52f2342449246d5bcc273e65cbdcfa5f7d6c63c" - "github.com/opentracing/opentracing-go 1949ddbfd147afd4d964a9f00b24eb291e0e7c38" - "github.com/openzipkin/zipkin-go-opentracing 26cf9707480e6b90e5eff22cf0bbf05319154232" - "github.com/pierrec/lz4 1958fd8fff7f115e79725b1288e0b878b3e06b00" - "github.com/pkg/errors 645ef00459ed84a119197bfb8d8205042c6df63d" - "github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2" - "github.com/prometheus/client_golang c5b7fccd204277076155f10851dad72b76a49317" - "github.com/prometheus/client_model 5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f" - "github.com/prometheus/common 7600349dcfe1abd18d72d3a1770870d9800a7801" - "github.com/prometheus/procfs ae68e2d4c00fed4943b5f6698d504a5fe083da8a" - "github.com/rcrowley/go-metrics e2704e165165ec55d062f5919b4b29494e9fa790" - "github.com/samuel/go-zookeeper c4fab1ac1bec58281ad0667dc3f0907a9476ac47" - "github.com/satori/go.uuid f58768cc1a7a7e77a3bd49e98cdd21419399b6a3" - "github.com/shirou/gopsutil 8048a2e9c5773235122027dd585cf821b2af1249" - "github.com/shirou/w32 bb4de0191aa41b5507caa14b0650cdbddcd9280b" - "github.com/Shopify/sarama a6144ae922fd99dd0ea5046c8137acfb7fab0914" - "github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc" - "github.com/soniah/gosnmp 96b86229e9b3ffb4b954144cdc7f98fe3ee1003f" - "github.com/StackExchange/wmi 5d049714c4a64225c3c79a7cf7d02f7fb5b96338" - "github.com/streadway/amqp e5adc2ada8b8efff032bf61173a233d143e9318e" - "github.com/stretchr/objx 477a77ecc69700c7cdeb1fa9e129548e1c1c393c" - "github.com/stretchr/testify f35b8ab0b5a2cef36673838d662e249dd9c94686" - "github.com/tidwall/gjson f123b340873a0084cb27267eddd8ff615115fbff" - "github.com/tidwall/match 1731857f09b1f38450e2c12409748407822dc6be" - "github.com/vishvananda/netlink b2de5d10e38ecce8607e6b438b6d174f389a004e" - "github.com/vishvananda/netns 13995c7128ccc8e51e9a6bd2b551020a27180abd" - "github.com/vjeantet/grok ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53" - "github.com/vmware/govmomi e3a01f9611c32b2362366434bcd671516e78955d" - "github.com/wvanbergen/kafka e2edea948ddfee841ea9a263b32ccca15f7d6c2f" - "github.com/wvanbergen/kazoo-go f72d8611297a7cf105da904c04198ad701a60101" - "github.com/yuin/gopher-lua 46796da1b0b4794e1e341883a399f12cc7574b55" - "golang.org/x/crypto a2144134853fc9a27a7b1e3eb4f19f1a76df13c9 github.com/golang/crypto" - "golang.org/x/net a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1 github.com/golang/net" - "golang.org/x/oauth2 d2e6202438beef2727060aa7cabdd924d92ebfd9 github.com/golang/oauth2" - "golang.org/x/sys ac767d655b305d4e9612f5f6e33120b9176c4ad4 github.com/golang/sys" - "golang.org/x/text f21a4dfb5e38f5895301dc265a8def02365cc3d0 github.com/golang/text" - "google.golang.org/api 19ff8768a5c0b8e46ea281065664787eefc24121 github.com/googleapis/google-api-go-client" - "google.golang.org/appengine b1f26356af11148e710935ed1ac8a7f5702c7612 github.com/golang/appengine" - "google.golang.org/genproto fedd2861243fd1a8152376292b921b394c7bef7e github.com/google/go-genproto" - "google.golang.org/grpc 168a6198bcb0ef175f7dacec0b8691fc141dc9b8 github.com/grpc/grpc-go" - "go.opencensus.io 79993219becaa7e29e3b60cb67f5b8e82dee11d6 github.com/census-instrumentation/opencensus-go" - "gopkg.in/alecthomas/kingpin.v2 947dcec5ba9c011838740e680966fd7087a71d0d github.com/alecthomas/kingpin" - "gopkg.in/asn1-ber.v1 379148ca0225df7a432012b8df0355c2a2063ac0 github.com/go-asn1-ber/asn1-ber" - "gopkg.in/fatih/pool.v2 010e0b745d12eaf8426c95f9c3924d81dd0b668f github.com/fatih/pool" - "gopkg.in/fsnotify.v1 c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 github.com/fsnotify/fsnotify" - "gopkg.in/gorethink/gorethink.v3 7f5bdfd858bb064d80559b2a32b86669c5de5d3b github.com/gorethink/gorethink" - "gopkg.in/ldap.v2 bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9 github.com/go-ldap/ldap" - "gopkg.in/mgo.v2 9856a29383ce1c59f308dd1cf0363a79b5bef6b5 github.com/go-mgo/mgo" - "gopkg.in/olivere/elastic.v5 52741dc2ce53629cbe1e673869040d886cba2cd5 github.com/olivere/elastic" - "gopkg.in/tomb.v1 dd632973f1e7218eb1089048e0798ec9ae7dceb8 github.com/go-tomb/tomb" - "gopkg.in/yaml.v2 5420a8b6744d3b0345ab293f6fcba19c978f1183 github.com/go-yaml/yaml" - ) - -inherit golang-build golang-vcs-snapshot systemd user - -MY_PV="${PV/_rc/-rc.}" - -DESCRIPTION="The plugin-driven server agent for collecting & reporting metrics." -HOMEPAGE="https://github.com/influxdata/telegraf" -SRC_URI="https://${EGO_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - ${EGO_VENDOR_URI}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -pkg_setup() { - enewgroup telegraf - enewuser telegraf -1 -1 -1 telegraf -} - -src_compile() { - pushd "src/${EGO_PN}" || die - pwd - find -iname telegraf.go - set -- env GOPATH="${S}" go build -i -v -work -x -o telegraf \ - cmd/telegraf/telegraf.go - echo "$@" - "$@" || die - popd || die -} - -src_install() { - pushd "src/${EGO_PN}" || die - dobin telegraf - insinto /etc/telegraf - doins etc/telegraf.conf - keepdir /etc/telegraf/telegraf.d - - insinto /etc/logrotate.d - doins etc/logrotate.d/telegraf - -systemd_dounit scripts/telegraf.service - newconfd "${FILESDIR}"/telegraf.confd telegraf - newinitd "${FILESDIR}"/telegraf.rc telegraf - - dodoc -r docs/* - - keepdir /var/log/telegraf - fowners telegraf:telegraf /var/log/telegraf -} diff --git a/net-analyzer/termshark/Manifest b/net-analyzer/termshark/Manifest new file mode 100644 index 000000000000..759fadd45ab8 --- /dev/null +++ b/net-analyzer/termshark/Manifest @@ -0,0 +1,2 @@ +DIST termshark-2.4.0-deps.tar.xz 64667348 BLAKE2B 2406756070dfcb813a7e24ce4eb0790a17b4ecf865440c801bbaa07d0d5eb8c2eed1a37111bd59e8104f450464aa702d07fb483d4d7b2f51fb3cd272994bf6f6 SHA512 78d964d8fe317b4a70ba18bbd6bcf02cb1208c02b6d95018dfb49561996c3d3e0ba898d483cd4814b4ee0f28f1f757dc937829af5f6ffb4c36f98c480e8e324b +DIST termshark-2.4.0.tar.gz 427503 BLAKE2B df232595477d62480ba8ba994e635f01bc5a5ffd09378da37c01847d899e4938a92c8304e26ea425b7a72cfd71f918686a4683e1a04883c3c92e26104b9f84be SHA512 378bb67ff50a8dfa80f614540371f326627e73bdf63bceb183ed73afbbf9dead4e0597fb969ba49c4ee3d3de00ac7bb91166421c19c788df47ff8d9fcbc5b9fc diff --git a/net-analyzer/termshark/metadata.xml b/net-analyzer/termshark/metadata.xml new file mode 100644 index 000000000000..09186a431868 --- /dev/null +++ b/net-analyzer/termshark/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <upstream> + <remote-id type="github">gcla/termshark</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/termshark/termshark-2.4.0.ebuild b/net-analyzer/termshark/termshark-2.4.0.ebuild new file mode 100644 index 000000000000..8c20d52c4d9d --- /dev/null +++ b/net-analyzer/termshark/termshark-2.4.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="A terminal UI for tshark, inspired by Wireshark" +HOMEPAGE="https://termshark.io/" +SRC_URI="https://github.com/gcla/termshark/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="Apache-2.0 BSD-2 BSD MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64" + +# termshark doesn't link against wireshark. It reads data via IPC during +# runtime. +RDEPEND=" + net-analyzer/wireshark[dumpcap,pcap,tshark] +" + +src_compile() { + ego build ./... +} + +src_test() { + ego test ./... +} + +src_install() { + GOBIN="${S}/bin" ego install ./... + + dobin bin/${PN} + dodoc README.md + dodoc docs/* +} diff --git a/net-analyzer/testssl/Manifest b/net-analyzer/testssl/Manifest index 3597023e411a..aaca702899cd 100644 --- a/net-analyzer/testssl/Manifest +++ b/net-analyzer/testssl/Manifest @@ -1,2 +1 @@ -DIST testssl-2.9.5_p8.tar.gz 8956035 BLAKE2B 692e08e6ff3dedf52dad5ba960291043740fa4e8e8f117b5dff93adfe1a620add3a34660fcbc1c68b53e23b0df5a0ff1862a33b12a50e78312c65791e0a55b42 SHA512 4c0fd1faa8978f85b46a6ae41471e16c8ab2d5651bdb6e009478aeed7b363a3648ff44e6e7689ccf421bd5e6374a2b5bfe9e5a13f7284c3a46371ed58ce4e5fb -DIST testssl-3.0.tar.gz 9207778 BLAKE2B 56f13cb58bc930e0c70ef1ff4734dd7e363f362397ebe354c446f1fd6e73a0774a6eb84326a405a5aab224b058754e03fcecda254617eee2fde4d9566ada4e15 SHA512 a5e65d3145bc422cf03b49087cc24cadca367206a06dda61d114b0a6afd7c4921204e23cdc3ade2f5d7e9ce4adf17b54691b9d33d46b75b296111663e9cf063a +DIST testssl-3.0.8.tar.gz 9372229 BLAKE2B cf463236fb0812c2bc5fd5673d0d2d395fc405697817827ee8c660c96d789601a090b57febd48400e33fd9f28b23d42d432734b176b23a8e8ddf710c9b275485 SHA512 4634bc5dc57ad8910ca097b22d86511a26e855fb4dc7bef9550a795cb1f53a959b8472008756b40a670d7433ad56236b5a36fe0c88c15de99fdf586e9919b080 diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml index ffc44aeef678..734e80ca03a7 100644 --- a/net-analyzer/testssl/metadata.xml +++ b/net-analyzer/testssl/metadata.xml @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>kensington@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="bundled-openssl">Install precompiled versions of OpenSSL for greater testing coverage</flag> </use> diff --git a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild b/net-analyzer/testssl/testssl-3.0.8.ebuild index ada154f761bb..895f0662c62e 100644 --- a/net-analyzer/testssl/testssl-2.9.5_p8.ebuild +++ b/net-analyzer/testssl/testssl-3.0.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PN="${PN}.sh" MY_PV="${PV/_p/-}" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/drwetter/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.t LICENSE="GPL-2 bundled-openssl? ( openssl )" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" IUSE="bundled-openssl kerberos" RDEPEND=" @@ -37,7 +37,7 @@ QA_PREBUILT="opt/${PN}/*" pkg_setup() { if use amd64; then if use kerberos; then - BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5" + BUNDLED_OPENSSL="openssl.Linux.x86_64.krb" else BUNDLED_OPENSSL="openssl.Linux.x86_64" fi @@ -60,7 +60,7 @@ src_prepare() { src_install() { dodoc CHANGELOG.md CREDITS.md Readme.md - dodoc openssl-rfc.mappping.html + dodoc openssl-iana.mapping.html dobin ${PN}.sh diff --git a/net-analyzer/testssl/testssl-3.0.ebuild b/net-analyzer/testssl/testssl-3.0.ebuild deleted file mode 100644 index 8a2472e4e275..000000000000 --- a/net-analyzer/testssl/testssl-3.0.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_PN="${PN}.sh" -MY_PV="${PV/_p/-}" - -DESCRIPTION="Tool to check TLS/SSL cipher support" -HOMEPAGE="https://testssl.sh/" -SRC_URI="https://github.com/drwetter/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 bundled-openssl? ( openssl )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bundled-openssl kerberos" - -RDEPEND=" - app-shells/bash[net] - net-dns/bind-tools - sys-apps/util-linux - sys-libs/ncurses:0 - sys-process/procps - bundled-openssl? ( - kerberos? ( - sys-libs/zlib - virtual/krb5 - ) - ) - !bundled-openssl? ( dev-libs/openssl:0 ) -" - -S=${WORKDIR}/${MY_PN}-${MY_PV} - -QA_PREBUILT="opt/${PN}/*" - -pkg_setup() { - if use amd64; then - if use kerberos; then - BUNDLED_OPENSSL="openssl.Linux.x86_64.krb5" - else - BUNDLED_OPENSSL="openssl.Linux.x86_64" - fi - elif use x86; then - BUNDLED_OPENSSL="openssl.Linux.i686" - fi -} - -src_prepare() { - default - sed -i ${PN}.sh \ - -e 's|TESTSSL_INSTALL_DIR="${TESTSSL_INSTALL_DIR:-""}"|TESTSSL_INSTALL_DIR="/"|' \ - -e 's|$TESTSSL_INSTALL_DIR/etc/|&testssl/|g' || die - - if use bundled-openssl; then - sed -i ${PN}.sh \ - -e "/find_openssl_binary()/a OPENSSL=\"/opt/${PN}/${BUNDLED_OPENSSL}\"" || die - fi -} - -src_install() { - dodoc CHANGELOG.md CREDITS.md Readme.md - dodoc openssl-iana.mapping.html - - dobin ${PN}.sh - - insinto /etc/${PN} - doins etc/* - - if use bundled-openssl; then - exeinto /opt/${PN} - use amd64 && doexe bin/${BUNDLED_OPENSSL} - fi -} diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml index 6f49eba8f496..00be373465d6 100644 --- a/net-analyzer/thc-ipv6/metadata.xml +++ b/net-analyzer/thc-ipv6/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">vanhauser-thc/thc-ipv6</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" + EGIT_BRANCH=master + inherit git-r3 +else SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild index 71f98da3f733..b5817554f26c 100644 --- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild +++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -[[ ${PV} == *9999 ]] && SCM="git-r3" -EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" -EGIT_BRANCH=master +EAPI=7 -inherit eutils toolchain-funcs ${SCM} +inherit toolchain-funcs -DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" +DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" HOMEPAGE="https://www.thc.org/thc-ipv6/" -LICENSE="AGPL-3 openssl" -SLOT="0" -IUSE="ssl" -if [[ ${PV} != *9999 ]]; then +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" + EGIT_BRANCH=master + inherit git-r3 +else SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi -DEPEND="net-libs/libpcap +LICENSE="AGPL-3 openssl" +SLOT="0" +IUSE="ssl" + +DEPEND=" net-libs/libnetfilter_queue - ssl? ( dev-libs/openssl:0= )" + net-libs/libpcap + ssl? ( dev-libs/openssl:0= ) +" RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) -src_unpack() { - if [[ ${PV} != *9999 ]]; then - default_src_unpack - else - git-r3_src_unpack - fi -} - src_prepare() { sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ -i Makefile || die - if ! use ssl ; then + + if ! use ssl; then sed -e '/^HAVE_SSL/s:^:#:' \ - -i Makefile + -i Makefile || die fi + default } diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest deleted file mode 100644 index fc6d91877b36..000000000000 --- a/net-analyzer/thcrut/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST thcrut-1.2.5.tar.gz 660673 BLAKE2B b57d2f15a4190880b135c2631a377f7136f56764d16a5fcd367b72d2cb33313a5c3651bd9f8558eb7b12a630de45674ab8d7c279dd3c0b57a2a8a2407dce33be SHA512 954f7512bd3e3937796cc065612214ae7d17f70175305ee66951a4e4dc2fcd83c7b15c690f429c7642c9951c2219f86a045418a77e42e3e4a54deac2ae0c46ab diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch deleted file mode 100644 index daa069e22afd..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-configure.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -153,10 +153,8 @@ - dnl libnet_init_packet only available in < libnet-1.1.x - dnl AC_CHECK_LIB(net, libnet_init_packet,, AC_MSG_ERROR(We need libnet. - dnl Get libnet from http://www.packetfactory.net or try --with-[[libs,includes]]=DIR)) --AC_CHECK_LIB(net, libnet_init_packet, [NET=yes], [NET=no]) -+AC_CHECK_LIB(net-1.0, libnet_init_packet, [NET=yes], [NET=no]) - if test x"$NET" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(Libnet-1.0.2a) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS Libnet-1.0.2a" - CPPFLAGS="-I../Libnet-1.0.2a/include ${CPPFLAGS}" - LDFLAGS="-L../Libnet-1.0.2a/src ${LDFLAGS}" - PRG_LIBNET_CONFIG_CFLAGS="../Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '" -@@ -164,14 +162,12 @@ - dnl CFLAGS="`${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" - dnl LIBS="`${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" - else -- CFLAGS="`libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -- LIBS="`libnet-config --libs` $LIBS" -+ CFLAGS="`libnet-1.0-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+ LIBS="`libnet-1.0-config --libs` $LIBS" - fi - - AC_CHECK_LIB(pcre, pcre_compile, [PCRE=yes], [PCRE=no]) - if test x"$PCRE" = x"no" -o x"$DIST" = x"yes"; then -- AC_CONFIG_SUBDIRS(pcre-3.9) -- THCRUT_SUBDIRS="$THCRUT_SUBDIRS pcre-3.9" - CPPFLAGS="-I../pcre-3.9 ${CPPFLAGS}" - LDFLAGS="-L../pcre-3.9 ${LDFLAGS}" - PRG_PCRE_CONFIG_CFLAGS="../pcre-3.9/pcre-config --cflags" -@@ -199,8 +195,8 @@ - AC_OUTPUT(Makefile src/Makefile) - - dnl Just to show the correct values... --CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `${srcdir}/Libnet-1.0.2a/libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" --LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `${srcdir}/Libnet-1.0.2a/libnet-config --libs` $LIBS" -+CFLAGS="`${srcdir}/pcre-3.9/pcre-config --cflags` `libnet-config --cflags --defines | tr '\n' ' '` $CFLAGS" -+LIBS="`${srcdir}/pcre-3.9/pcre-config --libs` `libnet-config --libs` $LIBS" - - echo "THCrut has been configured with the following options:" - echo " User binaries: $B" diff --git a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch b/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch deleted file mode 100644 index 87488c8c5196..000000000000 --- a/net-analyzer/thcrut/files/thcrut-1.2.5-libnet.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/src/arp_main.c -+++ b/src/arp_main.c -@@ -18 +18 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/arpg.c -+++ b/src/arpg.c -@@ -12 +12 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/dhcp_main.c -+++ b/src/dhcp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_dispatch.c -+++ b/src/discover_dispatch.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/discover_main.c -+++ b/src/discover_main.c -@@ -8 +8 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/fp.h -+++ b/src/fp.h -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/icmp_main.c -+++ b/src/icmp_main.c -@@ -14 +14 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/network_raw.c -+++ b/src/network_raw.c -@@ -10 +10 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/packets.c -+++ b/src/packets.c -@@ -6 +6 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.c -+++ b/src/thcrut.c -@@ -87 +87 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut.h -+++ b/src/thcrut.h -@@ -7 +7 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.c -+++ b/src/thcrut_libnet.c -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> ---- a/src/thcrut_libnet.h -+++ b/src/thcrut_libnet.h -@@ -5 +5 @@ --#include <libnet.h> -+#include <libnet-1.0.h> diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/thcrut/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild deleted file mode 100644 index 81a092c175cd..000000000000 --- a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="Network discovery and fingerprinting tool" -HOMEPAGE="http://www.thc.org/thc-rut/" -SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz" - -LICENSE="free-noncomm PCRE GPL-1+" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" - -DEPEND=" - dev-libs/libpcre - net-libs/libnet:1.0 - net-libs/libpcap -" - -src_prepare() { - rm -r Libnet-1.0.2a pcre-3.9 || die - epatch \ - "${FILESDIR}"/${P}-libnet.patch \ - "${FILESDIR}"/${P}-configure.patch - eautoreconf -} - -DOCS=( ChangeLog FAQ README TODO thcrutlogo.txt ) diff --git a/net-analyzer/thrulay/metadata.xml b/net-analyzer/thrulay/metadata.xml index 7fb9c5a520e9..43854ecbacb0 100644 --- a/net-analyzer/thrulay/metadata.xml +++ b/net-analyzer/thrulay/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>robbat2@gentoo.org</email> diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild index 388b9ba4e265..c5535ff76b1e 100644 --- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild +++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,9 +9,10 @@ DESCRIPTION="Measure the capacity of a network by sending a bulk TCP stream over HOMEPAGE="http://www.internet2.edu/~shalunov/thrulay/" SRC_URI=" http://www.internet2.edu/~shalunov/thrulay/${P}.tar.gz - mirror://sourceforge/${PN}/${P}.tar.gz" + https://downloads.sourceforge.net/${PN}/${P}.tar.gz" -LICENSE="BSD" +# init.d is GPL-2 +LICENSE="BSD GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" diff --git a/net-analyzer/tleds/files/tleds.conf.d b/net-analyzer/tleds/files/tleds.conf.d index 477408d30ed0..cfca606342c9 100644 --- a/net-analyzer/tleds/files/tleds.conf.d +++ b/net-analyzer/tleds/files/tleds.conf.d @@ -1,4 +1,4 @@ -# Copyright 2003-2004 Gentoo Foundation +# Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 IFACE="eth0" diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/tleds/metadata.xml +++ b/net-analyzer/tleds/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild index 56abdfd1f3cd..50d2d48db744 100644 --- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild +++ b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild @@ -1,17 +1,18 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs MY_P="${P/_/}" -S="${WORKDIR}/${MY_P/eta11/}" -DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface" +DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets" HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html" SRC_URI=" http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2 " +S="${WORKDIR}/${MY_P/eta11/}" LICENSE="GPL-2" SLOT="0" @@ -21,15 +22,15 @@ IUSE="X" DEPEND="X? ( x11-libs/libX11 )" RDEPEND="${DEPEND}" -src_prepare() { - # code patches - epatch \ - "${WORKDIR}"/${MY_P}.patch \ - "${FILESDIR}"/${P}-gentoo.patch -} +PATCHES=( + "${WORKDIR}"/${MY_P}.patch + "${FILESDIR}"/${P}-gentoo.patch +) src_compile() { - emake CC=$(tc-getCC) $(usex X all tleds) + emake \ + CC="$(tc-getCC)" \ + $(usex X all tleds) } src_install() { diff --git a/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch b/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch new file mode 100644 index 000000000000..69b27d97ad05 --- /dev/null +++ b/net-analyzer/tptest/files/tptest-3.1.7-clang16-build-fix.patch @@ -0,0 +1,11 @@ +Bug: https://bugs.gentoo.org/897832 +--- a/apps/unix/server/server.c ++++ b/apps/unix/server/server.c +@@ -50,6 +50,7 @@ + #include <sys/file.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <fcntl.h> + + // #include <net/if.h> + // #include <netinet/in.h> diff --git a/net-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml index 43601ae2ee47..7a32825289e8 100644 --- a/net-analyzer/tptest/metadata.xml +++ b/net-analyzer/tptest/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index 709ad3a89a3e..5587fcf6e107 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -1,35 +1,42 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit toolchain-funcs eutils +EAPI=7 + +inherit toolchain-funcs MY_PV="${PV/./_}" DESCRIPTION="Internet bandwidth tester" HOMEPAGE="http://tptest.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + LICENSE="GPL-2" SLOT="0" - KEYWORDS="amd64 ppc sparc x86" +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch +) + src_prepare() { + default + sed -i apps/unix/{client,server}/Makefile \ -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ || die - epatch "${FILESDIR}/${PN}-3.1.7-getstatsfromlinevuln.patch" - cp -f os-dep/unix/* . - cp -f engine/* . + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die } src_compile() { emake -C apps/unix/client \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" emake -C apps/unix/server \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ LDFLAGS="${LDFLAGS}" } diff --git a/net-analyzer/tptest/tptest-3.1.7-r3.ebuild b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild new file mode 100644 index 000000000000..58fefcd79cff --- /dev/null +++ b/net-analyzer/tptest/tptest-3.1.7-r3.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV="${PV/./_}" + +DESCRIPTION="Internet bandwidth tester" +HOMEPAGE="http://tptest.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" + +PATCHES=( + "${FILESDIR}"/${PN}-3.1.7-getstatsfromlinevuln.patch + "${FILESDIR}"/${PN}-3.1.7-clang16-build-fix.patch +) + +src_prepare() { + default + + sed -i apps/unix/{client,server}/Makefile \ + -e "s:^CFLAGS[[:space:]]*=:CFLAGS+=:" \ + || die + + cp -f os-dep/unix/* . || die + cp -f engine/* . || die +} + +src_compile() { + emake -C apps/unix/client \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" + + emake -C apps/unix/server \ + CC="$(tc-getCC)" \ + LDFLAGS="${LDFLAGS}" +} + +src_install() { + dobin apps/unix/client/tptestclient + dosbin apps/unix/server/tptestserver + + insinto /etc + doins apps/unix/server/tptest.conf +} diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest index 8d01e9c4c253..2633bec43216 100644 --- a/net-analyzer/tracebox/Manifest +++ b/net-analyzer/tracebox/Manifest @@ -1 +1 @@ -DIST tracebox-0.2.tar.gz 27954 BLAKE2B 57f4e36c727ebbb19161a6b4c887b64fdd362b033e09116f2e602a01737f19f10e6d0378296e70f683a5b8d53a57dae032e67098dd5989bb094daf3a3382a5d5 SHA512 15bfaede7e4828c14efbf7395f3d1c681b672b47157c370f4fe92d5d306ccc8e3e061107c3d36a505d732451d67ea146c21c299e6e826205725ab12680ee773e +DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6 diff --git a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch b/net-analyzer/tracebox/files/tracebox-0.2-deps.patch deleted file mode 100644 index f6c748a410cd..000000000000 --- a/net-analyzer/tracebox/files/tracebox-0.2-deps.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -32,15 +32,11 @@ - ]) - ]) - --# Make sure libcrafter build a static library by adding the --disable-shared --# argument to the configure script. --ac_configure_args_pre="$ac_configure_args" --ac_configure_args_post="$ac_configure_args --disable-shared" --ac_configure_args="$ac_configure_args_post" -+# check for libcrafter -+PKG_CHECK_MODULES(crafter, crafter, LIBS="$LIBS $crafter_LIBS",AC_MSG_ERROR([libcrafter is required])) - --AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) --AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) --AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter) -+# check for libpcap -+AC_CHECK_LIB(pcap,pcap_open_offline,LIBS="$LIBS -lpcap",AC_MSG_ERROR([libpcap is required])) - - # Enable click submodule - AS_IF([test "x$enable_tests" = "xyes"], [ -@@ -50,7 +46,6 @@ - - AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) - AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) -- AC_CONFIG_SUBDIRS(tests/tools/click) - - AC_PATH_PROG([FAKEROOT], [fakeroot]) - AS_IF([test -z "$FAKEROOT"], [ diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch new file mode 100644 index 000000000000..612132d157f4 --- /dev/null +++ b/net-analyzer/tracebox/files/tracebox-0.4.4-autotools.patch @@ -0,0 +1,214 @@ +- do not link to bundled + * dev-libs/json-c + * net-libs/libcrafter +- allow different lua versions + +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ + AC_HEADER_STDC + AC_HEADER_ASSERT + ++PKG_PROG_PKG_CONFIG ++ + AX_CXX_COMPILE_STDCXX_11 + + # Checks for header files. +@@ -32,40 +34,14 @@ + AC_FUNC_FORK + AC_CHECK_FUNCS([gettimeofday memset select socket strtol]) + +-AC_ARG_WITH(lua, +-[ --with-lua=DIR use lua in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/lua.h -a -f $withval/liblua.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LUA_INCLUDE="-I$withval" +- LUA_LIB="-L$withval -llua" +- LIBS="$LIBS -lm" +- elif test -f $withval/include/lua.h -a -f $withval/lib/liblua.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LUA_INCLUDE="-I$withval/include" +- LUA_LIB="-L$withval/lib -llua" +- LIBS="$LIBS -lm" +- else +- AC_ERROR("lua.h or liblua.a not found in $withval") +- fi +- ;; +- esac ], +- [ +- AX_PROG_LUA +- AX_LUA_HEADERS +- AX_LUA_LIBS +- if test x"$LUA_LIB" = x; then +- AC_MSG_ERROR([Lua library not found. You may try option --with-lua-suffix.]) +- fi +- ] +-) ++PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found])) ++PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found])) ++PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) ++PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found])) ++ ++if test -z "$LUA_FOUND"; then ++ AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required]) ++fi + AC_SUBST(LUA_INCLUDE) + AC_SUBST(LUA_LIB) + +@@ -121,24 +97,12 @@ + AC_ARG_WITH(json, + [ --with-json=DIR use json-c in DIR], + [ case "$withval" in +- yes|no) ++ no) + AC_MSG_RESULT(no) + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/json.h -a -f $withval/libjson-c.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- JSON_INCLUDE="-I$withval" +- JSON_LIB="-L$withval -ljson-c" +- elif test -f $withval/include/json-c/json.h -a -f $withval/lib/libjson-c.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- JSON_INCLUDE="-I$withval/include" +- JSON_LIB="-L$withval/lib -ljson-c" +- else +- AC_ERROR("json.h or libjson-c.a not found in $withval") +- fi ++ PKG_CHECK_MODULES([JSON], [json-c], [JSON_INCLUDE="${JSON_CFLAGS}"; JSON_LIB="${JSON_LIBS}"],AC_MSG_ERROR([json-c was requested but not found])) + AC_SUBST(JSON_INCLUDE) + AC_SUBST(JSON_LIB) + AC_DEFINE([HAVE_JSONC], [1], [Using json-c]) +@@ -153,41 +117,7 @@ + ] + ) + +-AC_MSG_CHECKING(for libpcap) +-AC_ARG_WITH(libpcap, +-[ --with-libpcap=DIR use libpcap in DIR], +-[ case "$withval" in +- yes|no) +- AC_MSG_RESULT(no) +- ;; +- *) +- AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a \ +- -f $withval/libpcap.a -a \ +- -d $withval/pcap; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- else +- AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +- fi +- ;; +- esac ], +-[ if test -f ${prefix}/include/pcap.h; then +- PCAPINC="-I${prefix}/include" +- PCAPLIB="-L${prefix}/lib -lpcap" +- elif test -f /usr/include/pcap/pcap.h; then +- PCAPINC="-I/usr/include/pcap" +- PCAPLIB="-lpcap" +- elif test -f /usr/include/pcap.h; then +- PCAPLIB="-lpcap" +- else +- AC_MSG_RESULT(no) +- AC_ERROR(libpcap not found) +- fi +- AC_MSG_RESULT(yes) ] +-) ++PKG_CHECK_MODULES([PCAP], [libpcap], [PCAPINC="${PCAP_CFLAGS}"; PCAPLIB="${PCAP_LIBS}"],AC_MSG_ERROR([libpcap is required])) + AC_SUBST(PCAPINC) + AC_SUBST(PCAPLIB) + +@@ -234,17 +164,7 @@ + AC_CHECK_LIB([pthread], [pthread_create]) + ]) + +-# Make sure libcrafter build a static library by adding the --disable-shared +-# argument to the configure script. +-ac_configure_args_pre="$ac_configure_args" +-ac_configure_args_post="$ac_configure_args --disable-shared" +-ac_configure_args="$ac_configure_args_post" +- +-AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) +-AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) +-AC_CONFIG_SUBDIRS(noinst/libcrafter/libcrafter) +- +-ac_configure_args="$ac_configure_args_pre" ++PKG_CHECK_MODULES([crafter], [crafter], [LIBS="$LIBS $crafter_LIBS"],AC_MSG_ERROR([libcrafter is required])) + + # Enable click submodule + AS_IF([test "x$enable_tests" = "xyes"], [ +@@ -254,7 +174,6 @@ + + AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"]) + AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"]) +- AC_CONFIG_SUBDIRS(tests/tools/click) + + ac_configure_args="$ac_configure_args_pre" + ]) +@@ -271,7 +190,6 @@ + + AC_CONFIG_FILES([ + Makefile +- noinst/Makefile + src/Makefile + src/tracebox/Makefile + tests/Makefile +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,8 +8,8 @@ + MAYBE_DOC = doc + endif + +-SUBDIRS = noinst src $(MAYBE_OPT) $(MAYBE_DOC) +-DIST_SUBDIRS = noinst src tests doc ++SUBDIRS = src $(MAYBE_OPT) $(MAYBE_DOC) ++DIST_SUBDIRS = src tests doc + + debian-package: + dpkg-buildpackage -rfakeroot -tc -us -uc +--- a/noinst/Makefile.am ++++ b/noinst/Makefile.am +@@ -1,4 +1,3 @@ +-DIST_SUBDIRS = libcrafter/libcrafter + + all-local: + cd libcrafter/libcrafter && $(MAKE) $(AM_MAKEFLAGS) all +--- a/src/tracebox/Makefile.am ++++ b/src/tracebox/Makefile.am +@@ -4,7 +4,6 @@ + + dist_man_MANS = tracebox.1 + +-dist_bin_SCRIPTS = luatracebox + + SUBDIRS = examples + +@@ -78,13 +77,11 @@ + + tracebox_LDADD = \ + $(EXTRALIBS) \ +- $(abs_top_builddir)/noinst/libcrafter/libcrafter/libcrafter.la \ + $(LUA_LIB) \ + $(PCAPLIB) \ + $(JSON_LIB) + + tracebox_CPPFLAGS = \ +- -I$(top_srcdir)/noinst/libcrafter/libcrafter \ + $(LUA_INCLUDE) \ + $(PCAPINC) \ + $(JSON_INCLUDE) \ diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch new file mode 100644 index 000000000000..bedd0208303a --- /dev/null +++ b/net-analyzer/tracebox/files/tracebox-0.4.4-include-crafter.patch @@ -0,0 +1,44 @@ +--- a/src/tracebox/PacketModification.h ++++ b/src/tracebox/PacketModification.h +@@ -8,7 +8,7 @@ + #ifndef __PACKETMODIFICATION_H__ + #define __PACKETMODIFICATION_H__ + +-#include "crafter.h" ++#include <crafter.h> + #ifdef HAVE_LIBJSON + #include <json/json.h> + #endif +--- a/src/tracebox/PartialHeader.h ++++ b/src/tracebox/PartialHeader.h +@@ -8,7 +8,7 @@ + #ifndef __PARTIALHEADER_H__ + #define __PARTIALHEADER_H__ + +-#include "crafter.h" ++#include <crafter.h> + + /* ICMP message can contains partial header information */ + +--- a/src/tracebox/script.h ++++ b/src/tracebox/script.h +@@ -9,7 +9,7 @@ + #ifndef __TRACEBOX_SCRIPT_H__ + #define __TRACEBOX_SCRIPT_H__ + +-#include "crafter.h" ++#include <crafter.h> + + Crafter::Packet *script_packet(std::string& cmd); + int script_exec(const char*, int, char**); +--- a/src/tracebox/tracebox.h ++++ b/src/tracebox/tracebox.h +@@ -11,7 +11,7 @@ + + #include <memory> + +-#include "crafter.h" ++#include <crafter.h> + #include "config.h" + #include "PacketModification.h" + diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml index e55d9843a684..ac76e7334ff3 100644 --- a/net-analyzer/tracebox/metadata.xml +++ b/net-analyzer/tracebox/metadata.xml @@ -1,11 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> - <upstream> - <remote-id type="github">tracebox/tracebox</remote-id> - </upstream> +<maintainer type="project"> +<email>netmon@gentoo.org</email> +<name>Gentoo network monitoring and analysis project</name> +</maintainer> +<use> +<flag name="curl">Build the curl component for uploading capture files using <pkg>net-misc/curl</pkg></flag> +<flag name="sniffer">Build the sniffer component using <pkg>net-libs/libnetfilter_queue</pkg></flag> +</use> +<upstream> +<remote-id type="github">tracebox/tracebox</remote-id> +</upstream> </pkgmetadata> diff --git a/net-analyzer/tracebox/tracebox-0.2.ebuild b/net-analyzer/tracebox/tracebox-0.2.ebuild deleted file mode 100644 index 6713366d9482..000000000000 --- a/net-analyzer/tracebox/tracebox-0.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A Middlebox Detection Tool" -HOMEPAGE="http://www.tracebox.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-lang/lua - net-libs/libcrafter - net-libs/libpcap -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig -" - -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}"/${P}-deps.patch - - sed -i -e '/SUBDIRS/s|noinst||g' Makefile.am || die - sed -i -e '/DIST_SUBDIRS.*libcrafter/d' noinst/Makefile.am || die - - sed -i \ - -e '/[[:graph:]]*libcrafter[[:graph:]]*/d' \ - -e '/dist_bin_SCRIPTS/d' \ - src/${PN}/Makefile.am \ - || die - - sed -i \ - -e 's|"crafter.h"|<crafter.h>|g' \ - src/${PN}/PacketModification.h \ - src/${PN}/PartialHeader.h \ - src/${PN}/script.h \ - src/${PN}/${PN}.h \ - || die - - rm README.md || die - - eautoreconf -} diff --git a/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild new file mode 100644 index 000000000000..3020846855b4 --- /dev/null +++ b/net-analyzer/tracebox/tracebox-0.4.4-r100.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{2..4} ) + +inherit autotools flag-o-matic lua-single + +DESCRIPTION="A Middlebox Detection Tool" +HOMEPAGE="http://www.tracebox.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="curl sniffer" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="test" + +RDEPEND="${LUA_DEPS} + >=net-libs/libcrafter-0.3_p20171019 + dev-libs/json-c + net-libs/libpcap + curl? ( net-misc/curl ) + sniffer? ( net-libs/libnetfilter_queue )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-autotools.patch + "${FILESDIR}"/${P}-include-crafter.patch +) + +src_prepare() { + default + # remove bundled + # - dev-libs/json-c + # - net-libs/libcrafter + rm -r noinst || die + eautoreconf +} + +src_configure() { + # https://bugs.gentoo.org/786687 + # std::byte clashes with crafter/Types.h typedef + append-cxxflags -std=c++14 + + econf \ + $(use_enable curl) \ + $(use_enable sniffer) +} diff --git a/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch new file mode 100644 index 000000000000..8d95517ab27c --- /dev/null +++ b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1-fno-common.patch @@ -0,0 +1,122 @@ +--- a/tp_as.c ++++ b/tp_as.c +@@ -50,6 +50,7 @@ static char * ra_service; + static struct hostent * ra_hostent; + static struct servent * ra_servent; + ++char as_string[1024]; + + int setup_as ( void ) + { +--- a/tp_as.h ++++ b/tp_as.h +@@ -33,7 +33,7 @@ + #ifndef TP_AS_H + #define TP_AS_H 1 + +-char as_string[1024]; ++extern char as_string[1024]; + + /*! Initialisation function for AS lookups; returns 0 iff successful. */ + int setup_as(void); +--- a/tp_miscfunc.c ++++ b/tp_miscfunc.c +@@ -52,6 +52,8 @@ + #include <dmalloc.h> + #endif /* HAVE_LIBDMALLOC */ + ++struct cleanup tixe_cleanup; ++ + /* + * take a comma separated list (sans spaces) and give them a miss + * (ie don't send probes with the ttl set to these numbers) +--- a/tp_miscfunc.h ++++ b/tp_miscfunc.h +@@ -32,7 +32,8 @@ struct cleanup { + unsigned int libnet_cleanup : 1; + unsigned int pcap_cleanup : 1; + unsigned int addrinfo_cleanup : 1; +-} tixe_cleanup; ++}; ++extern struct cleanup tixe_cleanup; + + int parse_skips ( char * ); + +--- a/traceproto.c ++++ b/traceproto.c +@@ -55,6 +55,12 @@ + #include <dmalloc.h> + #endif /* HAVE_LIBDMALLOC */ + ++struct tp_align_ref tp_align_freelist; ++struct behavior behavior; ++struct packet packet; ++struct state state; ++struct debug debug; ++ + int main( int argc, char * argv[] ) + { + +--- a/traceproto.h ++++ b/traceproto.h +@@ -104,9 +104,10 @@ enum tp_tstamps { + struct tp_align_ref { + struct tp_align_ref * next; + u_char * ref; +-} tp_align_freelist; ++}; ++extern struct tp_align_ref tp_align_freelist; + +-struct { ++struct behavior { + unsigned int continuous : 1; + unsigned int continuous_accounting : 1; + unsigned int do_skip : 1; +@@ -148,9 +149,10 @@ struct { + char timestamp_str [ TP_TIMESTAMP_LEN ]; + char timestamp_style; + struct addrinfo hint; +-} behavior; ++}; ++extern struct behavior behavior; + +-struct { ++struct packet { + int dst_port; + int src_port; + int protocol_number; +@@ -161,9 +163,10 @@ struct { + long packed_src; + unsigned short frag_bit; + unsigned short ip_id; +-} packet; ++}; ++extern struct packet packet; + +-struct { ++struct state { + char * prog; + unsigned int account_hops; + struct hop_record { +@@ -208,9 +211,10 @@ struct { + unsigned int low_ttl; + unsigned int incr_error : 1; + unsigned int target_response : 1; +-} state; ++}; ++extern struct state state; + +-struct { ++struct debug { + unsigned int loop : 1; + unsigned int interface : 1; + unsigned int send_buf : 1; +@@ -219,6 +223,7 @@ struct { + unsigned int timestamp : 1; + unsigned int as_lookup : 1; + unsigned int memory : 1; +-} debug; ++}; ++extern struct debug debug; + + #endif /* TRACEPROTO_H */ diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml index d46f35d35c2d..c757a1817318 100644 --- a/net-analyzer/traceproto/metadata.xml +++ b/net-analyzer/traceproto/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild index 15e52604060b..5b09f203a538 100644 --- a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild +++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils autotools +EAPI=7 + +inherit autotools MY_PV=${PV/_/} @@ -18,12 +19,12 @@ IUSE="debug" RDEPEND=" net-libs/libnet:1.1 net-libs/libpcap - sys-libs/ncurses + sys-libs/ncurses:0= debug? ( dev-libs/dmalloc ) " -DEPEND=" - ${RDEPEND} - app-doc/doxygen[dot] +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/doxygen[dot] virtual/pkgconfig " @@ -31,8 +32,13 @@ S=${WORKDIR}/${PN}-${MY_PV} DOCS=( AUTHORS ChangeLog NEWS README TODO ) +PATCHES=( + "${FILESDIR}/${P}-tinfo.patch" + "${FILESDIR}/${P}-fno-common.patch" +) + src_prepare() { - epatch "${FILESDIR}"/${P}-tinfo.patch + default eautoreconf } diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest deleted file mode 100644 index 354b4b7c5d13..000000000000 --- a/net-analyzer/traceroute-nanog/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST traceroute-nanog_6.4.2-1.diff.gz 18417 BLAKE2B eec999aae1e728e9c255715042ee7be66bc32c19eff3ab32b85fecd281032d24eea27fa19d27793d9820b61539791ed82b0a0a7845636970a8d2433d0e3ba40a SHA512 62c2df3db292ab263a2d076689b80ff156bd4a3b4f604974ad8210a700bee80055e21165909eeff138d03570ffe4a44b983ed0cf5ba0c6a914af1928ae82038e -DIST traceroute-nanog_6.4.2.orig.tar.gz 34429 BLAKE2B 427a7af1f65271b1b4f46522d76da00628e1c6b877b576ff571dc09d7c1bd0232abd626296b46a16785cccaf091b086ea61b5081035572b846e04fff97d0dafb SHA512 1cd4c98404e7b25b2c1f1e4018fc1774f09822df8e597022c7b31b9cf20ce3c5649fd90337c62c65d163fb9c896bd9e19277febb5312d4afe347eac328c6e304 diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml deleted file mode 100644 index 74c2baebb4ec..000000000000 --- a/net-analyzer/traceroute-nanog/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild deleted file mode 100644 index 5dc3aa31866e..000000000000 --- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs - -MY_P="${PN}_${PV}" -DEB_PL="1" -DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features" -HOMEPAGE="http://packages.debian.org/traceroute-nanog" -SRC_URI=" - https://dev.gentoo.org/~jer/${MY_P}.orig.tar.gz - https://dev.gentoo.org/~jer/${MY_P}-${DEB_PL}.diff.gz -" -RESTRICT="mirror" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc x86" - -S="${S}.orig" - -src_prepare() { - EPATCH_SUFFIX="dpatch" epatch \ - "${WORKDIR}/${MY_P}-${DEB_PL}.diff" \ - "${WORKDIR}/${P}.orig/${P}/debian/patches/" -} - -src_compile() { - $(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \ - || die -} - -src_install() { - dosbin traceroute-nanog - dodoc 0_readme.txt faq.txt - newman ${P}/debian/traceroute-nanog.genuine.8 traceroute-nanog.8 -} diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild deleted file mode 100644 index d5cb034bcf01..000000000000 --- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2_p1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs - -DEB_PL="1" -DESCRIPTION="Traceroute with AS lookup, TOS support, MTU discovery and other features" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI=" - https://dev.gentoo.org/~jer/${PN}_${PV/_p*}.orig.tar.gz - https://dev.gentoo.org/~jer/${PN}_${PV/_p*}-${PV/*_p}.diff.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" - -S=${WORKDIR}/${P/_p*}.orig - -src_prepare() { - eapply "${WORKDIR}"/${PN}_${PV/_p*}-${PV/*_p}.diff - - eapply \ - $( - for i in $( cat "${S}"/debian/patches/00list ) - do - echo "${S}"/debian/patches/$i.dpatch - done - ) - - eapply_user -} - -src_compile() { - $(tc-getCC) traceroute.c -o ${PN} ${CFLAGS} -DSTRING ${LDFLAGS} -lresolv -lm \ - || die -} - -src_install() { - dosbin traceroute-nanog - dodoc 0_readme.txt faq.txt - newman "${S}"/debian/traceroute-nanog.genuine.8 traceroute-nanog.8 -} diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest index 475bef8468b2..ea14b7f70581 100644 --- a/net-analyzer/traceroute/Manifest +++ b/net-analyzer/traceroute/Manifest @@ -1,3 +1,3 @@ -DIST traceroute-2.0.20.tar.gz 68907 BLAKE2B 0b80836fe05cad955f8d1a31ecad56f46b29f4710c949c43cac2f908aef551867f808672e3e750cf4b228a94685dca0032c3d2d3ed9d8d5982dfffbe824adbf4 SHA512 ba82468f5e52a14cf029ff977d85e9cc395bdac2fdf8c29232f9e664bf15efdbaca4f56a78533f2afadd3aef95e31d4497f00f4fc29f74a699a149f0434b484d -DIST traceroute-2.0.22.tar.gz 69001 BLAKE2B 8678bf2636b3a0615e7282923ccfeae9c721adbecaecee1deff9324bdca8be26e9b821131f84e01411455806c07ded5bdb34b6ab64d4572ffef24af3cfd17c39 SHA512 f7981188b5aa13b6a6c26e7bb3b6cbab88b1adec53a04bff4b878f800bb32a62d82fa389fb36aefd81cc3e9da31740e095f6b6f7eba4dd5926520ad3cff7a92c -DIST traceroute-2.1.0.tar.gz 71460 BLAKE2B 4c2126fa98625d525d0a1b0075d16a6ff37836e18d2ce8319f58c89bfa22a6a5e3bbe2ded22fa98d5128c7bb58578327db08120a5b78c1c4ff5673dcc0dea7e6 SHA512 3578007c734091ea0c906637c03fd133a8b0154fbf2e6b5c0c881184947918196bc03aeaf872d3bd53777b9b771cba5cf97f73fb5916bb53b75037f429b40ed3 +DIST traceroute-2.1.1.tar.gz 73063 BLAKE2B 89a828f7a0fec30ece599ee7fdd13fd93db0668f6c9f930f1d6d7d94140bcfdf0c75d2d8c5cc52d699e5c4377239f1a4123ad73a98b619968955d029d0842d9f SHA512 f3358e57ffb4a8dc40650e941da879c60407414e44f9887ae65820d1089491dbfac579bd06c1df296738af89a6c61c1e7944ae4495464f8c9ae21afb19b8f296 +DIST traceroute-2.1.3.tar.gz 73171 BLAKE2B a723bdc8ed5f12f6b53552cf7d330eb028deb55ae85c785451d282be1946cdc57ff428a755cc2bbd71495b49cbc89c1707d2686a553029220f8a089fed1c1fc2 SHA512 db96214e6957fffe17c013044fdc20be6cf94fe5249c9adac77e62e20327c4d582b2ddf4b511f93f30be0cba9f67b0f3f61490745f35ff5a32c63ed66cb0c444 +DIST traceroute-2.1.5.tar.gz 75453 BLAKE2B b2e99398b23d064f96319c9ca677589175f4bde64bce1f1d3236fc94f0ae3aa00499a2ef4a5c66c3a5815e09e16c534d049c36745119850c90c8af879ef66c6b SHA512 4557e6091cd34edd9761ffa5c75e13d63e7ae17c9d060f18306487cd5c1e7eece8a7ef3ddc6bf40f78d1014ed38ce2411c14d839251412978b2da0915180be93 diff --git a/net-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml index bdcc2fb0e8cf..85a3686f583a 100644 --- a/net-analyzer/traceroute/metadata.xml +++ b/net-analyzer/traceroute/metadata.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> - <longdescription>Utility to trace the route of IP packets</longdescription> <upstream> <remote-id type="sourceforge">traceroute</remote-id> + <remote-id type="cpe">cpe:/a:buc:traceroute</remote-id> </upstream> </pkgmetadata> diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild deleted file mode 100644 index 9fb51908a415..000000000000 --- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic multilib toolchain-funcs - -DESCRIPTION="Utility to trace the route of IP packets" -HOMEPAGE="http://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE="static" - -RDEPEND="!<net-misc/iputils-20121221-r1 - !net-misc/iputils[traceroute6]" - -src_compile() { - use static && append-ldflags -static - append-ldflags -L../libsupp #432116 - tc-export AR CC RANLIB - emake env=yes -} - -src_install() { - emake \ - DESTDIR="${D}" \ - prefix="${EPREFIX}/usr" \ - libdir="${EPREFIX}/usr/$(get_libdir)" \ - install - dodoc ChangeLog CREDITS README TODO - - dosym traceroute /usr/bin/traceroute6 - dosym traceroute.8 /usr/share/man/man8/traceroute6.8 -} diff --git a/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.1.ebuild index f82dabcc9bd1..dc26780317bd 100644 --- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.1.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit flag-o-matic toolchain-funcs DESCRIPTION="Utility to trace the route of IP packets" HOMEPAGE="http://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static" -RDEPEND="!<net-misc/iputils-20121221-r1 - !net-misc/iputils[traceroute6]" +RDEPEND="!net-misc/iputils[traceroute6(-)]" src_compile() { use static && append-ldflags -static diff --git a/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.1.3.ebuild index ca0995b4e8ea..4de72a2c3179 100644 --- a/net-analyzer/traceroute/traceroute-2.0.22.ebuild +++ b/net-analyzer/traceroute/traceroute-2.1.3.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI=8 inherit flag-o-matic toolchain-funcs DESCRIPTION="Utility to trace the route of IP packets" -HOMEPAGE="http://traceroute.sourceforge.net/" -SRC_URI="mirror://sourceforge/traceroute/${P}.tar.gz" +HOMEPAGE="https://traceroute.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="static" -RDEPEND="!<net-misc/iputils-20121221-r1 - !net-misc/iputils[traceroute6]" +RDEPEND="!net-misc/iputils[traceroute6(-)]" src_compile() { use static && append-ldflags -static - append-ldflags -L../libsupp #432116 + # bug #432116 + append-ldflags -L../libsupp tc-export AR CC RANLIB + emake env=yes } diff --git a/net-analyzer/traceroute/traceroute-2.1.5.ebuild b/net-analyzer/traceroute/traceroute-2.1.5.ebuild new file mode 100644 index 000000000000..4de72a2c3179 --- /dev/null +++ b/net-analyzer/traceroute/traceroute-2.1.5.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="Utility to trace the route of IP packets" +HOMEPAGE="https://traceroute.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/traceroute/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="static" + +RDEPEND="!net-misc/iputils[traceroute6(-)]" + +src_compile() { + use static && append-ldflags -static + # bug #432116 + append-ldflags -L../libsupp + tc-export AR CC RANLIB + + emake env=yes +} + +src_install() { + emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install + dodoc ChangeLog CREDITS README TODO + dosym traceroute /usr/bin/traceroute6 + dosym traceroute.8 /usr/share/man/man8/traceroute6.8 +} diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch new file mode 100644 index 000000000000..046795a58328 --- /dev/null +++ b/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch @@ -0,0 +1,29 @@ +--- a/trafshow.c ++++ b/trafshow.c +@@ -58,7 +58,7 @@ + static void vers(); + static void usage(); + static pcap_if_t *pcap_matchdev(pcap_if_t *dp, const char *name); +-static int pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp); ++static int ts_pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp); + static void *pcap_feed(void *arg); /* PCAP_HANDLER *ph */ + #ifdef HAVE_PCAP_GET_SELECTABLE_FD + static void *pcap_feed2(void *arg); /* PCAP_HANDLER *ph */ +@@ -172,7 +172,7 @@ + } + + /* initialize list of pcap handlers */ +- if ((op = pcap_init(&ph_list, dev_list)) < 1) { ++ if ((op = ts_pcap_init(&ph_list, dev_list)) < 1) { + fprintf(stderr, "No packet capture device available (no permission?)\n"); + exit(1); + } +@@ -298,7 +298,7 @@ + } + + static int +-pcap_init(ph_list, dp) ++ts_pcap_init(ph_list, dp) + PCAP_HANDLER **ph_list; + pcap_if_t *dp; + { diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/trafshow/metadata.xml +++ b/net-analyzer/trafshow/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild index 9cde85d61f47..227dc9117fdf 100644 --- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild +++ b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools eutils +EAPI=7 +inherit autotools DESCRIPTION="Full screen visualization of the network traffic" HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml" @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz" LICENSE="BSD" SLOT="3" -KEYWORDS="amd64 hppa ~ppc ppc64 sparc x86" +KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc x86" IUSE="slang" DEPEND=" @@ -18,13 +18,19 @@ DEPEND=" !slang? ( sys-libs/ncurses ) slang? ( >=sys-libs/slang-1.4 ) " +BDEPEND=" + virtual/pkgconfig +" +PATCHES=( + "${FILESDIR}"/${P}-gcc44.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-pcap_init.patch + "${FILESDIR}"/${P}-tinfo.patch +) src_prepare() { + default cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die - epatch \ - "${FILESDIR}"/${P}-gcc44.patch \ - "${FILESDIR}"/${P}-gentoo.patch \ - "${FILESDIR}"/${P}-tinfo.patch eautoreconf } @@ -35,5 +41,5 @@ src_configure() { export LIBS=-lncurses fi - econf + default } diff --git a/net-analyzer/trippy/Manifest b/net-analyzer/trippy/Manifest new file mode 100644 index 000000000000..5f290c357170 --- /dev/null +++ b/net-analyzer/trippy/Manifest @@ -0,0 +1,338 @@ +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e3619ebd437c34a018920b679d5a11f9e96be48fbdabd2e98a379c0395d118616f21eb9004724d8fcb04b2b2b SHA512 46428b27e96be1f30058b9383a94988beeb5064dfb4df04d6959b451d0c77ef69fc51f07fdf9511ab9728295eb6beee7783c31a2297f9e473fc537883e722b73 +DIST ahash-0.8.7.crate 42894 BLAKE2B 56f4b2f577eb2752e675fa2b3191c65e0bb88575f92e8d906714296fca1daace46e93256672fce08cc5b4ac11d40a690a06b32a99fb50fd0df4f042773c33b6c SHA512 2c9eaa22f7bda47a781994c769d4a2ef15ba0f511fdd4ec4680c13d4c1809f1ce01adecc3b3776793158062d28ad9e5f0b1d1c0a9429e43dd07cd99540eae7a6 +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anstream-0.6.11.crate 30239 BLAKE2B 4ac585ec56a804239d32ad3e64d93936ef9d5c8e0f0e2df17f7b081b6a3b2c4c32ff4ebc09ec02507bbed22b025628029d859610aed90c024e19a3216de73c8b SHA512 f8dd65cc116a1495782a3bfc98edfdd0973ab22ea2fafd292fb4bd3495af7b5ea410f320d3fa05f7f812fa96c2a20f4cd2af9fc58869a1a306f32714cbe45163 +DIST anstream-0.6.4.crate 20593 BLAKE2B 2b617c45d351e01222fc50f52551e57b4a8b0ecf84c6ddf44336c7c9d3b9dde15232b1c4f664d567849295bf8f03612b73ded56f1b3937392eb7718f1e0446c3 SHA512 0b983d626c53d1edc184f04cbd2c004eb9c40d14486b23cce86ebf50cbd3d916d32cb0423ae1d67c2b83b966690090af740538538ef846c0b126c686a1ebe159 +DIST anstyle-1.0.4.crate 13998 BLAKE2B fb501700855709e53438461c2f4b48d869613e7bb3bb700db8bd0d95082876d3782dc2cfe3ce110bb4a206994de56afe0e90fe89f9ccd07c60fe1c652123ba59 SHA512 671c6f57106198bcfc2f9000aacba98fabacfadfce2329dfe8d0e0a2af9404da483d7a844ca2b08e1fc0249371f574c13d0082c9f7a4ed90ff581308257a52d3 +DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa +DIST anstyle-parse-0.2.2.crate 24696 BLAKE2B 979daa24ccc3ea484445216bddc190f148f0ad83b95c997c1becbadfb641b67834980c413bcf5b7ddc2c6883d5e071a9636fbb44f79680ac42f8b73a797e466a SHA512 28039806f87c2bd8266cea834975939b79fdf0cc95a029654806655c0662520aa497d84eefadcd9edce204986e60b62678e76a09cdb38bcc50c91e9d05c4bee9 +DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 +DIST anstyle-query-1.0.0.crate 8620 BLAKE2B 2d296b5066fd6284a2410923215571e6df650c5ef892d6de7a7088a0996ca30608797feabc84f3c325ff4d07001dac80ac5067d2a9c9d15d9ba59a276b399f53 SHA512 2781be5c82293b7ae338ec5046fbeb130de9eb2dbf2e4dfaa73ca5233032e1e52c133e141b02f33d4bc36d996a0a3f680ac82d42d614a5305005f60547133c7a +DIST anstyle-query-1.0.2.crate 8739 BLAKE2B c06643e8616f1f4469a32f9c0512941ce53ac5db9ebfa7a5b2f19233040cd4438dd2ee69ab89ecbc1c239e92b674dea9df15ed673408c6f3fe21787cc17d76f3 SHA512 f409b624cbeecf58fd87c47f85be28cae1fe48f65d692195fb80854c514e38c40d0e0ffad3a5b388a3929c47bd2060302ebb635aa98dc57329f3a5ed7be3e2dc +DIST anstyle-wincon-3.0.1.crate 11279 BLAKE2B 593de9443b4c612526550285a6c156db26a233815e77a748597c6eea509ae511f41eb8ee736010f8be853695c9f1d94b034a77190e612f0a00bf00385d66ced2 SHA512 75ab14081b09e031ee0f559538976f39092aaeb6f561a56de83d12911cc2b45e28eec21068792c86a61e344021921ab55e7139ca79acec78e7d4a796dfa42a2e +DIST anstyle-wincon-3.0.2.crate 11272 BLAKE2B 73e124773f618a744b17017d4680ec6ccc84ff94fbe2e565073fbcc0facecd3cb65356cf27746d07f453bc917cbeb2ade3a618c6b8578d64cff4828c99569868 SHA512 4cc194faacffa01c6989354c1cadbf1134f0945250f67b7020ab5b475e30db34c799176bd335a6265386cb9c5e8b5bcbdf35894ec0c809b140ffe1c406751931 +DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 +DIST arrayvec-0.7.4.crate 29856 BLAKE2B 81ffac1db340e919618351819def3880ab1ef70d0acc47d680f15298eb749bcbc3bf7944ba14159be46b1e734c91b4c0f8cbaf774fd864c17caa3c9fb1fc2e9b SHA512 91e8f70330c515c966d78ae235e890594f9607381ac738a2c3586b53f01411e98d1687494f39ccc365948ae60497df3dfb2be18e26ab7e69bc0966b6c250e1ac +DIST async-trait-0.1.74.crate 28997 BLAKE2B adef7d3929f7cfb64c9884fdd17871193cc063f935a5540562b1092e85d85ab89527bd353486a219a2f9bb74ada6a0ee765e839435962cb5768f2a65b7a2b1e2 SHA512 2c0880bc3b7863deab06e873b3d5a893545549c1dae922370d629c16cc0ee5cb4df13b30fe9e34d1cee74449d549745ff99894ab0743f805d96a5d4b5ef2dc80 +DIST async-trait-0.1.77.crate 29986 BLAKE2B f678cea4defa1cc7c0f1571e71f87392c0fdca8ba175bd94be68b92adaf2b4afe13fac9020bd27bfbb2af9a7d5f2f7047e3bbd0b080a7213354a8175e6ccd455 SHA512 7ddadfe6c434267cbb22de62f09373ea83ec3c4eceb7781e0bc438ce422266f30193730e0215411f1c7c9c6d5cc589ed9bbbd71c836e440bbcddf8afd3d8950f +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base64-0.21.7.crate 82576 BLAKE2B 25cc8761c14220981ff4ed332058f6179948080cbfa2b225ec1d1602e4af14cd470c969e8b7049117e6fc51a5a24e06b1d27bab844486ecb76409d12e0581d5d SHA512 c6986d88dd9aa081d914f35b4174be4ba874848657ac4b5e63b9b45af765d973289c548ccb5a01584edfc0d8d79ff5be25b51365295d6e7a311bd7f0ae3c0cb9 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST c2rust-bitfields-0.18.0.crate 5883 BLAKE2B 29b43c18a838e49220c6e323f596f7d0985dc554352033c71c148069a18ca87dbac37449d012046d114757d4bd4f8cf9f43f64514301c95942b0cf6f855b8264 SHA512 1629c3b5e6a34a208b48742366cfd3db72b57a38fcf3eb085c4c38177a128e0ed9b583337e682945b049760aa5b83ccd0d7cb4118fbe3f7a54054a8fc1d71015 +DIST c2rust-bitfields-derive-0.18.0.crate 3617 BLAKE2B a38d622bc40e8bd87d908ab88403c4811decdbc7cb5c4807bb092875b42fe0c7218ab0acdeb61642099484f52d31e515d829d0753be01be01a000d151a10dca4 SHA512 71433c8d363b8ec14e567e764181086da19b0f751140166a665f8bb1bbbe3a42996ba2ece954a7c024052c668938b422778922a313babba7b4152b877027f28c +DIST caps-0.5.5.crate 17575 BLAKE2B 77d788f936eb36c2f4776ee719cdc138dac4b840ce632190f34ed26e705175209f9905c71d96d54f0c69f4c6d25f0a203a4d490f2034c330480bedd5ffab149e SHA512 866312aa0f3847dc2779570d1466aaae00945d78a2f5f3b05a833c67a2abd04c0380715f61dce79814845e4e57321adde67fea97f99dca56a970c6e6f80aa029 +DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8 +DIST castaway-0.2.2.crate 11091 BLAKE2B 3445e68aaf533caa1df958fb371622ef61c7778d515fd1efe39a12588e24fe07480738daba008e414a95e72af10d5ea29702425e5b91ebb277fe346ff74bc43b SHA512 dbce2a61a429eda7a8f21b4a35dced729267298be9793310afaff58843211a7177a9bb932a4bd9dfcedaaf1a2570b90261d4c1047c62474450ea835dcfc325a4 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880 +DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST chrono-0.4.37.crate 234441 BLAKE2B d1c10bcdf33324f1dbe9a79cd8c5a70b8223ca289753446aef778c93bf18863714ab2ade88f1e67432d1451b0d408065325a7d8dd3578211a0e39caae733ceee SHA512 46d77f291c7c60a25d0c06ebbd89935ef3ae1b736d504b8faf39aad8210a9fc68b45b5afb024763979f666308750b1a662afdabc36c59974567cadadfc17fcbf +DIST clap-4.4.18.crate 55269 BLAKE2B cb5d4b093bb7958d013b28ee25f9cbf0479ada392b81265834d75a5fa2e6a4a687f8d4a71520d5bdce05785a874ffaa09beb5707766d59e70928dab00bc122ad SHA512 1f151864b92dcfcc69a66c2a8aa8310ce28171895698d82e2e69e19a6b51ed8780e5eaa77410df9aae2d17c9b45117b913a4c23ef879106c1b7a96182656ebb9 +DIST clap-4.4.8.crate 54609 BLAKE2B a975094e91d9aa9ccde5e79d6b46fad451dd80a1765a116a3c94e3523bc0383e51a5ce7383021b10776654e1252eb08302d9a5761bca903b154e1a0a1f5164e5 SHA512 579cee9b0b582d23c3b78fffcbef4c33ce47a67f511276922daee838aa5ad26134ba81a454bfdfb72d7e23df69b78227f0b60e57d2ca7455402d37dbbf099dbc +DIST clap_builder-4.4.18.crate 163538 BLAKE2B 9991c1a8aba5feda466fc878f9415ad9b5922ea1835c17e1dd6c640234ee85e623bc556ba0e4edd84100a0879ae462028c74304465310d69f9d58e333c2ba8a3 SHA512 ff04ce8e700d8df4a0ae94e8341c3bcc1ebd415312e3b21d56e6beadf604aa5576641861506fa1c901a615a013e4f30bf8e6467889d637b34fa37ef22e2a15c2 +DIST clap_builder-4.4.8.crate 163164 BLAKE2B 1d7ea3e3bedbe44f8bfb80014bc8de1057749b3e94506a83c3da6e475a67e44911bcdc6f08c3af02fb908059a745dcc2268d03fbb58d010841a2bf41645356d4 SHA512 83a3a4c81bcfd769a787b4f91b29488e65cb3d4e9e5160ab7b7289e5860a7d4058aa08077b62b9e8d10e4c1cc7c949439b677444d94c8ae00a7bebb2e0e8af8b +DIST clap_complete-4.4.10.crate 37761 BLAKE2B 41364c37c96e82bfdbf0fde377512e894ff720542ded85fe49da4e305ebfdf39a2d511a48d6662c0ff2e3d191ea95c59704dbfe89e7531a969be42de9409e82c SHA512 d0f541bd167c9f755f149e5ab3171a4b5a9e4a37dba2de62ed51eeaa20691eb7602ef0061392cc7e4ca3594a0a69a7eeec75bf65f14e92fa6bc45285725c3f1b +DIST clap_complete-4.4.4.crate 37405 BLAKE2B fd43c668a29b8e8329f94153a5e5ce19e27437f60d88ea0a59573456c50a475e6dca659588d137909659a05b04ba5b4b412fd33d3daca20ee317a9890eadc8e8 SHA512 880b3022105d4ca68846e35e359a1613e177ce0be2b5f75b15bb3c4630bba93f8ebb4c7832205783f8bbe84dcd49d756468ac10c48d0e803d644a158f1163991 +DIST clap_derive-4.4.7.crate 29046 BLAKE2B 96ca919b8f9901b2e89c58ee8cf8bd3881ff715ac27999c03c867b317321e4839d9e923f68d411a05b45c34d54557af12b8a173f2445732fb6de16f30dad8e2b SHA512 4be40460468f7ce22906cdc9eea8d01bb07cb206d4ce0c3df2abd929d6925b175a49cf63907925ca16ae6297d6f4d933087fa5b35958e551117ec7ae050be167 +DIST clap_lex-0.6.0.crate 12272 BLAKE2B 22aa04997fffa15a2efc7013ae27fd223c3247cd31f8fe96aafb4e87e3224f075e887df10a95a2da80b468d4e16088ae9f171ba6551c0ae06d77bf3b8920ff9d SHA512 3651aa5e27ed35b6b75b1d25fd9c20c26a2a6039116e54d84c51469087732a4f0fd71754326456b367e341b017d03749e9a6774cb7b62250ca8745f5af46574e +DIST colorchoice-1.0.0.crate 6857 BLAKE2B a0818be1299717461ffc1bcfb6fc53a0b3b645aa8c45fb72e045cf2d876fa207948610e58d6a837aad24838ea9616e80b0558ca3eae03fdf9bc4c03a8e5ba52f SHA512 53363f2889cd8e8a3b3ed10c48356896c0daa72f3c12c9c7804707ab0dbc07c0e34ef52fa4f0fb1647311ce5913168c1bf62c2407ff86a33f765a9e6fccad551 +DIST comfy-table-7.1.0.crate 72879 BLAKE2B ff80ac3047eb28e331f04fe8df97105f87dc7b88de1a97effdc0daef94a9c9650c819a9f6b9d91e610bcd4e94c58377c8b087c4ea75849ef0288b87bf7d0b69d SHA512 f71b4f03e6ff088fec86aede0a891b4c002b9590444b3398adb6cf5865765976c95e3eb378f87e0a00feb2b16699a20165563fff77d99a68baef23096649a5e5 +DIST compact_str-0.7.1.crate 57246 BLAKE2B 2da5cfdc91d417294ca87ce834e8006d3426aff4cb22945e6744ace7d22c940f0181a75f25e6acc41efb5d83bf6ba4ee0876db3ce5cc05b9524a9868dcb8c7c9 SHA512 29ed591024f8f1b478722384664f5700fbde97b44af82fa32a8d1ccdedca9dc425555f9e5a4431a6c954d58cd90d60a25a9ed7f18773ede13edfc68094a23275 +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST core-foundation-sys-0.8.6.crate 37629 BLAKE2B 683d5a84b6a3816317f87359532a8339f08bb4043f1d70a8588636eb5dbe6ebb3843e2a12d9a7e5fd1637a912c52a5aefbb8d44796330b09593e7adefd3babd8 SHA512 24a8958cb16b081862a9000affb0147b8b3be1a664b834c3dbddbff03e709de3f4060ff4800e5a35453f4392ccf33168e8b864be71b17be38cb264a39b915100 +DIST crossbeam-0.8.2.crate 10502 BLAKE2B 487a7a5f197898ebea0fd41a413647db0fc3380790cfdfc6cb7cf3caef48197bb7c2498579ce676d3c5796480a8541ae37ae03f009d768a6157246b1f7d63a33 SHA512 bd2e54372595daeaddcaa26802780959465bd571cac64f23256b7ecc68ff5c0161a36740a51386ee54abe7c509ad1ff870b6f6877a7921f4335661f2c554c3a0 +DIST crossbeam-0.8.4.crate 10500 BLAKE2B 03212d9789a66c1eee7d1f4c7883eec1267089ab9d652ba5d7d59a22e04ab878e5defeccf8cff4587a34d976488ffa689bffde596588057d814b633ab3d67d1d SHA512 63650fe2d46ff2e593342b398c153facd3cb7cd72dac9b057ee0aac5ef5e9dd9df0e71536d66879676c0edaa89787d1f365eea35c82604ca46090e527749f994 +DIST crossbeam-channel-0.5.11.crate 90434 BLAKE2B 8666f039a0e4ac6f0f8be2d08ce3349d8ad4aa7d0f38c638dfa6dc6a7f30a1629e42f87757d9e054e836941dff6a8efa53b5337706bc5958d33dee61f38e7bcd SHA512 1d37bae1c946d402c1fce37f22a82037d68896770757aa91d209387f947d39c514df52e0ce94317141513784511ac626482f16099cc3b62ca28a52f387b69c71 +DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4 +DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672 +DIST crossbeam-deque-0.8.5.crate 21726 BLAKE2B d97b35e8e8858deaa7fa9a836e836d02914aad29e5c34ab121f52ed65e95213cb2574df82273277365889ea771f04eb40bb2439347c259979f1dd6d5e9853bcf SHA512 0f0c9745763ab156136227cf1415de514952a3f8282ffe413cc249f9f4b345b029940e6a6c87b3be8331a7c783655a35b89c7a2547360ea5ae10aa64ba7ae864 +DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde +DIST crossbeam-epoch-0.9.18.crate 46875 BLAKE2B 200c256cad6011a3a14c4664bea6b150fce72d561c4fffc387fa561b08c0480e8756bf51c14874c5fb19f427424547f72d2cd7dd6f56fb8b6666a85f8d52bfd1 SHA512 0a8a199b9d77f4e28e91fe0a0cbff7e0dec58cac283631fd972477fa912d2f6ddfddaed2c695e4978b01cb5440b702822af6333e7c3dfbcb9a2c2086999516b2 +DIST crossbeam-queue-0.3.11.crate 15581 BLAKE2B 91b9797f985af06c854c38b8124cb67864bdb47979d2e253928678118515fbc1257108c7102bad66e1f65fd6f324a93749dde86b4ea28f3bb5a16491f3f56ed2 SHA512 c6007307ef9d219889e6244805ae759998396e1d0548e3664ce9ab366ea78917dee75251c4265b0e3ef4ab15b5c6d42d6a5e9b286d17ad42ec169e7fcddb8ffe +DIST crossbeam-queue-0.3.8.crate 16731 BLAKE2B 80a8647bf491adc1a5dc736f662c01e77bcceb4bb2b876eaf684cb2a742a2f46d09e1221f6ca8b19340ddc9ed3a10bf07a08305a5bf069338d00873b1296ad96 SHA512 3c4e855184f8e2656305a59463f0170aab99f9c2df1001f54341b62e05e533864f384477a7a9cbc2b8b1a36bbe4b8076531c11b1492485029ef81ade6e7cbf8b +DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831 +DIST crossbeam-utils-0.8.19.crate 42328 BLAKE2B b2846f569555818fe7a3ef4aa29f68c638f933ee0251713c2c92624bee5f8013def5527027022963f572815991abb98d5e68d0fa00f478b2762133f84ffc84c0 SHA512 6e742fbb0d2a6371db87e81f8ac583259530a288237d0e8347394581c60004703a822318ec945936c410bb44001b115d8d986bb264e5b2d8091bb63a8edd93a9 +DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb +DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7 +DIST csv-1.3.0.crate 888212 BLAKE2B df05956223c50cde32f4ae6df922fbdedd8b50008a8898dd49bcc8bb7430d25727a03430c32ec23cc44ced043709de1f80f4d750e335bd12b22d0b06050881c6 SHA512 1b9e870c433e4d37e61cd604d2712c59ccd392cab55b8c88596a7094245072dcae02ecc80d3ee7cdaaa083ec2c2865b71712330c55e93715917a86106a2230ed +DIST csv-core-0.1.11.crate 25852 BLAKE2B 9f56cea786b5b35f6fd5c4f41fc3cc06d777f6d643d939ca7d57b1f1a24d4ee16ae3a4de629e484b0e4cf87009abf4911dc4d1bc199968ef5c7f4100cd238d1a SHA512 0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee +DIST darling-0.20.5.crate 27737 BLAKE2B f3b5dfcb8313e8eb74edbd49322d45ed814ef63df642b27c27c1e464c8db155b536fb6d53133f070f3edea749cf6f15d465908119cc1c30156a2acfd4b93d536 SHA512 394bccf43738ce63d7d0647e828f6606daa1d1b2be85ac2839fd5ed22450e93191c33e25bd32e61ab9b82a4546a3f84acc6b376cc0029b9a236db31a38923a5a +DIST darling_core-0.20.5.crate 61089 BLAKE2B 00dffe93c0bfd97c856f8f4e070c2cec02928389fed26b3680ed6505e1618688f76438c4ea85ed68ea01f8f574cde375fc7f227a6510361e1727510960fa0531 SHA512 9179e08ada4e4871242d3be176109c8c6a94e1ce2451ab18e553061b40f004d1d725c50eb7f91668a43a90b548a0ba6a2a05728ef631c857a53116ff7dec08b7 +DIST darling_macro-0.20.5.crate 1857 BLAKE2B 540369edd7ae25f16024008b0e6c8d0ee2d338cc1e28edfbfde1b72449e4f4b40dc6a8e12ac19851eadcf97e620bdfcb5e8877c6b05c190a4116728143f6d073 SHA512 ef8d3433d4020decd186f842a0c590b6c44778252afadda0a6dab840f874bb0d7aaabaf3bdfa28f66f19ee8108930b5605a7f733a516b9c0c53955f229c5d4cc +DIST data-encoding-2.5.0.crate 20632 BLAKE2B 16ea08dd12f09f2e6f8ba2910b3db07d4e7c9916e6a70d41420ef1a0e5393284b49787c47af0868bceb7f5d3f1fadf203f5a547dc8cb97713d5225dc9181fdef SHA512 b1de8bcfd7cfbfb988091fdb550eb98dfa5739ff58c4b789663e5db0d539c9acf145ccd72d87f7e1cdefd09d5771772d131d2b2e2589ac8f0bc6972c801ee0ae +DIST deranged-0.3.11.crate 18043 BLAKE2B 738d5a88732e227bb0e0d33c04ab8248a699c7c499100666ffcd78673d1f38ad2d740222ab405e3eaa7a0a6f4596cfef90bd581a1baf77c954dca830c22e74f9 SHA512 48485666d3e50eb7976e91bed36bddbaea80fac4ac664723130069bd7d17893b6d1a2b82a4c3dd61677162e4305ba5ea8aec7bc2793d1b8b92dd1666c204fc43 +DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf +DIST diff-0.1.13.crate 46216 BLAKE2B 27ceeafb7afd45eabbbe22d1f05667f513a6062762e6b77122e267282a8f2a0bf96384989508bf10c9e13af4856bc9f58f09b10055d6fc2c32681e288ffa9f9e SHA512 45e259c9fe7c23bd9e9454891b42d4aef6d681d35ee039d21fdb05ae9ed5856161a40f29889e7880ac2a2daf85f1b7d752d213b4a99a1a74ed2682c18a3ae7fb +DIST dns-lookup-2.0.4.crate 13733 BLAKE2B c28840a97de70192d337d078d0e04db5da0b0c01781bc245036dbd2931092c3e381a3792086fc0e84c6a1a0f92d0adf0366f41d4f48479a331a6de1e69af267c SHA512 4b2be29b927a8bc83e983b7caf24f3391dd1046b1d6b255e11edcc69338cec9d04fe5935bd01bed30fe2b551ed7f93585e92fac066e67479fe597acc6bdd87eb +DIST downcast-0.11.0.crate 5976 BLAKE2B 4ca0e66dbd8dbc86920d4184de8b37ab41954cb1560c7727334c990b97ad9544b098f7ce50759d10cac8b9cb955893805aed3bac5849c8b44a965e24d2ac7653 SHA512 11b037a09829e3e93eabff69f02b608725e6e348a191b1b6c8bb044b8d820a6ebf46eaea2f8bf5eb1c156f20d3e97be9b581e1b5fccebbfe76d94157d6bccd53 +DIST either-1.10.0.crate 18334 BLAKE2B ac5d81e0822132846e29f8959671b14ac6047330d54020ea7d4ad790ef985ecb4ddcb96ec7e327b1a66b9c89d37b112dae33c9ac35232c136f60ad9baab7d5a2 SHA512 2de38a37b7f3e61effa89648acadbf220eacfda1ca7c82fb77484e45577769b724f7dbaa297e73e3d355d6b1bd5109373c3e96e4c1a13a918176162b33ea2432 +DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c +DIST enum-as-inner-0.6.0.crate 12079 BLAKE2B fea251b187470b6204f686eede8d9d2fc3869a396d50051a45c72e3628b4d893a2393760afdbe14676cf505b1892ff67846226ffdc4a23f59a18b2cda1a2629c SHA512 c06e0bbc43068161a07a8b34bf1382311273cfc5390f3fb4c90b758d47cf49baf648f6bb277770a983942f7d2effd242bf1f6eaa4eab77e7f6f4fe9ef6ce188b +DIST equivalent-1.0.1.crate 6615 BLAKE2B 302d78069d9df05e78b53f0488a9e4eb98fa2bc1e21893dc8a0acf2234347ba7c4df4b9d6b380ae77d8ffb1074b9c790460fe2dae47318aa1c4fe4208244540a SHA512 b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 +DIST errno-0.3.7.crate 10712 BLAKE2B 1ac3a3084673791fc31e228ea3f49d334eea106f1bb6de3f9548882167d8982153e0d9cd9dbb4bde68fb9a12ea8eced99a4a128c507fe8a6ca90caf849cda1dd SHA512 ba4cd3919fefff84bd5ae473392ecdbaaec52ccaa9d1d93ae06ea5962523054d0fa1c5866787e36114a00d449a60df811a110f89c923a6acf7430d3668c2f54e +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a +DIST fixedbitset-0.4.2.crate 15954 BLAKE2B 91270883db5ad0e999ebbca1123d8729d3040eb936034ab8da3cda72a830e45fcb977b3fe3c2b94e870c1fbc366ee8602357bb77e8b9a40cc41a04afad1b266b SHA512 57c5d756b0a202b2506270f0d5e890f7617a1e0c015b6059ea23fab49cf7af47fd06927eb56feb03b37cb2b6c467e326b3f0da1e32cfcb6339cf11a130a3ccab +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST fragile-2.0.0.crate 14668 BLAKE2B 2e589b312d7409a1a550a676303b9b2adf2e28b0d4cd02c7fb22b48a88d1f88a04e55c4405078e2c43b13ccada890a33bcacfe179abd12236c23f219d275c4df SHA512 a48fee7c13ad800142a9ef1f355b2200b904ad9bf97b3601e310bad2b6ad90ea235b9704964c54be1d9c415c9c95fbc5f49e8ba5d7c6ee3488573f3404912608 +DIST futures-channel-0.3.29.crate 32432 BLAKE2B fa89fb7bb14e5d23e19636de6116fcad23668e320a4c75409ef232f83d473e3c6db89a44b640cae969a0a7210df6ad6e5f7886e284481e0c2a816ef01e0c3d93 SHA512 f04574f9e88b5d56570ae0aeab082c6c1e4382e1594d83646c1899416e7403bdd7537282bdb20146b5df4fe24b550dcf35c497af04c2210575413d6c8018dff0 +DIST futures-channel-0.3.30.crate 31736 BLAKE2B 57461dbb723fd53daa07b2fe6164125508cc3901e0138d2a60da5c814ade415a3611baa45c71487f1853812282ef358c132785ff40c630408e8544d57eee3483 SHA512 689531748821529c528772a6dd0f27362078ff5803d2e0b431ee5a0ecf8787b5a15262d65d52f48486ded46b88f7a9c477ad95cc2c5a3e8f5f9b9f53f367832c +DIST futures-core-0.3.29.crate 14808 BLAKE2B f1ebfc7c1c7a8a212ed7e6c5c72d973f7dafe8b4635c8d42070d6842bd4920fd39775195571dec2f6395c5002d8ac02af889581fdbf878a45e0eb27dc6c5f0b9 SHA512 ae10dc9c1473e4625bee4db902ab3833bb047bd159a40e4fc4cfdc3a266d1ab99e85aa3db4f8dd867e08926d8dc733760b3258884ab890db1fd69f1520715592 +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-io-0.3.29.crate 8908 BLAKE2B 909bd5dadadbf726dba3943dcec930c7409e20d8d324a52444f4145f5972e30ee4b1e48b7c2d9982fbea62ed5f3288e68e8920e99cf83d7cb81b9de1e8d81246 SHA512 869862f8728d94f0f0e71f9b24d0bd26b8bcafe70a80dd1dde4cefce73d91dc0cca80fb22e891f66024a77dcf28e8858e815bd436eb17d4c3119a7e68fefbaec +DIST futures-io-0.3.30.crate 8910 BLAKE2B c9af4290f45a9fd0839e107fbdfa4abff4f9077ff45b61054670419076f1c4508d7d560d4d86f8cd7ce146e436e531b9f5e0abfed2c4f2406c57be209cfdd498 SHA512 077acf5eab1101917b5b4b4b83347d30d533110d9a34c2de6db1411ffae0f0530f457033c5a5c14249119e89375c9f12127790b46e486dcd003a12a6fad48bc2 +DIST futures-sink-0.3.30.crate 7852 BLAKE2B dc768e4ec4c9f9dfb22a20c1c977401d859072b9222e6f77978332f495cbd0f764b175a679c9d7c77028d7b56cda5e2d86188ee979c7f323187defa6a0485ce3 SHA512 1c198da8f4118d9a9ab2b597e3f7b4e1ac7094dfa547bb81f3c4148c45216ef55b309255849174a517ebddba6c874283425f1df6e56e2ba5150af091bacf46a3 +DIST futures-task-0.3.29.crate 11853 BLAKE2B 050df023d7942207ea11cbe5e1cb5316a255763948b0c07d479828a3245ca34b82a71d1854ddbb13e01e853bd4ce424b319b2182346c36122d0246649390961e SHA512 6f8da7141899cceaa498c857a81c69330c093cf518e101dc53ee1e37123fae918536fcb1dde038e06c08f05c5f378a50970265a35229fb31c2377146cf94be39 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-util-0.3.29.crate 160207 BLAKE2B 2f545d3387d5ca21c13bc157eb219ef767b7b0c9957329f3ccf247e6402295f5384e01121a1e1ed062223568f6d7db13602b38878a280f19d26c26cf184508d7 SHA512 48fae22d9b5f38aa85b423ade3022dc693775aad5c3e6988d35e4d529b9395c0f35ceeb394492e0f3ec96719cc3f3fe4ed3811df045b840b63231921e42fd65a +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST getrandom-0.2.11.crate 35391 BLAKE2B cc3af20769f8effebcd6fe4f48bb762211f78cfad016b796ce4b6b83a25d0a758ecee4352af18ef97e84c17fb4efb0c7bf113b53d2dd30eaa32067fed97978fa SHA512 2230c219e1080b4b13f207bdfd54b1acff37d9e5fec5263ec9952df9c0279939b231c722b54524deab85002caf1047a471f3fba8090428d918e99d53edf82345 +DIST getrandom-0.2.12.crate 36163 BLAKE2B 0afef8504932ea0ea051cde1d14bd5b79edde68d6ebae6fe88fa4aaa532605a16f466d0d9c0d0aa619eaa105600b6d5ee4e191865a3fa041549a78f78ca82396 SHA512 dd97d7dae1a7ba653abdaf2db719e1a9c8eb721b08b4af0f1c45b1ed5079069d1b57e4f6d9d879e7fae3a890763f4b6aea9bc2d945392b98e811e7b348589bee +DIST gimli-0.28.1.crate 270497 BLAKE2B 4089e0f871295d464e548610ab5f0c2fd863825416109cf58ca827e482897f00eab23b795295758f1e3af16167b52c77c91df6f707f1f445984a6c4bcd68c6ef SHA512 695e46471fc07813dc4a47744458729b097f6efbfceeb57eb3db4165654e99bebb98dde2d73230b90bb5dd7c0ca0c6e77c7c3dc6f2abf70058b830a2fb386d25 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST heck-0.4.1.crate 11567 BLAKE2B 520aeea740cfa30b0cca12f73594ffa655f32959673b1c9caaca1ea0162e455546ae3033881394c0ba0516bcd5c9a997da02162e1585522d665813b9096eabd9 SHA512 8c80e959d2f10a2893f9a71994720f90747742bb5b61fc0a539eed3ea5679b140c48fd7f7690d7122cd6af5f7f20a19d412e3569fe741c6d31f6b2ce1e0b80e8 +DIST hermit-abi-0.3.3.crate 14253 BLAKE2B 9ed8b40a1cc894addcba2a45562d74359ba55156e2c3a547afce139324b1345df2f158f58978ccd7d343fac5e5d2cda86e2e0a9dafc77af36d4cd8aa0a6d4c03 SHA512 eb162d085e8e0db72571aca925fdb6094d1e5d091766dd62d6a116957459bfadc8d51f1acc67f4da3cf6a8802c0ff445f3ad2516c1df8fcdca0b751632e150a1 +DIST hermit-abi-0.3.5.crate 14437 BLAKE2B 62b2d2d7d2d5d63ee79d98d3604e79705b34c3e50a107e36f06d56783f7df22debba00b135c3d9cecdd5ecdde6bb5e1e052ab7e843dfd791dd9f8eedf931f96e SHA512 28256ece8ed613bb789a194ab44dd071e48c16ce9f8d4622f828b5ffb83fdee18cd7fa939b40987060a43d76d4b76b3b78cc1109ab15c75880517661b8843bc5 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST hex-literal-0.4.1.crate 8559 BLAKE2B ca88420383532a2f2c09e188bc0950cedf74e8335c1e5b3f640dc80607d57bab0aa6967a536a458d149a074f8bc1025a3de99a9081787e7ac80dd8308fa0e5e6 SHA512 8894e48485be7e1d7a16d2e061086c524b039a1be24a4c20126d3f175e12aa87d6d65ae295da6dea88f19708f3f3a051c3c3e334196c094ace68a249ad57fbb6 +DIST hickory-proto-0.24.0.crate 374416 BLAKE2B 9dcd982073ca2d4d7ed64c0b4a88ef206fcd739dd32d89cf6eaa6d24c71f0e2f24ac11361b1a1579214871af4cddc53b938af57ca322365f055ea1f8c8f939a0 SHA512 de27c186548baae47965f450aea53a140fa66b98285239411accc83c0f00f485dffa3a255e8402362e5fe3952a4fdc11f780782a876db46202930b84370017b4 +DIST hickory-resolver-0.24.0.crate 90666 BLAKE2B 367f71f8558f4ef7f376dff7e3b57bcf3f5dffa51aa61568511c886a2d81e45bffa2de0e9a98ccd67c3ea97ad560268f814a95c3fe3e022845abf206447931a2 SHA512 b3bbbb193d4c4e2e32f7a5d59f0c63bd808c31b840b814f771e483613feb70dd31aee17391206e99f6156431b64085edf6cf6d7d7f8bff5b931589ee2ad78c27 +DIST home-0.5.5.crate 8557 BLAKE2B b14225f6e967ccd37fa734f50991a50065047f3814c4e526f3b4605ceb9206d4d12e189b4033ab85792ffea34a30f2b0267b10b9b0ed88df52c37f6ae1ecea4d SHA512 4ba97149d8f70e9b6eefc930292c7e62fab6ad03d5e4e6bf93d40209d3a65e40932c6f3d14ca579ed19ba33195977c60fc52b3d3788629fc760f41ce90fa1e58 +DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 +DIST hostname-0.3.1.crate 9272 BLAKE2B cafcae4bbfadd51d058e3daba3e63d897bc3418723d8e843fd941d9663dbc89dba131c77d14ce7a5da552650ea3c40c4e418c88d465f1bab2fa20c178596852d SHA512 a90407996353c9bcf5b76be03713e3a0455ac80a50892e77a508744cf436a938ddb87ef97d8cc91ec7dc4353cfb7bca0fd28c90a72f8a9ecd4f29220d174edf2 +DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c +DIST iana-time-zone-0.1.58.crate 27020 BLAKE2B 3e62ae3876e181e6ce4be1ca2417363298c0b83fe7d66d1e1dcb5ec308e9342871306387ca0c5fb3aa7ebf8f16968094d4c7b4a497fb792171fd400fe23e6a50 SHA512 9e55f17e08f371c476394ac2db9b447ff7f2a5e37e2cd3e84ec3e2b77980bd9de7eb81e8618695367d708e69156628a2e4ed80c4b7343aa71ce0d75a41e24b75 +DIST iana-time-zone-0.1.60.crate 27074 BLAKE2B 6f534056e220e2f721fc7c7f3ed24152eea7f07d1f4cb3609ca734ade32a2d6b18fd0164ed831170cdff192cbe48653b2c4eb0903fb6f157292b3b5bf47299bb SHA512 5619b994d3277f56e65322a7903e4c5e03928a87bdb72831cbef88788aaf5573b8460abc0a4d5488c5df7052bb978531d973dd66002b0ec4a3af468928c9b722 +DIST iana-time-zone-haiku-0.1.2.crate 7185 BLAKE2B 37fa14b589ff092377b9271c414d4e584c5a531f13f70ac48df26df3cc03353db635b4630ba192fc65b800cce11823e91b91f03dfad85e4bed55aa18398156cb SHA512 448224ecafa935472ff6f0aab7cb71f9dabdbe71569c4b94fcc65baea925ef48841577687c9a31106a1826c2105e8dd73c748e9d27fd002648e5b0ce838af6b2 +DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9 +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.1.0.crate 68224 BLAKE2B 9d833570cbb63ecae138ca234b998bd0e5b11b1a7e3d5ef4a21212bb32d0998395f1fc609f66860bdbab198081687630f583f5a2e495fac1afa40ff48bee8a0f SHA512 9d303eef918b9264b9fe326cc1d71f4095f7ed5639ed8696efa3e9be65dff2c50ada4495409e109e7718997db51ae1fd865cf8e88978107d7823faba14380600 +DIST indexmap-2.2.6.crate 82420 BLAKE2B fac5cf6339dc3c0a40b100035a5c874cc7b2efeafeb31c51488d25156e392dc9db86a497e76eead351d2126f69d060422faa9c55d73407a0de9f5be18d234123 SHA512 53211c4a9003d751feb6dcdf1a76495764cbf32d24bbfe2be7023946622ef4f2b07a6de57109e5d24ee01892f4b2be0e0692e10cd31fd39c4ffdff4d37abe9ea +DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a +DIST ipconfig-0.3.2.crate 24468 BLAKE2B dbaedc8f4ec23fbbe48a8c79f16fa1575b8374f055237447d12eb009694067a82bd54b503f73f9520e9b731dbf2b7797ee2d6fe2c07ad3946146b32cdc68ad0e SHA512 6029a7d453db77bcf397580fd44c5c777ce6c288c251376cb591174e9fe0aa66b49925764050cc9bcb2d656a8f6c4af0cbcd6685b2ea4616c2d2cf8de9bd67bf +DIST ipnet-2.9.0.crate 27627 BLAKE2B e7e1c74815b965e9cec1cd37cc3dca76671168feb689620d44d5e635f3a5fa92a7276cb3022f25a9512ffbaaa11b0a8719cc1b838a7dacda71a5beb1a992ecc0 SHA512 8ce429ba2bae53cfdaf8a7d6bf980e10b9dd515446ef3ed4e4e11432043a18e09454260567419818f523bc589fc367194bc345660f2cc808d281db235d3e0b54 +DIST ipnetwork-0.18.0.crate 15515 BLAKE2B b3c67fbf16575a865c8f2156695d1e9d156c877c6974aaccdeb643f3f94654a1df0c00dabf512da09275c17462d18916b645139e00c11fe9542a489d802576ab SHA512 f5898e31c40937ee9789531c6e0c695dc9d50e32019c8f411f27aebedb70f2b22b8e48844d34583b4425adb4a77b0029f28f7a941142cb0a2231b7aa8a7525c3 +DIST ipnetwork-0.20.0.crate 16556 BLAKE2B f6da9b2283241101279ba510c641a287107b2c27ebfc425af183ca342e4c049915aae2a2107bcd7e8349a47e07ca1dae118194acb71b7b756a36f498a6c67f8b SHA512 a8746f25abb73820cdbaf758f537c726bc9f48afa82417361d54c41bf3b86077e5901135ac5e305e2f669f093690ca518c811c89793d107b3deb139861462978 +DIST itertools-0.11.0.crate 125074 BLAKE2B 8e686f176764e92e4da3697eb781e1bc30d6c57ac61d97343b4fc3a48e4febf669d5771fa8620005c620cce52c236760ee2e1bc344cf602e878bc168a2e69cab SHA512 8ece00ba0a7cf481ad4586da24385a6f0b1719b9c3f0c25b9b5b373dd1a0ca7b9687a77cd179853392890b7bf4d31e0356a4e5fd540465b4ac62bd74ef717fd8 +DIST itertools-0.12.0.crate 133620 BLAKE2B 73c09adab9b9a621b556d0e9ca0deb9967f25f5f7cd082a65208ada2639e8154704d1df4be06505c8a6697c51b438781ce9921f70ae826a80597d5a682b99c99 SHA512 8f4c1239aa185ba21740dfda7a0c7cd47d62430db21724acdd580a8cd62df6c0adbb11fb8ffa691acd5f1b20a143d57dbf7e30d9596c38a07b5a4b3405e31ce0 +DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114cd81a4d53a10cffe08e13f0d3cf4525a5ef43368fe979d5a3ce230872eaf993f7065885531aeb5a6479351857708 SHA512 0d9c1849dcc0ddf7555b0aeb7e4f2ef3b101cfc6f03310ce1b6072d70ac8c8d3387ef4c726146102012e75171e0b0bf13465704b6edfc02752e349dc6af7cf68 +DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.65.crate 80725 BLAKE2B 9abf4a2e9678b2b2e6648f07ea879ac372a20b4ec34a271b93dea1ed57d25c8fefb6c9a2cad93b4c8d008987d98bd9c50a45614419fbde11659e5515261ccc69 SHA512 ffc14e62a936a93eb6b71317a0d00529dc9b3d45994aeaa79fc21b5fad93a6a02da52e1dbb5fbc439da66f693e8a04b39c8a03381494d355443a425412ced267 +DIST js-sys-0.3.68.crate 80764 BLAKE2B 961f58c181f060af37c00e99f55906140a4c8f1729847d6dd7da7e29b715d69ff822853dc6affb185195347e3d3bfeed392b8969c9d15a5ee28e9f01febbc148 SHA512 9b1b59f1688f95f9bd5031f68c18c0bbb8c16519c7b09aa3042e08e57921a3807d86f15407bb4d9d63c49747ac4847aa963f83373fd0d778a7e7962ea6551b6b +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.150.crate 719359 BLAKE2B d08e17fb29992c76337bb5862cbc1cdaf7b9d7749cd65021f145fcf49fa7954d6251c8c2f3c9a796b46283c3bc014bccfd259ea52824459841911ad847fd7f5a SHA512 7ae8fe6a1db38ac6d951c0b4880d25a02f064f5e61d6057c20f7208dec8395d58efd085e41857bcf5f4da2b014d2952dc4ddaf18ac4acd3a23675bb659e70385 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab +DIST linked-hash-map-0.5.6.crate 15049 BLAKE2B 0f30e388633c60433dcbee353507f1c6857bd210f0b61a4d166a9b95067bdadaebe49d5fca4fa6ce13072e26037c6f75d46cc30cf8dc3c9cfcb3f33b33630093 SHA512 031a87645381c96beff33572e4bac1a9877e52fd2f99d39918fbede17d72291b35e2eb69e07edec20c3058554c35cc38fe85b8f175c2a3c69366136fcc71f707 +DIST linux-raw-sys-0.4.11.crate 1413981 BLAKE2B 45172cc348e758bf87831b47d2d52ea43e781a738a59654dffc04cd5f1726efdd8d1e2376cdc247019b64d82d756f4739815422c353f54f081a2c539df02b5f4 SHA512 befe18ab06e5248ee89f0cb8fbc192a5564c15c9873672fea62754322d3c197563d9133b839d5222e6baa522ec1fafc48176ee605ec7954c5d93e52dfb6d9772 +DIST linux-raw-sys-0.4.13.crate 1493855 BLAKE2B 1298a038276e2424eda9873c642fb43d864b343b03b7962446122d2dbea94d58d9fb2b93e890769e6fe4092378755413ed6afba81ce56fd61e512146e44148a3 SHA512 3918da6b667a08ef8a51aa0b087129e2dc5ab101669cbba7690fc98ae2659a36861bf9410a3b87d18522a7549d43ac169b995ea192d3073f7249305a809cac62 +DIST lock_api-0.4.11.crate 27487 BLAKE2B 87116cf908f7f1f9c300cedded989df305f855883e3df5a482de2c76814c48739582d3079d76a2bdd14a6999204b7fd31dcd8fd06d1dc7f9418f0e2f70a1450e SHA512 9946adf313a5c67a0dd87a1b679b7d9d16a86149fb95974d3f28aa57a9a1a3932e4a5ee1d332097559329c5e3b2295be2e4b655b115d9f75269f33a758b17fb3 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST lru-0.12.1.crate 14583 BLAKE2B 4fdaa9c2a8773f474d45d26ec1c4d4c82719ae531ccd4082affb64bdacc40e6414cf16e40158604868331c593c47ac4c20955ac27f66c71b8b26f982bbcaf4b5 SHA512 3e66e8967d1c35bee0a5fa17863cb9f987ccbaab3cace4cf618e7be4e8503a0dabfefdee040e0aa53c0dee3307faba550b46eafa42ffa20bb3cd0473ecbe94e2 +DIST lru-0.12.2.crate 14826 BLAKE2B 67c2defae452e05c91a8f5af70ef7c07856112f81603a3f5df5d1f45c1a48d0295355b1d1f69b172b571ac54763a9990b8abe46bec49cf22d9404af0efa074ee SHA512 b4df8c6b090d5399dba0270f229d633f872caae91861356743db3b66b1c98c89683a130c56489dc9f38b1ac8d703fe4f15a085b71687ce8425a5370fca748c6f +DIST lru-cache-0.1.2.crate 9307 BLAKE2B 606072bc5390a13cf24b4c64c77ba7f84c4c2b1a73c4abe8ead4e1d19067b063888d5cbe478dc9108d193f0a66aa5fb2ddc073f3edfac466de34f85a52a15ef2 SHA512 ecc67b4b2ed8d3596816c47e9c6aa242c7bdd1ee8087646e90c27a60d59175f661ec3ef82058c196bef2abdd302d429b7ea4279169689254a9f322dfd5697bf1 +DIST match_cfg-0.1.0.crate 7153 BLAKE2B d3f40e5b16761fed337ed18dfa9db9e46aa2ad84ca8cfdc7cf7c72bea7cff8d084d95214ce013b3515bbe5b1ad4b8527bfce692569551e4588fe6f396a8a96ee SHA512 fd36f2b128d70a0f278e708bcb3274d90380229f754aed7ce9b808138b0189d5e1a07e0ba732216f788a530cecddcdd980559b3f71efa371d8805a213ff8f2d6 +DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19 +DIST maxminddb-0.23.0.crate 19350 BLAKE2B 56dc030f29a245919c225eb25d9d62d4666bc5a834f9ab402cf73e27bda8b8d71e8ddc8c6102bff80377eca27eeb2ed47f0b313349b694070d8fecc44b9ab02f SHA512 28251e78cf0129a800718186a99b3f6686d7c7681d7a40aaa447bc48114307bb3c0cb33a271fcd5d1604b1e5476e5cd942229a10c98a7c8528919e0647ce768f +DIST maxminddb-0.24.0.crate 20232 BLAKE2B d2f688399c81b047fdab1c0b87bbc2448f46f5a7c53ad365c8f8e1af3dbd5dd931c78661e6585feacd99ca9cc87646f1f95805c1dfeebbc5d185a7f632d837ba SHA512 bde9daab1e103c4c2990d103e65a05be68572c49e6b994a4326ab46e7d11de77a0f5291258fabd0daa6893964e9079d403ed3557c4c1cec3b1ad4b730f9ba358 +DIST memchr-2.6.4.crate 94439 BLAKE2B d1136f7105a33565214fdeecdc5a95e74d7fc7cf45997f81bf3cf389f3015fa561ab326433ddcff2db0b7259246eb6d26fc7b4e3c90c3af8b9b7ed7e8ec56ba0 SHA512 1065a67e04ec9210c70e430288e0a8d39f36ce6414722099553e99112ea2f8f710eae44bf39f8775b9850e6c8a50e634a1b1b084a8eb4f6b2eae6697dcf5b5f4 +DIST memchr-2.7.1.crate 96307 BLAKE2B f1a008fbdbfe84852a8ae1d9d9574306b1bf120dd5087903adbcca6af342c9abbb296496eb9bf6cb58915c4444b3edd6ca4e27131ac7d8aed8849815df87a944 SHA512 5120496faa31fc427c8b4178461a262b3a34d70eddb7ad17a19d6db8b9969c9e113d3625b5e6dc677087fc80907377b00ba0421aba9a92cf73ca2849d932f473 +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST miniz_oxide-0.7.2.crate 55731 BLAKE2B e3cbf5983025bee879b8a735fa2912db8975cb60f0499498a73ce4375e7d452c9ed62d4b0b6f6a4fa591aab55e5d7ff20033baa007fd6c839b9d74b31142c0b1 SHA512 2f8f09d7afdb9d78bfc80a228ded85a215fea05e577e907921f1808f84aae30ab118048d7b53295f11aeb5de70ab6cbdec892f3a2417bedf6f53a4576d095432 +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 +DIST mio-0.8.9.crate 102227 BLAKE2B d21e886817c57adf6ff255c26c82f6a7eda3a036a78b75f676710307e9fe338756c87a290a9dc42dd536e4c9bec680589424d6d199db7e2bc2498b5634abd30a SHA512 a078b1db6140d77452c24647aa91ec6563d00bc3516fb44c34b79797fdc953493cf844f1ab84d226582e9d61c383f4a743fd93853d71e362fb9dfc8dc6529808 +DIST mockall-0.12.1.crate 22845 BLAKE2B b2299c6060b609732b041c66f58437e1a52228016ecef33f9d2d6a9e017b86f35079ef69ec7bf511d4fdec309c60bb4dd9cb2570c7a3e079a37366c5c1a0877f SHA512 8681eb1b1ae2fa00bd2b73269a0b493361d0003da4080da79ff047692c75c34359621923b06906046218acddecb1fd49186fb7b4e752c70657dc9becb8f20c6f +DIST mockall_derive-0.12.1.crate 45330 BLAKE2B 6593becbb7eb3393a8f05ca4d5d6fa8ed9d0ff00c1b53a218b39889a6f8e14259e29334f36b0fa926610296d5f46f17e627284cecf8dcd3689334d589078b394 SHA512 5a99f5f9cc0bb1383edc3d2eebfabbe520436154e39cc4a4556f03826493ba888a54127f40ec70df66cf9c83262cecae3ffab03de9cbdac2716c431e7ccd39b5 +DIST nix-0.27.1.crate 286494 BLAKE2B 63fbe347360ad4b7a86f30bf2f1b27ff1ec581145a90c34160f4d143e9c297a34a2ee72e9de3a48bd3418657fbc9bafd09b704ec15a42b16b3a4187d5304ce77 SHA512 7b35a0f87427eb1b5e1480d7daedafea4609b7f3a4fcf48ca99bdbc2f150865996539f2c51c7ae6a6a13169614681fc838efb306994b020d44b45735a7380010 +DIST nix-0.28.0.crate 311086 BLAKE2B a07023566f04896fdb3ef8b2a1ae8dd64adaa5eb48217c58588e1b41733642e03e0637350c0ee83ac47e663c02b24d5668be751f8d199aa773de6df8b2213894 SHA512 73c0c94b360f4fc81ff07a13692b2a5b5ceda3a7203bdf1e526facabd36cdf160f0ae8fa479e31a4e4237c09bde11e9bf821aa496311cac8614f9c5626f8d69a +DIST nu-ansi-term-0.46.0.crate 24311 BLAKE2B d2e678e0eab5ad48534e686b1a4af344996d1b07a0fa40839072df3061bd7e5bc9341363403ea3ef8d19c7725ba3b7a8ed540c63e2209123b1b93f69418288b6 SHA512 b4f37786dc85e0596e2b7b261a5a9fe0265bf1651c39efb358dd649b926b12c3093f307b98bf0c4df3899f0a7cb1854f2596bd5c3e22fbbef42f912ab2eb5043 +DIST num-conv-0.1.0.crate 7444 BLAKE2B 4f5c4695006aa3ae77aaf5c55999a07d8ddfab294584fe10d73eb6abbb3f551846646156581599f966a28c74d80d3ac4373c49d2099991f7ed9edb56d36feec4 SHA512 7884c0c6599c66e40b9a79435e1bbcec60aa7e68b59686922dfab19ccbcac6a6e54f208cfb3d5a8a12e86e4dd67e09977d60b69ef6940e308a28256733f36100 +DIST num-traits-0.2.17.crate 50190 BLAKE2B a549ef00c749dc7f276c4817477d1f9dab70cba01b6a3afa5743f16f16353bc50d992d7446a54859cf750a410d66c8cd3440708a6b91fd89d3b8889f8fff1668 SHA512 4d47d3e2f5a31019e038e609897cb0cef1ba061b35cee7e2a02e65179dcdd4960bd5b9bc759b5c013d699b3fbd9b014940a15e36658f7d4fd12cb0c7841c5b4e +DIST num-traits-0.2.18.crate 51930 BLAKE2B 6c40e155d7a52267a7183d8030ef34245492d33f103cc24551b10da3eaa18e3db485062ff87057dc23e6b55e381e5c5d2a2633aaf6f4763c06677a0a0c524f02 SHA512 e395ad9f3b21b0dd1d3a94cefe0d68a42d1b1d429ddb2823696f9cd75042568a635d93d133ddb9497ed357e5b3be5caddb8e4a4af87b65882bbdc60b05c74ebc +DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d +DIST object-0.32.1.crate 275463 BLAKE2B df88d37427c2741931ab0ef24a482755168c7348ccc280f8264e94e5f8548c608799868e0bc5984632ee02aa84313fc5e222b7cd7ebc6829729ea49544f13416 SHA512 5bfd3b8960fd80bb48691fdef35d7a9fc3d752a1cf5f29cb4e146a17d427e878d972d208e8aefe5015b3c62d065ed9a66f2f9f790b4743d1a4a3f9c0b8e581e3 +DIST object-0.32.2.crate 286994 BLAKE2B b9085200fe0107ab0f8ddd5c5ac82bc681dc6266c6503e4a803ae4dbdec775ae84ca4a736754b770d858ebb058342af45d485d4c9a41f57966ca1466de40a4c5 SHA512 5d03d998f06dc592c3be141f7163bd72a0e73396f95d22ef1e0ffbfc66489bf727a6f6fb813a32739609b619b8e34a471974b2231dcfa23df8bff52007c25a96 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532 +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +DIST parking_lot_core-0.9.9.crate 32445 BLAKE2B 811d8de671bf6e0911cf0df7dcaee4fb03a3b223173a3bb8cee65a28724eeb7bac87f62aa7b1df5ea3fc93af3cee3ef30b83d06c6773d6b856a7e6fa5fa197ea SHA512 7f0df70f9f1ca8d3da0b9dcc96e49daf05d95c3a995289266b5333f68818d686d32b0c733dfe3a0f62da78fa45caa843a963923b2d0c80899c33413dc749c032 +DIST paste-1.0.14.crate 18157 BLAKE2B 35e8548611c51ee75f4d04926149e5e54870d7073d9b635d550a6fa0f85891f57f326bdbcff3dd8618cf40f8e08cf903ef87d9c034d5921d8b91e1db842cdd7c SHA512 3a793f0e5e773a7f7defc798a4c17ae9a40d715144632ea6cb0a8c785e14c4212046491df016bb9838281f8eaf327a79f01c1e2ac5f26785c028bc880faff9ee +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST petgraph-0.6.4.crate 185895 BLAKE2B 9ddfb2796c461d2820db8227753113b02024e5dcb694a0bb2826bc1f375f028d8b98a3bd67555485db7fab88eb86043f5b768585dbe0c60703cc655976030a2c SHA512 b5a21572526387af3151dd4f864bd95c94f65eaf0612d96f99926faf646214df205bcc652b98d3b281f2e270779a4c1fdd6a32614ed60b3612e5d594b2bf3f20 +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST powerfmt-0.2.0.crate 15165 BLAKE2B a3e1ce63f5866f75526eeb749bec6607e42cb495bbb953082cde7e98e6aa429ecaa41889d98ff7ed4cf5031258b4f7e0553ff8fc435b3b6f8b4ef2b6d53d9b61 SHA512 0623f92e4d6ab284b3f6dae58220d79d9185df4a738999d68040c50d72fe0380d70358cb622f079c629bab53bb03c6e085e165d5bddfbeea84245864fed90029 +DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST predicates-3.1.0.crate 23090 BLAKE2B 6c51fa390f3335501df604afda47ff1d2a69322d928a1412bcc4829f16c3ff5d345ae52f54d797c9698b0eb7b26495e594d8c21f04fdd77c8119ad4635184adb SHA512 1ee38c715b4b55038497a4a4996e12de91d356d53173d3a034d6a1f56859cb3a4a61a82d016fbefdd6ff291519097ce9cef950547d3d437035cd7093d965dbf0 +DIST predicates-core-1.0.6.crate 8084 BLAKE2B 337cbb155bc2859c5a8b891c21d352e998cd1eaaf606cf46c003c9c499a42f12268b071e7a4cca65d50cdfdfd4267f023076e078a0a3eb401ad836755d65298e SHA512 afeb1de4275c76bb1c5950f42bce2f83a21ab217ec60130336286cb48b15f36bf2a1ca346bd652c10a65a1f9e3310d16b23b8333a3e0f7e20fe874c3f728e702 +DIST predicates-tree-1.0.9.crate 7960 BLAKE2B b758c52dcdd0ea237ce25f0a092200604765bc83c5edcaea646c6b1db49431296b61aebddea3b325e62f0ba9bbd5edba7ec92fd031cb597e7e8d642b966b401a SHA512 1fd5d9a84ca8fdd1b3c4759d5e6fb16e3d8fe8b0dfe5afbd16bb509c8558b0750705fff47701c95f7a8df1a222f639116a1b9ba4d89775bf03b06daf34f249a3 +DIST pretty_assertions-1.4.0.crate 78846 BLAKE2B 68583c49f81ab0cf5b90f6de10ef3aae9b525288fec25f9d006f2eed0877c0fa742dad5f878fc78233b54c0cd32dda7ac1f7161bfb475288d8858e8e40aa9e1f SHA512 f76d38c787e91b3739272e3bebeb9763d312b85a43cda5e1311ba8d6b0e4da1ef25bd66208e772b1cf56a34553ee560482b5ad19c5290608b2aaf9c0d0f0e995 +DIST proc-macro2-1.0.70.crate 44343 BLAKE2B fff0dec06b21e391783cc136790238acb783780eaedcf14875a350e7ceb46fdc100c8b9e3f09fb7f4c2196c25d4c6b61e574c0dad762d94533b628faab68cf5c SHA512 ae9366856853f7d96caf7a7581843d36bfc7843f8683897b19ffc666c03b0b1eff502ddb18ca4c1c1a239a368f03f6cc258b0e2795f64b61c6a31404462eec5f +DIST proc-macro2-1.0.78.crate 47158 BLAKE2B c56a24fce3faca9e04db7965cab552d2a976c3764df0a84179b5a89d1230ab355c777a82b4c982e3945414f1f0478473a88821dd176c32d6de394d73a26adb9a SHA512 11956fe03a2e77a925cdff2c3c8bc8804dffab4fa1de963a128fa23f4189976fd2e2102bd346b92c33524beae320b71dadaa5213695a3ec638404196e14fa769 +DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 +DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 +DIST ratatui-0.24.0.crate 305082 BLAKE2B bac968363aadfb24f8c66960fe67241f6f20505a966b4432e859797ed13ace924825678caef12fa768e1a7bd56a6c4ebf29a5c163ce2ba3be92628d8f189492a SHA512 cac2e17a1a8b8c5a873fb3eb2812871715e83caf1437db5be0fc94078bad18e645c8b68b146c2ca470dbdd3eb58d1533af870f8f0ebf55703563db8bdf44bc12 +DIST ratatui-0.26.1.crate 443050 BLAKE2B de2ed7a7d08582c40ebbc1c5f43332fb617ddacb91adccefd2de16c1f7d675a72d4230c1fd7c3d3519c5d19a60202b5ece188072045687722f46eaf08b5f5b42 SHA512 999cff05fdcc0971abb8ade14dee69be910032ba214ce3ea8c7b2bdc79591f396aff1bc146083b4dd5af44bbf960887f3416faf789921b960d5bb98dff508539 +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-1.10.3.crate 253101 BLAKE2B 390ebb00bf5430048412883b672d80737e783fd36f40895343cb38ef2e26e2713418c2fb4d66792bfd3be4c990b4518ba120de229a72cbeb7fd5c2af325fbcaf SHA512 d090898465013b0975a6de87fbdcdf76b4896578056f4da83424bd5e7832547a3d8ace643c379c4f14700a0a88dc95950a38645508d1675306c377879a90cf5d +DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST resolv-conf-0.7.0.crate 17352 BLAKE2B 32b565a11d5d752e2cce2ac7b44e483b8a682220c99a9ca34d0a440d87cb5a874c407d474e47757f128bc5d78ea57940452eb099ea6fa433d8f6d1fe881f4302 SHA512 538b97f88fee8b82f15845f9a596e09757e3c2869c4e8708ddff97e19348e9f88d4bcf75e810d2aee47113fa64d550a9fe2deac6fc38d95242ebc20228e9b5f4 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustix-0.38.25.crate 362735 BLAKE2B 8d368458850d031d63c76c75e716d8e580a763fa365aaf3f065de7f6f28fa314cd57c558286b0322438b9a8fe5475ebc709b02dc804862e02ebf02ad8fd2f30b SHA512 f14d3112f82e254ee01059a845062e305b5386b84e2de14fd89443606b37c5640322258cac91dda3be79b11cd72de60557515649ee266bfe7a796a284afe6a11 +DIST rustix-0.38.31.crate 375443 BLAKE2B 9e8ba6bb4eb4fdf0bacfbc719124f745f383abbabfeb161bff9908d1948942d358f46191377b90c180a2793a88bb01be20dab556cfabc8da8efa2533af8e460b SHA512 593e0395a7bc5bba949e6f2a5ed9e39ae13140970a598def32ab7d6d91b4ec100752fb05abda407ee2e5e420d950b19e607f963f3974213637423c751df75960 +DIST rustversion-1.0.14.crate 17261 BLAKE2B db30d01914059a893bdb4c448ed0bf04852085c2d948bfbed8819a1d2317c34133cf609abdd806ad628b86974a9c1ab9d09f79743cb8e13257ef32cd444f49c6 SHA512 466d753c28c4899ab3da3e9f3366f7ecc435d484f51e0c07acfa5f3367af0de27ea3bc75efda22159b4990c976b1466a27e7c31c834c72a87d8234318357454b +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST ryu-1.0.16.crate 47351 BLAKE2B 13c72ec8aa608f6c53cf27c95d06b90839c5bec5e54b0441e9c4f779af3dece30d01a2276c717a733f92406a5a02b09c045b2b5f92714fe492d7263b6c6808e6 SHA512 89e3e18346ae6e4035787766f286a6eb62f5294e39ad902cc29e95c53781c4e5dd629f567f22ecc7e9fe9d1c273323da9b867aadc9cd8a066727c58330b51b10 +DIST scopeguard-1.2.0.crate 11619 BLAKE2B 8b7e9ed6cefef9ee55407fb9690d57a2a98bb93e5105aeebdb475a52485e9e185255249e1dce8f83cd80534e7402d485aac3efa7e8493b13135de27550cd4bc4 SHA512 6247719a15fe1e4e2d179127b9a934bd2f99367724f41175ed9522f58824b6bc69b35002eae66b35880375ff61d77ac43ddaa78cbde7160a35183a1da32d3fbb +DIST serde-1.0.193.crate 76863 BLAKE2B 163097e85b5542451896d7381607aa297e3b0342a2641887a01689b13122c6c1ca566fcb7f32f51bb0ecc861aed014f1467edfe21338223d5361555f870425a3 SHA512 82259ca302f42116ecffca3c88bc1212785ce5430f9d29390a9041d4e5943c13b13de119fde644a583960102c4b6e850a16f962d36dc76ac69fc2297ed65a506 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.193.crate 55692 BLAKE2B eeb2a2fbcd0daf5fee1bd6a4f584fed330db58cbd786073311d6a94308c63dfc6b7c2dfbc4b8980064ed66509f0127525b79d99aa96ca0134226fe21715999bb SHA512 05efb144aeee293a0e7dc7540106eb8c4920b2d8dfc25771d73afa8ffcba330104643430a6e396ea2adabbed4ccb23591251479b75449b9c8322799f91d38c41 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.108.crate 146476 BLAKE2B 9c0ceae5566a4e0ce7a6264939862f9dd920bb47d18acebb179798b036c376d97a4e9b0717092903ab90cfbf6fb73d37518e3cc25f3217af010296f5644de396 SHA512 7d8d1b74515388d99983ffbc5696cba022305cf4c797d3ff5d2959fc8fc8f4ce01cc4c9e7ccae7097b06b5acf5307027f6b7315df1fd8f58e681cc5968e79fb6 +DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22 +DIST serde_spanned-0.6.4.crate 7756 BLAKE2B 58b8bfa3b39368f4bec795bf1bf1b0e19554efa9cbf44a8f5deaef79c926c8cafb4eabd6230b56acd77c75b924b8642a141e3f7827a5fea16633edb764b54124 SHA512 10a71df5cf84abd5c658de0321a4813ce582735fa5cc349694d979acd8c8228fcf69b3c65bba803d706089b49b053c15a8b1c4fc4c19a586596b8cc58cc2ce04 +DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354 +DIST serde_with-3.7.0.crate 140905 BLAKE2B fa749055ab1b1f271d46f68a169b18c7e670640e937002ee6f59814c4ed7a7dcee13340ec4a4bc116c57224472f919dad85ac64270441987d3cb0110162d6b05 SHA512 a923993d3ebf1543de6f73e264f436849de6d9a292668ca5508e20c1231b78105307f62140d06bd401fa7001d83a46b56a14f3ad95a2360a55e276ec7b94e142 +DIST serde_with_macros-3.7.0.crate 30834 BLAKE2B 2da5db01fbbbc9e3ad94531c4947bab966e7284c3867f1bb2520cfad23f5a7f5dabe58b821ecfd8bd1f89041e57ee388910636479faea2506fad232c5c7aeafe SHA512 43d666624e6216de285aa3ff8435bc01bfacb675544f63922d1113c4d1a37e8556c61d19807558e002aa05888f8a5d19e7ff8b339b50c4b9c54f0a2cdfc4e9b0 +DIST serde_yaml-0.9.33.crate 65165 BLAKE2B d72edc6e5fe569d20bd909d079d3f8a3db0aa85bf016eeee755923c5f4dcb4dbf896cc6c15920d9b2c1ccde909a6d8733b63843dd2f8149ce34ef4a09889dee1 SHA512 cd41feeabc886b1f02a240d1234f31ea0a67b787e9888e5d8d4397dd5bd389cb5c920bc6dc72f44c5b25e1cb4434e410d8c0b01559f1338e8b1a3f90505f6e02 +DIST sharded-slab-0.1.7.crate 58227 BLAKE2B 9b4c4e4849ed324cf48c2b905f21139d1d65aa5ab13e7fb11817cac9a32ad09f8dbb1e50a93d40cafa0aba872792bc92f7bd2e219f62f80695409e949c07978b SHA512 3be7438d4a75debb14463477f34de6db1ac38abe958ada5d5dae7ae8d5993e245da69fcb989d91aaaffda5f2b085d4bcc88d10e07ec567b7f40a21437de6d4cb +DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298 +DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08 +DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1 +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST smallvec-1.11.2.crate 34801 BLAKE2B 58645e99db8f02db64d02c75860c7ea41836c427c03ee3b0b23365e73a406e4fd6ac312bf13fc5faef8bb6111c10fcfd5f839d5b3686e9b34d1626f8469fc327 SHA512 5cfb427c3b99b0dbd71f6154ed899abcde9d7d2992977ac7b2ef3a4c3ff51e4efafd133071a69609b4ed6cb269bdc26b79eb72e1988f10dfcaef8185d950cd1d +DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d +DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST socket2-0.5.6.crate 55270 BLAKE2B 10eb32486b9a2908e05ab24620ad7a79243e59c2c2db5a7793f87f32765745b21746423d5b3896ef37d3dc9e76410fba97826cc64cafb7dd45adb485900c2282 SHA512 10f14ce7bcb9fabac56f98bd34ccd6368dcf4ca245ba2df80fe0f1157e177056eeffc6fcfb1d1fea6e89c0eaafb99d8056fbd10101031d3ccabb98950ec563dc +DIST stability-0.1.1.crate 4753 BLAKE2B 67599628835f9e8d27f10cefd44eb306a57b5cc8807a9e2f63e918664fde5a7e45f678736aebe3899474176b80e825d172ac30f88ef549b7e0c347a43428c55d SHA512 6e993b5ee74a4557c8d828d6ed6c1ec0dccd16878e3f36db07d8b8051d6d9cd8e9cf6c717d22c2f431954c31053c2ca21829988b090bc4ae6d6932c5c3243bcf +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST strum-0.25.0.crate 5539 BLAKE2B 9c031e5ce19e2ecaa63e63118197c740ae9295b8881f6280ad92847b99fca6fb08b0d395ab1b2a66e25c8374cd18866d8436540538e3c0f1f047fd2235971b40 SHA512 a3522df79547e94518f25a0e29248f67f1d7e2586a7a424d7d996cb6bfe5d98fcc4fc44da7ddcd4e35a1127b2816bee55107f30cb2a559f5b9bbb1346139544a +DIST strum-0.26.2.crate 7189 BLAKE2B 7582fe304551e98b121d3a386af22bc022d7d11323b81ed9c2d600c8d2496077c09bdc8dfd78a636c18b9f522808b2ea54cf8b669419b0c89fcb6b232eade617 SHA512 819cfddb3028d5267842cdeaf17d37569eb18c957cb78a055b25d9ee1b8461026dab9bd980da4a89ac7b2858ff22880e40b46a72d7695a5135b84c4b7e5026f3 +DIST strum_macros-0.25.3.crate 22570 BLAKE2B 511af0d1f0f76df7ad1528c79987b6e09390bfb33e1c34078fb5450171aca7f169afb83fa2f2338a861ded6842c8535ea6e4cdb0d31f341edab0a06d7eeac16c SHA512 e6ebc00943d9f88104815a5bd6a302a391a06fb0ed5ff836e01d341150628684e00e5e2e5b3f6466ece92d376985246f818243a0d1d775cfa55d1c50c0ec0c62 +DIST strum_macros-0.26.1.crate 25326 BLAKE2B 2f52389676e1581abf42995a54d7725b0ece50ba8da2ecba700c359a4bc3dfa3c48440908a57d8f25334a1ab6a844093e131dc351182ecec1cab9bff1b04c407 SHA512 f41fc17aaf84385437605ffa751a9f03d19d230780855f86d60b53de4bd1891519a3550c41a31d44312f44b59c3c184286d9181e40c3fdda3aec0c2806385455 +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.39.crate 244129 BLAKE2B 2cff6626624d03f70f1662af45a8644c28a9f92e2dfe38999bef3ba4a4c1ce825ae598277e9cb7abd5585eebfb17b239effc8d0bbf1c6ac196499f0d288e5e01 SHA512 96cc347cfdb0f9ca0b6c7289279a1cad8fc401625783742292564f7ceca8237ced8d9a3f62069696f6132ed06092dff2baaf4be09ef53b21260d93785b0e27c3 +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST terminal_size-0.3.0.crate 10096 BLAKE2B 097ef50a85945128dcfa36d8ea0fb15f11142c206462a32980dbbba4fe2872abd214823fe3c75e804f3159a97d6e929ec338860e9c89587da509fb9e6da5d339 SHA512 f3bc9144aa8a87556543584a2495df6267ce3bb017f3ed3d00fa43e89b5de783e1285ca62dbad9dd9c3b37e3a476a6f3ab0804eba2411cb594a569bbdb310681 +DIST termtree-0.4.1.crate 4557 BLAKE2B d4300b0e6e908c519a0a76f5e08167f4467f428b2926e7739614cef5d3e294dfac15ae8576f7011a852745713c16da93346660ff96520a2bb90a4dd4c23d889c SHA512 ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 +DIST test-case-3.3.1.crate 8797 BLAKE2B bad61b52f7865882cf6f1ad9448335a8c2eb725629858d62675ed5c10e3a160f5b2cf28cea1179a0c1fea1b33668a70f294b8a2252db460490f3c0bdb705e7d9 SHA512 9d6836759dcd71a61ab4e395db7c1a75a14ac3102a36c39b09868ba96d28a2265d8ded385942e55cf95dafc7f4b53fc498b30b6473cedc9b558977878e831b3c +DIST test-case-core-3.3.1.crate 14327 BLAKE2B cdca628ed77b8d7bbdf50c775268f733e125fdcdb4425d228691d9650558c3797876f5d8e900a7afc330f61c2be588452ced646248bd676fe4da1a4f8000decd SHA512 2c58aa3c9051b99c269168d5d321c73314188501fd33170a8a5d44e860354f5a399545abbdf50478a43d13e15ee9ed53d4a9c800b263a5e42b97416f96e2c0e3 +DIST test-case-macros-3.3.1.crate 4961 BLAKE2B c3cab2832fbcf3deab12b13bfbb32bbe73528df4d98e84de589a39cd9f3540e308e307148eeedfef4822e3f6820e1b1ba93b102851c7792c5abda25f735b9abb SHA512 3383ad7fa23f09b3289e2beefb2a2ea6bb7f7f48d71339b4c1e613c4807e83e4ab816b1c36369524d65aec7929064d2951c758d9c88164e7792a0a46fbf2d933 +DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 +DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b +DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31 +DIST time-0.3.34.crate 118430 BLAKE2B 6d04a20596c9b0961ca104748d9d360f07b16059719d7410fdf1a7a0d5f2aa02aaebf640999464835964bbded2d3257d79c4b0ca3080fbecf13dd2d0aa6962fc SHA512 3997e1b8d9be2f54184ebc9e1355d4b65f0b7bc9439b2b29e4a4acd86ad3a3aa019261112a24d998d76a7f66b266a86536fa50412279911b14d4d7aa7078c116 +DIST time-core-0.1.2.crate 7191 BLAKE2B c477ad3410ff29f3bf4a38fc6ac4a043d49b6d2bdf5cf309ffcd2eec3bb6e4c4b62156ee7f069f0b37ea31c163bc75ccbf35abc1db2833cdd4912135e60ddfc9 SHA512 3861724c23cb806829a01186deb5217ae8252c20af622975264e6670cff528f42155039e4937756a9eb312a5580ffab07949437d5504d684a0e70755046cac52 +DIST time-macros-0.2.17.crate 24443 BLAKE2B 5045af9352961db0c97cae2f6ca3e8d2c4f89a129c7ac2ec1d8d20804292aa9f2901a61f910a564954614b68f39311bd381deeb66fed8bdac423227d077f3d14 SHA512 c81747f0b74e68d3b3f36d378ac5911dece8c6b511e5ac793807f854cc31c812b927d0df941f55ff90d3d67512d0ac6a5f63f2de4322c81b05da42f46b4a661c +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.34.0.crate 736847 BLAKE2B de011340be791897f7aff72e80e4516379b666ab143dc58bc47f900b2276eb5ba5dda855534d649bbfa2735ea0581a12432207b7ebc040f5ddf0600779492448 SHA512 8749f5eb1a96bb13ffc6a431aafa618cc116a59be96700298ca52c7b129b48a087641f60e91c051f78dec61eafd9b5f1cb4de041e0a1abaab4509ffb81d02689 +DIST tokio-1.37.0.crate 764297 BLAKE2B 725f3b62c52ae962623df84c690db7c54438581b8d2108dda76f05bfabdf1688f2de8b4fed2ab0db5c04c7659af8d95a7e19702654a12fd498d85a1d030c7a45 SHA512 fc3c070ed0c09e57205b76618a93b8b00f4d74c2ad89df3295254ec2a984f4fdfa9ed5472ff935e1644e89cf2abc44354742603c0e006f14861deab2b873cd85 +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 +DIST tokio-util-0.7.10.crate 110508 BLAKE2B 073b25e1484d54911bc15fc2a4b3fb7658f24f7f77a2382f9f84c5122871cf8c5d6097d5c784cd75b17a79aa63eca80644ff54bb496b52e53bb89650ce35cab0 SHA512 d77db36cfa5a2ace3090874d8996b9e94058ac31648308da8dd92a7bdc9b9b61adb703dbd2131adfef0b428cd61b4de76fbdb674f718e89b297f762af11ec50c +DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265 +DIST toml-0.8.8.crate 50451 BLAKE2B 96d5411e8806c9021409ce232a11fd6d81269ef2f56b2a64d7217c9af8d0b31258b8c650e2bce9ca1d561a5fc58d1e556493d06199842a4d81884085622ae3c9 SHA512 6a583ce29d8179b480d29ca5e4624a4d6a8212cc741cd0c27c88ce46526f664a2f32eafd322b648f145f5ee5024d522a126f56befab5f1d68c32f2fb9866c7e5 +DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6 +DIST toml_edit-0.21.0.crate 101265 BLAKE2B 8cf4fcd93fdc99082c3c43e6629348b67c1e2bb4a3605ea119816b4b3c473bb3b9bf9baed8b189a0dda6d92ff5f08ec58e3cce19fe2667bcdb2ca3dee88d06ec SHA512 6889b7c3b6679db874b9ef099e3bfbce75b7f15cf47860e542af42d449d0795113bf7dc84a7f2d394ee0fe037d7f4c0857c3eeba6902a8b42bb9cbfc96f0f324 +DIST toml_edit-0.22.8.crate 104016 BLAKE2B 6dcdc076e7662bfbf21096baed32b6a7859311670824eef01b5df21c543f9a7c30c6d17a77a9b2708ba62c9a7d147cb1ab37043deb82817b28480064d3cf6014 SHA512 36f1fab6dd0c7e0d20171cb556b59c683e29aa8fe1bd50d4e745593217bdae467e01ca51a8122623f44bdf0d6fecd24c0f1b4b648e9c48d3985b77f907b54f0e +DIST tracing-0.1.40.crate 79459 BLAKE2B 33693ee71564fe5925a63dca351e838dfd8612b4b1e49a33a70095e56ca63287c13c772661ace0e540d08c92942d7cbdc51ff2cce4f4b372164d9aa20ec05dee SHA512 5622188a45dddc0d6d3a8244a9b12db6221f4180944ce1019d18f4e613e4bd113dae5d45fb57dd0754f6e8e153b047cdf00c8f200782bb2b868bc2d423d99275 +DIST tracing-attributes-0.1.27.crate 32241 BLAKE2B a20af0f50a90dcd64e5318e55779142da294ba18d1cd40059a8aa964fd3c92834e03ee563e41caaeef71a30e3f027e5c8d167d90e2844da79e0774b267e179b4 SHA512 7dc59f4234c3bf3434fb352baed2b81db4e931eeb3ed207c4a204e480da734be40847b167b808058d2807b5583815625bcd5153e2bbe79804cfa6f069a74ffa0 +DIST tracing-chrome-0.7.1.crate 13796 BLAKE2B dc2aa03525031a305bb1a4d0fe4941febd54427b031a3f939805a0c59ea12a36809ef2ad94561e2a19688437eec942529a09f4c875ea865b7490ae125afb39e5 SHA512 608e8af7cb28109dcc3039b3253dc02321bddb535f5eb5de2f922b993d5e79d2425dd2ed9327b7e8df531a4fb58d60ed1b6c64eda224d00573c3f412c3460cb8 +DIST tracing-chrome-0.7.2.crate 14030 BLAKE2B 6ffe58c4b60244d10e41addd7fe1532849a0ae56747bfebb18565e362c727b7199592ffd524c39b4d478da7dfea2dc03b1be47a1908f91abff7d5edef67ca410 SHA512 0ea9fe590f648a193714890da388183305d4084696926f5694eebd3c1da8cae922df335500cafdd60ba16ee5ce59a59e4fa292b97ccf739a19c2fe7fe145b0b3 +DIST tracing-core-0.1.32.crate 61221 BLAKE2B a7815c46af9852ce62498083103c6d359351f4d33609b4291330073b6abf4b63f5e1bb1a7dfed3bbf4d6913ad5217e96999416261af8a70609408a29109e4db6 SHA512 164f79cacfcca533a53b7dbbdc2015aaf851a16e00c72fbc4e5f515b6a6dedfa464e964810009b54f08cbcdc5a314e50245ac7b1b01a71fce4c63db135bf5521 +DIST tracing-log-0.2.0.crate 17561 BLAKE2B 701bdadd40f1343f3c4901bd8dd188f1dbc0afcdf50807bd0f6df7539635e239b5095696872103125a4d4cfec24af6336fce6f3931363dd5be4f53a09fa584f2 SHA512 0c1f060e8ffb9ff24cee7b85cc2d7d42c69b2f7623a7faecd7422b23b11ae8d5c7691e4635bae76861d444c369d9701ccb147904668023642b223e442e3c8285 +DIST tracing-serde-0.1.3.crate 7329 BLAKE2B 55d924fc3acfd496abca8b42bf3fa4a2511340cf2ebb060fb31bc0b5d81dcbbaa299daef3cddc3647625afd124b9c83efc1ef104f55dc6d4cd4d91e0e667c160 SHA512 3822ac747df404c33573ad2a5c722f9708066a72c2893dbf507563ef29bebcab79cec17515fa87c0fa64be8a08073c38ab57ccc463c74df8caf3df69c72e131b +DIST tracing-subscriber-0.3.18.crate 196312 BLAKE2B bc2f04da63b0313d26073eb4a39b549ae37701e4dbf1fe06a2483279a03d9dde981f0efea6ceb5cd441ab313bfe7eaf812971c3ca60dfd4b5d9cf0d2eb7bacd4 SHA512 72f91855637aa476f03077d5f523cbc94989d40b12d7328167f88b081869ed096e6370450831f6cd5f0686cae5628f14eed4696c06a2ec75f56808b64445e0c1 +DIST trippy-0.10.0.tar.gz 15288046 BLAKE2B 08cc2bc288b78fa205954db245c89fd5ce1966ac497dd8108feb816b737035f010ab5b92dda733962408ec039f4afff2d2c07505ed7f9ffe2577c545c5f0d161 SHA512 888812ba578c53403769df7c1192577e8e7e23fbcd529a21edba7fa2e0ac7f9463ca40e5f4137aa732bec8407d7b5252d485e4a5b2d29ef4a9da41e20eaa5bee +DIST trippy-0.9.0.tar.gz 13867271 BLAKE2B 92135376948ad710f14a2c8326e938f5ae0fa47563aea588b678dc0e55752c73d56d0468623345e0240b5f6061ebf11efea0b309f33dc738b2895901fc422d4a SHA512 1ca5d6e2ac17213c665616957bb98e2771efea4332dbdf8383c93e39573d8243ac880b8df2998c607fe92babe49a52608931da18aad6373022680757f310787d +DIST tun2-1.2.7.crate 30692 BLAKE2B 4200932f2fafbcb79dcd54ac177566c156d8bf9cfcdbaa9ed74010a0655fa48cf477b3b918e1a0c4e5fd00bfba8874a78bbfc0110f9fac6a070c5c7aa363423c SHA512 5156970a5779b13446aeec9da884ea74c48bced3a277cb84ccd80cf0b3b22f73e45f76f48e7d5ff94e772fa255a5dec30c729fcda95d4b169550954d3ee71eb4 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-bidi-0.3.15.crate 56811 BLAKE2B 1f1d372c86ec7444f13eb32baf13dfc8699b52156b265a2b53f40c0d771064876405451120fe54739a2679e6991caaf4f63e0644f03729cab814079fef4868c8 SHA512 7a21d5eb05ea8d691dfd54ce4cf7d3693d08067f7a88ef17b8c3044634f46411176b1bde1516c442577910b254007b247f5e40f9932eb601cd96cd574f9d9db8 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe +DIST unsafe-libyaml-0.2.11.crate 62101 BLAKE2B 7ba17f2c19d96fc8999448594ba67bfc0eceaff47a39e560f856d13229ad5e69a9c8ba8794ec814e6b7c3cb7d597b7c7a366c8e880f17c0efc6a03a5677d82bf SHA512 a42c95eaed1ae2e438d3ba19ccd92337327c34f6174a43db80e1f37c507154249c7510e93f81726890c6032c89fe21b1876582afb7fbb811e3931480c4727712 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST utf8parse-0.2.1.crate 13435 BLAKE2B a1c111d7ffc60690f2aaa86f034c66ba1abe4e126f1774a4377d41eba3269369862f57515af387ea785d69a8adf46338b5e53761b5ee6f4f4380473f4d9cab0a SHA512 51fba8f1e7eb74b7020fd831e30a67fc8353ac2ee07335c8c3374a5570ac8117f165f6905d4b7f0360095b7b5ed3e739001d02a8cc3c89195baf2cd679136050 +DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.88.crate 181311 BLAKE2B 94be99405e6f8d821aabed65928d03b3f5c7062afb923cac6088e56272fce4b928a03ca693b9e3bc2c7ac5b61052a3b2c1b9f75400c95814f29504c0f255f2e7 SHA512 21c50fa3ba6947e53fb56a57850350b9f5ef11d7281e015bbd564fa07a702b9e58b9ccd22bc6d870092e73ae51a9350f4c7f5a019b279f1cae2fb85a1f4ce80b +DIST wasm-bindgen-0.2.91.crate 182689 BLAKE2B 4ee85709546462be3da2a6f1caa02448fa903c7411eb264894aac402979afae4a0d7f3dbb486266b05d8caa911893ae9bfe9921cd36e03eb5147a8d75d6c17d2 SHA512 80e91e5b6094eddadbafd842a4a1b3284de7bb51bbd795e8716a0adac354dc14ceee0593d7c33090de06aadc8bc61b8eeab8851d066cc4ef4661e64adff1988a +DIST wasm-bindgen-backend-0.2.88.crate 28181 BLAKE2B 791e6bdc0702631dbb959e788db0f6dc2675f48c6d9e15f1362f153dd32a6df85b598a8a415143626dacdc17c2d447d0147c885f373ee6e0503446d96af243ce SHA512 717a62c8ed07adb29cbdbb1edf6f47d47eef2ad6fd9ad1264b09189d785bf525a6f09d1cf362d6a337d5be0a2ae8614e30843a33da73c2d22b6d233b76fabab4 +DIST wasm-bindgen-backend-0.2.91.crate 28345 BLAKE2B 912a0471ac64d61f18d1c1749a3614ab70d08f330fd90b903ce5ef51f18288c7d4ef153f1d8100671c02de8fc499928cf925bdab4da4f0352789268dfae87457 SHA512 7d3c8db4503982fae9c86620c964e8f9a4ce542a79c56f21d9f82d26bb9418e78b7fa9922901663bf78516d58652dc3255ef48d1e1f042d8a3c69210f5804204 +DIST wasm-bindgen-macro-0.2.88.crate 13908 BLAKE2B 49baa77009d60e05464d438a97bf4c72a5357f79a2995b88bd2a9c73823b01940b23d90b9b0d7e01bcf3c1c31988b015ba029df09aa1595bcf560000fededc33 SHA512 df45cac130bf787d08640045839d8e9fb1b10720c0e7def84862fc6f6f8df1a3c775870570c210279488eeb1700dcb6b778ee22fd23e5a2ae5572603c2fa3d1b +DIST wasm-bindgen-macro-0.2.91.crate 13898 BLAKE2B dda8dd5d77dc57324b633f056805bf7892c39c5e70257b6d048c2f8cf885f7306f91f3f17de1b63dc740db66d52fe2250ba981077e03dcc731dcf7c80c047c9d SHA512 6b05e0a2657e7e4f313089787b52cc7f59f5a94be6f716ba007fcbc3bf7c38561225ba3f39245d779e28dd30630b2d4c6be12baa6ea1e6cb47e562ccff48372f +DIST wasm-bindgen-macro-support-0.2.88.crate 20008 BLAKE2B ce90104bb631d00c4a1c0e056c688c6b88f95d9a4d58d474185313c5b38d0b81a660bc4c6684d8b70215140fe6eafd90fe9448e56154ded423616449ec30c750 SHA512 46aa40e5bd55f8ed3a576b1973c6ba7743675f20623397421fdd56b1f5d43159f7e7b3ce4acec0fe5b04a6fba8cf7744cb041e98844b0bc9e6542b06671076c2 +DIST wasm-bindgen-macro-support-0.2.91.crate 20091 BLAKE2B 337b1b2a9e9e9c1350267df0d9f041291a847cf4faa3bcd6fcc8a96e66fda54685da72f6e64e57cde0d4609409ebdc7851e96781f599470f8b0545018bdc2166 SHA512 1277682520d88cb9529adbc054590a732a8890debe33d1d64ebce332c66c02f84065c0f643fa45c01de8b80534b2daf8333979601323b3ed50dc49553233c39c +DIST wasm-bindgen-shared-0.2.88.crate 7264 BLAKE2B d1934b4af13257b9be90a26d90e0a13927efd4ff794ac1e90cba4133bab58f4941045e17e2b240489bfbf6e35107ffd5c7cfc4c9c37f2112d4a7ad78fec435db SHA512 eaffae8a98a1b6bbb186fc5f6535654171c19a763bc9ac2a79758e5ad2710537ca4de92228b99c7186322f94205f9623155f20d039fcc2d56452340c3bb9330b +DIST wasm-bindgen-shared-0.2.91.crate 7267 BLAKE2B a9dca2db84a33c650a7abbb6dc552bc4bab1446e66aace751d3709d2c63b878b127748a83cb174aae3ff8c5f5ec017b97623e5e9294e6ebf92d669efc618c357 SHA512 97072a8bdfadde104f6e9e760e1ac5ec665fdaff38a93a0bf601c95e652b35403e58a99fa8c0fefea6e47b38fb97f2e1ffcf52736f9ab890b0b9632efb26cb4b +DIST widestring-1.0.2.crate 79706 BLAKE2B 64423d0c485d1596015e9fcee691222a2a69b85a1b13a91651c50c1e3c5ec61c5105232904c6239bb442a2b3f2e808379d802856b93bb62ec8779cbf3db77655 SHA512 cbebac37d87808e791d7839ad69e0b86af49b0e8a354a22e11797915c719937ed5b0cb638e5afc9d710cd1e073eaa9f7db76cd3ca1ec35a71b565f0b8f55407b +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-0.52.0.crate 11843715 BLAKE2B 0d35225f5d61f71b0cb768f03825031101e05c83d7f12e05cb17b14ba28e6bc6a3d5aaee5ba07e54c1a773b6eadde4ce3523ab87e8e313e5578e2de01a3dcdc7 SHA512 8a9d443cfae3b44ab50bdffd70b70ea3b3d536f464e4beb7cfa9e15eb4e4505cbac20266b44d589bb7231790a87f473ead6d2160b8cd18d62f31b78bf61417da +DIST windows-core-0.51.1.crate 42364 BLAKE2B 0227e8cc033f40b644879ce4a86f17b9552076378eb6cc6c8cedaa15602ef3ce0deb1ca48c6a7b4276af2bc2e0434e76193649051d7a2f78695f60400d00ccff SHA512 90615ed84f11fdfe0725a4a8b112e45f93ae6cb7e65c16636f85217369fd8b708553ae5bd28aff66e18b180ffa3c0f6820a94022fc5eb202b4f8358f8926fde6 +DIST windows-core-0.52.0.crate 42154 BLAKE2B 9670bf02261b4ab2a24eff97dad11e305deac823cacfae286965b62b11bc035f19a55ca710eaa4359c8a4905433a94fe62a836b77ddd68f244ad6ac2c9657f58 SHA512 0c8f1c7e63c11bdcf1361150ecc83abbfba8da2c6d28523799bd286bf8aa1df61ffed19175e8cb3ef516a9afb6248b640c2101a2e0c09a99bfd7a18c6741bd36 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST winnow-0.5.19.crate 147982 BLAKE2B 99b9625ee4c8b6236b1acfd29c267ac4d17c5f911e291d39f71f85a097222a4fbe48606c02acab6d70eccab710852782096bcda90ebe6cefb44ed9d48923ce0b SHA512 dee415c9e901d91d2a4646d1198c5b959c8e7a9ee5b3bfcb5c78159d57fc3905dda80e1c5b45a8a18e024a3e2394022772fecbdb8158ea1513a953c93f48d9a0 +DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99 +DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 +DIST wintun-0.4.0.crate 782893 BLAKE2B 73e80eba286644f855e0e910644f66da9b5c06876ef3266959fce91a11705f7c990ad79a99dcbe5a0b9f4346d1c4769a685de329f2cdc4d5a14edaac183a0447 SHA512 cb0c4e1793ccfb585217549e959df00e2b137aeaa7957b8f72d17951a184281557e097eba6a1cf5b3c7aa47761cf1011cd6d4ae8fff7961ffc4a4b5c1a4c6f31 +DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2 +DIST zerocopy-0.7.26.crate 128648 BLAKE2B cd26ca75197d2f74e091359f72743b8b0c92774ce4466ee47bd23854dd7c5fdf09be89ee2412bdb0e52b3c73a169b8d5c172c13285a8931c74f106970deafa60 SHA512 3789e845ec87beaf84ff9cf8d72e9968a2c7ed2350cca24836b24c16b791867db0d9a580fdb7aa2187b35ac88723932498c44d10eccc756ae92f31a97ac6771b +DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82 +DIST zerocopy-derive-0.7.26.crate 528381 BLAKE2B 4be2168e3af5a5c541be49159f7d37405eceaa9e914d670899c814076e7240781d580007d906f8433e469ffad8e7abed3e18dc8b5e80ec09837f13a28976af57 SHA512 1e28e957d1a9cb5164bc839750ecad26ccd280dc9f5ee58a02a09d2135dc097991be2755d7b87f360863f1ab030f772963677d61861f7d33699a631eb9026829 +DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d diff --git a/net-analyzer/trippy/metadata.xml b/net-analyzer/trippy/metadata.xml new file mode 100644 index 000000000000..a273e2950d9b --- /dev/null +++ b/net-analyzer/trippy/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type='person'> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> + </maintainer> + <upstream> + <remote-id type="github">fujiapple852/trippy</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/trippy/trippy-0.10.0.ebuild b/net-analyzer/trippy/trippy-0.10.0.ebuild new file mode 100644 index 000000000000..a8d923a31031 --- /dev/null +++ b/net-analyzer/trippy/trippy-0.10.0.ebuild @@ -0,0 +1,296 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + ahash@0.8.7 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.11 + anstyle-parse@0.2.3 + anstyle-query@1.0.2 + anstyle-wincon@3.0.2 + anstyle@1.0.6 + anyhow@1.0.81 + arrayvec@0.7.4 + async-trait@0.1.77 + autocfg@1.1.0 + backtrace@0.3.69 + base64@0.21.7 + bitflags@1.3.2 + bitflags@2.5.0 + bumpalo@3.14.0 + bytes@1.5.0 + c2rust-bitfields-derive@0.18.0 + c2rust-bitfields@0.18.0 + caps@0.5.5 + cassowary@0.3.0 + castaway@0.2.2 + cc@1.0.83 + cfg-if@1.0.0 + cfg_aliases@0.1.1 + chrono@0.4.37 + clap@4.4.18 + clap_builder@4.4.18 + clap_complete@4.4.10 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + comfy-table@7.1.0 + compact_str@0.7.1 + core-foundation-sys@0.8.6 + crossbeam-channel@0.5.11 + crossbeam-deque@0.8.5 + crossbeam-epoch@0.9.18 + crossbeam-queue@0.3.11 + crossbeam-utils@0.8.19 + crossbeam@0.8.4 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + csv-core@0.1.11 + csv@1.3.0 + darling@0.20.5 + darling_core@0.20.5 + darling_macro@0.20.5 + data-encoding@2.5.0 + deranged@0.3.11 + derive_more@0.99.17 + diff@0.1.13 + dns-lookup@2.0.4 + downcast@0.11.0 + either@1.10.0 + encoding_rs@0.8.33 + encoding_rs_io@0.1.7 + enum-as-inner@0.6.0 + equivalent@1.0.1 + errno@0.3.8 + etcetera@0.8.0 + fixedbitset@0.4.2 + fnv@1.0.7 + form_urlencoded@1.2.1 + fragile@2.0.0 + futures-channel@0.3.30 + futures-core@0.3.30 + futures-io@0.3.30 + futures-sink@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + getrandom@0.2.12 + gimli@0.28.1 + hashbrown@0.12.3 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.3.5 + hex-literal@0.4.1 + hex@0.4.3 + hickory-proto@0.24.0 + hickory-resolver@0.24.0 + home@0.5.9 + hostname@0.3.1 + humantime@2.1.0 + iana-time-zone-haiku@0.1.2 + iana-time-zone@0.1.60 + ident_case@1.0.1 + idna@0.4.0 + idna@0.5.0 + indexmap@1.9.3 + indexmap@2.2.6 + indoc@2.0.4 + ipconfig@0.3.2 + ipnet@2.9.0 + ipnetwork@0.20.0 + itertools@0.12.1 + itoa@1.0.10 + js-sys@0.3.68 + lazy_static@1.4.0 + libc@0.2.153 + libloading@0.8.1 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.13 + lock_api@0.4.11 + log@0.4.20 + lru-cache@0.1.2 + lru@0.12.2 + match_cfg@0.1.0 + matchers@0.1.0 + maxminddb@0.24.0 + memchr@2.7.1 + memoffset@0.9.0 + miniz_oxide@0.7.2 + mio@0.8.11 + mockall@0.12.1 + mockall_derive@0.12.1 + nix@0.28.0 + nu-ansi-term@0.46.0 + num-conv@0.1.0 + num-traits@0.2.18 + num_cpus@1.16.0 + object@0.32.2 + once_cell@1.19.0 + overload@0.1.1 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + paste@1.0.14 + percent-encoding@2.3.1 + petgraph@0.6.4 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + powerfmt@0.2.0 + ppv-lite86@0.2.17 + predicates-core@1.0.6 + predicates-tree@1.0.9 + predicates@3.1.0 + pretty_assertions@1.4.0 + proc-macro2@1.0.78 + quick-error@1.2.3 + quote@1.0.35 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + ratatui@0.26.1 + redox_syscall@0.4.1 + regex-automata@0.1.10 + regex-automata@0.4.5 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.3 + resolv-conf@0.7.0 + rustc-demangle@0.1.23 + rustix@0.38.31 + rustversion@1.0.14 + ryu@1.0.16 + scopeguard@1.2.0 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.115 + serde_spanned@0.6.5 + serde_with@3.7.0 + serde_with_macros@3.7.0 + serde_yaml@0.9.33 + sharded-slab@0.1.7 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + signal-hook@0.3.17 + slab@0.4.9 + smallvec@1.13.1 + socket2@0.5.6 + stability@0.1.1 + static_assertions@1.1.0 + strsim@0.10.0 + strum@0.25.0 + strum@0.26.2 + strum_macros@0.25.3 + strum_macros@0.26.1 + syn@1.0.109 + syn@2.0.48 + terminal_size@0.3.0 + termtree@0.4.1 + test-case-core@3.3.1 + test-case-macros@3.3.1 + test-case@3.3.1 + thiserror-impl@1.0.58 + thiserror@1.0.58 + thread_local@1.1.7 + time-core@0.1.2 + time-macros@0.2.17 + time@0.3.34 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.2.0 + tokio-util@0.7.10 + tokio@1.37.0 + toml@0.8.12 + toml_datetime@0.6.5 + toml_edit@0.22.8 + tracing-attributes@0.1.27 + tracing-chrome@0.7.2 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-serde@0.1.3 + tracing-subscriber@0.3.18 + tracing@0.1.40 + tun2@1.2.7 + unicode-bidi@0.3.15 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.11.0 + unicode-width@0.1.11 + unsafe-libyaml@0.2.11 + url@2.5.0 + utf8parse@0.2.1 + valuable@0.1.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.91 + wasm-bindgen-macro-support@0.2.91 + wasm-bindgen-macro@0.2.91 + wasm-bindgen-shared@0.2.91 + wasm-bindgen@0.2.91 + widestring@1.0.2 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-core@0.52.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winnow@0.6.5 + winreg@0.50.0 + wintun@0.4.0 + yansi@0.5.1 + zerocopy-derive@0.7.32 + zerocopy@0.7.32 +" + +inherit cargo fcaps + +DESCRIPTION="A network diagnostic tool" +HOMEPAGE="https://trippy.cli.rs/ https://github.com/fujiapple852/trippy" +SRC_URI=" + https://github.com/fujiapple852/trippy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + ISC MIT Unicode-DFS-2016 WTFPL-2 +" +SLOT="0" +KEYWORDS="~amd64" +IUSE="suid" + +FILECAPS=( cap_net_raw+p usr/bin/trip ) + +QA_FLAGS_IGNORED="usr/bin/trip" + +src_install() { + cargo_src_install + + dodoc README.md CHANGELOG.md + + if use suid; then + fperms u+s usr/bin/trip + fi +} diff --git a/net-analyzer/trippy/trippy-0.9.0.ebuild b/net-analyzer/trippy/trippy-0.9.0.ebuild new file mode 100644 index 000000000000..e1dfbdbbc957 --- /dev/null +++ b/net-analyzer/trippy/trippy-0.9.0.ebuild @@ -0,0 +1,252 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + addr2line@0.21.0 + adler@1.0.2 + ahash@0.8.6 + aho-corasick@1.1.2 + allocator-api2@0.2.16 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anstream@0.6.4 + anstyle@1.0.4 + anstyle-parse@0.2.2 + anstyle-query@1.0.0 + anstyle-wincon@3.0.1 + anyhow@1.0.75 + arrayvec@0.7.4 + async-trait@0.1.74 + autocfg@1.1.0 + backtrace@0.3.69 + bitflags@1.3.2 + bitflags@2.4.1 + bumpalo@3.14.0 + bytes@1.5.0 + caps@0.5.5 + cassowary@0.3.0 + cc@1.0.83 + cfg-if@1.0.0 + chrono@0.4.31 + clap@4.4.8 + clap_builder@4.4.8 + clap_complete@4.4.4 + clap_derive@4.4.7 + clap_lex@0.6.0 + colorchoice@1.0.0 + comfy-table@7.1.0 + core-foundation-sys@0.8.4 + crossbeam@0.8.2 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-queue@0.3.8 + crossbeam-utils@0.8.16 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + csv@1.3.0 + csv-core@0.1.11 + data-encoding@2.5.0 + derive_more@0.99.17 + diff@0.1.13 + dns-lookup@2.0.4 + either@1.9.0 + enum-as-inner@0.6.0 + equivalent@1.0.1 + errno@0.3.7 + etcetera@0.8.0 + fixedbitset@0.4.2 + form_urlencoded@1.2.1 + futures-channel@0.3.29 + futures-core@0.3.29 + futures-io@0.3.29 + futures-task@0.3.29 + futures-util@0.3.29 + getrandom@0.2.11 + gimli@0.28.1 + hashbrown@0.14.3 + heck@0.4.1 + hermit-abi@0.3.3 + hex-literal@0.4.1 + hickory-proto@0.24.0 + hickory-resolver@0.24.0 + home@0.5.5 + hostname@0.3.1 + humantime@2.1.0 + iana-time-zone@0.1.58 + iana-time-zone-haiku@0.1.2 + idna@0.4.0 + idna@0.5.0 + indexmap@2.1.0 + indoc@2.0.4 + ipconfig@0.3.2 + ipnet@2.9.0 + ipnetwork@0.18.0 + itertools@0.11.0 + itertools@0.12.0 + itoa@1.0.9 + js-sys@0.3.65 + lazy_static@1.4.0 + libc@0.2.150 + linked-hash-map@0.5.6 + linux-raw-sys@0.4.11 + lock_api@0.4.11 + log@0.4.20 + lru@0.12.1 + lru-cache@0.1.2 + match_cfg@0.1.0 + matchers@0.1.0 + maxminddb@0.23.0 + memchr@2.6.4 + memoffset@0.9.0 + miniz_oxide@0.7.1 + mio@0.8.9 + nix@0.27.1 + nu-ansi-term@0.46.0 + num-traits@0.2.17 + num_cpus@1.16.0 + object@0.32.1 + once_cell@1.18.0 + overload@0.1.1 + parking_lot@0.12.1 + parking_lot_core@0.9.9 + paste@1.0.14 + percent-encoding@2.3.1 + petgraph@0.6.4 + pin-project-lite@0.2.13 + pin-utils@0.1.0 + ppv-lite86@0.2.17 + pretty_assertions@1.4.0 + proc-macro2@1.0.70 + quick-error@1.2.3 + quote@1.0.33 + rand@0.8.5 + rand_chacha@0.3.1 + rand_core@0.6.4 + ratatui@0.24.0 + redox_syscall@0.4.1 + regex@1.10.2 + regex-automata@0.1.10 + regex-automata@0.4.3 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + resolv-conf@0.7.0 + rustc-demangle@0.1.23 + rustix@0.38.25 + rustversion@1.0.14 + ryu@1.0.15 + scopeguard@1.2.0 + serde@1.0.193 + serde_derive@1.0.193 + serde_json@1.0.108 + serde_spanned@0.6.4 + sharded-slab@0.1.7 + signal-hook@0.3.17 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + slab@0.4.9 + smallvec@1.11.2 + socket2@0.5.5 + strum@0.25.0 + strum_macros@0.25.3 + syn@1.0.109 + syn@2.0.39 + terminal_size@0.3.0 + test-case@3.3.1 + test-case-core@3.3.1 + test-case-macros@3.3.1 + thiserror@1.0.50 + thiserror-impl@1.0.50 + thread_local@1.1.7 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio@1.34.0 + toml@0.8.8 + toml_datetime@0.6.5 + toml_edit@0.21.0 + tracing@0.1.40 + tracing-attributes@0.1.27 + tracing-chrome@0.7.1 + tracing-core@0.1.32 + tracing-log@0.2.0 + tracing-serde@0.1.3 + tracing-subscriber@0.3.18 + unicode-bidi@0.3.13 + unicode-ident@1.0.12 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + url@2.5.0 + utf8parse@0.2.1 + valuable@0.1.0 + version_check@0.9.4 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen@0.2.88 + wasm-bindgen-backend@0.2.88 + wasm-bindgen-macro@0.2.88 + wasm-bindgen-macro-support@0.2.88 + wasm-bindgen-shared@0.2.88 + widestring@1.0.2 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-core@0.51.1 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.48.5 + windows-targets@0.52.0 + windows_aarch64_gnullvm@0.48.5 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.48.5 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.48.5 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.48.5 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.48.5 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.48.5 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.48.5 + windows_x86_64_msvc@0.52.0 + winnow@0.5.19 + winreg@0.50.0 + yansi@0.5.1 + zerocopy@0.7.26 + zerocopy-derive@0.7.26 +" + +inherit cargo fcaps + +DESCRIPTION="A network diagnostic tool" +HOMEPAGE="https://trippy.cli.rs/ https://github.com/fujiapple852/trippy" +SRC_URI=" + https://github.com/fujiapple852/trippy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE="Apache-2.0" +# Dependent crate licenses +LICENSE+=" + ISC MIT Unicode-DFS-2016 + || ( Apache-2.0 Boost-1.0 ) +" +SLOT="0" +KEYWORDS="amd64" +IUSE="suid" + +FILECAPS=( cap_net_raw+p usr/bin/trip ) + +QA_FLAGS_IGNORED="usr/bin/trip" + +src_install() { + cargo_src_install + + dodoc README.md CHANGELOG.md + + if use suid; then + fperms u+s usr/bin/trip + fi +} diff --git a/net-analyzer/tsung/Manifest b/net-analyzer/tsung/Manifest index 4846012062ba..7b130044521f 100644 --- a/net-analyzer/tsung/Manifest +++ b/net-analyzer/tsung/Manifest @@ -1 +1 @@ -DIST tsung-1.7.0.tar.gz 1572265 BLAKE2B 8227e14106943071e7a3759b2bd06a92af55889ecf22b1a74432fd2f6d03196a9e321d16f1e291dcd71d4af560f4f2b38193326a9a87fec671dcda23ab0ecb1b SHA512 67490a95fb54f5196ae0302190190a6b8e79bbeba9a7c1932d83a949504489d4cc3ce048380c0cb09c6cae4c1e203d52de9ea0e2f4e7c3d7438b836aef532dac +DIST tsung-1.8.0.tar.gz 1662056 BLAKE2B 7d61fbba7981214b91c16d07cdf69e54e6bf5d39f7c4856b58ff87fc9ee4e5e850d8e075aa6cd0c2d725d92c42eb3ea619139c1754abd20b446f0bdb05d8cb39 SHA512 e025b59674c05eee8069982888eddd1cdb92f3984e1b0694aa06b22041f8072b2e8cf5358154cd9b80a83412d0e767f7ae9c47e09ba43db15b319537553e9ded diff --git a/net-analyzer/tsung/metadata.xml b/net-analyzer/tsung/metadata.xml index 40aa45df2b01..2ce0e74f9864 100644 --- a/net-analyzer/tsung/metadata.xml +++ b/net-analyzer/tsung/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>patrick@gentoo.org</email> diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.8.0.ebuild index 80940ea2f4aa..fbee6e966333 100644 --- a/net-analyzer/tsung/tsung-1.7.0.ebuild +++ b/net-analyzer/tsung/tsung-1.8.0.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" # Seems to be misconfigured RESTRICT="test" -inherit eutils - DESCRIPTION="Erlang's multi-protocol distributed load testing tool" HOMEPAGE="http://tsung.erlang-projects.org/" SRC_URI="http://tsung.erlang-projects.org/dist/${P}.tar.gz" diff --git a/net-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/ttcp/metadata.xml +++ b/net-analyzer/ttcp/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild index 49e46e02dbd4..1fae3ce9f5fa 100644 --- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild +++ b/net-analyzer/ttcp/ttcp-1.12-r3.ebuild @@ -1,26 +1,36 @@ -# Copyright 1999-2018 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="Tool to test TCP and UDP throughput" HOMEPAGE=" http://ftp.arl.mil/~mike/ttcp.html - http://www.netcore.fi/pekkas/linux/ipv6/ -" + http://www.netcore.fi/pekkas/linux/ipv6/" +SRC_URI=" + mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~jsmolic/distfiles/${P}.c" + LICENSE="public-domain" SLOT="0" KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -SRC_URI=" - mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~jer/${P}.c -" + +src_prepare() { + cp "${DISTDIR}"/${P}.c ${PN}.c || die + default +} + +src_configure() { + tc-export CC +} + src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} "${DISTDIR}"/${P}.c || die + emake ttcp } src_install() { - dobin ${PN} - newman sgi-${PN}.1 ${PN}.1 + dobin ttcp + newman sgi-ttcp.1 ttcp.1 } diff --git a/net-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml index 87ebba397bfa..bb35b1ef3034 100644 --- a/net-analyzer/upnpscan/metadata.xml +++ b/net-analyzer/upnpscan/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild index 91839f3352c1..b92dcbfb3960 100644 --- a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild +++ b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild @@ -1,23 +1,27 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 +inherit autotools -inherit autotools-utils - -DESCRIPTION="Scans the network for UPNP capable devices" +DESCRIPTION="Scans the network for UPnP capable devices" HOMEPAGE="http://www.cqure.net/wp/upnpscan/" SRC_URI="http://www.cqure.net/tools/${PN}-v${PV}-src.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -S=${WORKDIR}/${PN} - DOCS=( AUTHORS ChangeLog NEWS README TODO ) -PATCHES=( "${FILESDIR}"/${P}-r2-cflags.patch ) +PATCHES=( + "${FILESDIR}"/${P}-r2-cflags.patch +) + +src_prepare() { + default + + eautoreconf +} diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 7902b33ad434..f0f9856c1819 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,4 +1,4 @@ -DIST vnstat-1.17.tar.gz 238397 BLAKE2B 73aaffda3c91a1146b1d6a21f637272be227a15a7964aad90fb76c407c5f7fb0085e6f9f54408e8ebc667475c15f260d701c5924737f20921ebc0a35affd52be SHA512 c9c119a89054dacdc15026c766a20d88336d7689dd4264530d0347fcc58f3cbfc806b271e0f83e76c3b4a31ab793a628ee7d7b696943da919ee4cd2fdb481cc3 -DIST vnstat-2.4.tar.gz 270907 BLAKE2B 4666c39c05cb0bd2a89db7e57bfd72b542ccda02ba09a9da6097b58957141042a5e63a2ee4863bb61b686b3e4c374a690d798398136760699755187fdca5e27c SHA512 e2f23b375a6afcd9e51770769c741d3a5fc139aec22e535bc98da09e4a6677a0c820fb04727a79f23569be29f031e9ee897b6d569146c42ed917f5f83399b7b6 -DIST vnstat-2.5.tar.gz 274765 BLAKE2B 65117717d5522ce17e40f05f62d0328f74f5cc3ab42353c93b7a2af0e74df1d36b3a64dd778cd4def2985120bfbc6e1cf8e83a7615ef236ea1af1dbd8d898965 SHA512 5f44f2ee7fa4bdaf0cfd48b35927ec590f5344cc497b5e02a999ece40e53812a7bf725cf1ddaf08c7316bf83ed567f370a72f00b279553cb1d06dfec26c3c1c8 -DIST vnstat-2.6.tar.gz 275751 BLAKE2B 7351b265d66e42d1e5450dae6f5eaa973a9cdc171b865689540b5838ddeb2629da968bc2ba655cb6ff909227a859f0334900a1597c78b772124a993343a4cf23 SHA512 1a62fc9c2379b050208945e85bad04f602a0f2c71e6bd069d241c1df77c76ec6258948fc3fdf633b15c52665782cae4f995a916103d330bfb46cab0291d3a1ea +DIST vnstat-2.11.tar.gz 312821 BLAKE2B 6eeed45d628641c9d88cf33ae1fc14871109b1e9fd0ac4a46fe8e2c194bb4600878b69408ed177bcde38ca859d0a3165d0095cab9b0bb6c036f7788fbfcb47e6 SHA512 d1ec9fd7e57598712df50601247c9904a371b7a2e5cb33efab2d44d330294d8ea3facf914de3d8d3a0381061b14642c613948478bf0c8d7f5e599a83321aad34 +DIST vnstat-2.11.tar.gz.asc 833 BLAKE2B ded1462ee51dc6fde349ae6e21a6b45bdab268ff024804394268f515b618beead7d4582721ffa26d3f9cc7a8434a0f7145d31dcf9c95c575145e4903bdbd5460 SHA512 8b15f73d412e05c50e2e5a514bc96daa2dceae49af95ed7f09e742f3bbc8b34b856bb2d0a33a7146a8b19f714d47863388cfcb63821dac670c9e020ca60f4785 +DIST vnstat-2.12.tar.gz 325227 BLAKE2B af6982bc6da66ed2cebfe99e1b46a540528886d1c6e7a5174a3083a315804cb42c2395f3a0f5df552e8fd6b7823a01873fc5f9fb2178529c53481a67552dab35 SHA512 68f8b7d8f30338fdd444621bf68a9157dd7b9be04b2156e27399f2a8b7ef67b5015067bf71370994da1b3aeaf88264205e797926e18a6e51fa9b963dcdd6d969 +DIST vnstat-2.12.tar.gz.asc 833 BLAKE2B 8397785826fe885c6ca74b09d81f57e5142dd4c73362c7e54af6d9c9c74e1e3dc8c58df39c30e31198029a95b3fea5a09ec703773f48958ed1d8f59fed8f0696 SHA512 4d0c4c0b2a0d55fbd15f3842a4900ed6cacff2b9437c371973bb053fc69320fbec51564fd480000a437d13edb0c8bb33c16acff9212a4c3ca960fc7bd2940f54 diff --git a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch b/net-analyzer/vnstat/files/vnstat-2.2-conf.patch deleted file mode 100644 index 7bea5d8ffe97..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cfg/vnstat.conf -+++ b/cfg/vnstat.conf -@@ -143,7 +143,7 @@ - LogFile "/var/log/vnstat/vnstat.log" - - # file used as daemon pid / lock file --PidFile "/var/run/vnstat/vnstat.pid" -+PidFile "/run/vnstat/vnstat.pid" - - # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection - 64bitInterfaceCounters -2 diff --git a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch b/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch deleted file mode 100644 index 2ed3ec1404a4..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-drop-root.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/cfg/vnstat.conf -+++ b/cfg/vnstat.conf -@@ -69,10 +69,10 @@ - ## - - # switch to given user when started as root (leave empty to disable) --DaemonUser "" -+DaemonUser "vnstat" - - # switch to given group when started as root (leave empty to disable) --DaemonGroup "" -+DaemonGroup "vnstat" - - # try to detect interface maximum bandwidth, 0 = disable feature - # MaxBandwidth will be used as fallback value when enabled diff --git a/net-analyzer/vnstat/files/vnstat-2.2-run.patch b/net-analyzer/vnstat/files/vnstat-2.2-run.patch deleted file mode 100644 index bb9222b5fe2f..000000000000 --- a/net-analyzer/vnstat/files/vnstat-2.2-run.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/common.h -+++ b/src/common.h -@@ -229,7 +229,7 @@ - #define CREATEDIRS 1 - #define UPDATEFILEOWNER 1 - #define LOGFILE "/var/log/vnstat/vnstat.log" --#define PIDFILE "/var/run/vnstat/vnstat.pid" -+#define PIDFILE "/run/vnstat/vnstat.pid" - #define IS64BIT -2 - - /* no transparency by default */ diff --git a/net-analyzer/vnstat/files/vnstat-2.9-conf.patch b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch new file mode 100644 index 000000000000..d2cfa3977cfb --- /dev/null +++ b/net-analyzer/vnstat/files/vnstat-2.9-conf.patch @@ -0,0 +1,39 @@ +diff --git a/cfg/vnstat.conf b/cfg/vnstat.conf +index f404de5..d2bd928 100644 +--- a/cfg/vnstat.conf ++++ b/cfg/vnstat.conf +@@ -80,10 +80,10 @@ + ## + + # switch to given user when started as root (leave empty to disable) +-;DaemonUser "" ++;DaemonUser "vnstat" + + # switch to given group when started as root (leave empty to disable) +-;DaemonGroup "" ++;DaemonGroup "vnstat" + + # try to detect interface maximum bandwidth, 0 = disable feature + # MaxBandwidth will be used as fallback value when enabled +@@ -161,7 +161,7 @@ + ;LogFile "/var/log/vnstat/vnstat.log" + + # file used as daemon pid / lock file +-;PidFile "/var/run/vnstat/vnstat.pid" ++;PidFile "/run/vnstat/vnstat.pid" + + # 1 = 64-bit, 0 = 32-bit, -1 = old style logic, -2 = automatic detection + ;64bitInterfaceCounters -2 +diff --git a/src/common.h b/src/common.h +index bb2fb56..f148004 100644 +--- a/src/common.h ++++ b/src/common.h +@@ -241,7 +241,7 @@ and most can be changed later from the config file. + #define CREATEDIRS 1 + #define UPDATEFILEOWNER 1 + #define LOGFILE "/var/log/vnstat/vnstat.log" +-#define PIDFILE "/var/run/vnstat/vnstat.pid" ++#define PIDFILE "/run/vnstat/vnstat.pid" + #define IS64BIT -2 + #define WALDB 0 + #define WALDBCHECKPOINTINTERVALMINS 240 diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron deleted file mode 100644 index 690681327688..000000000000 --- a/net-analyzer/vnstat/files/vnstat.cron +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# run vnstat if installed and at least one database exists - -# Uncomment the following to enable - -#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then -# exec /usr/bin/vnstat -u -#fi diff --git a/net-analyzer/vnstat/files/vnstatd.confd b/net-analyzer/vnstat/files/vnstatd.confd deleted file mode 100644 index 17901419aacb..000000000000 --- a/net-analyzer/vnstat/files/vnstatd.confd +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/conf.d/vnstatd: config file for /etc/init.d/vnstatd - -# Adjust scheduling priority on vnstatd (default: 0) -#VNSTATD_NICELEVEL="0" - -# Pass extra options to vnstatd -#VNSTATD_EXTRAOPTS="--config /etc/vnstat.conf" diff --git a/net-analyzer/vnstat/files/vnstatd.initd-r1 b/net-analyzer/vnstat/files/vnstatd.initd-r1 deleted file mode 100644 index a8d61efe0f2a..000000000000 --- a/net-analyzer/vnstat/files/vnstatd.initd-r1 +++ /dev/null @@ -1,37 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_started_commands="reload" - -depend() { - use net -} - -VNSTATD_PIDFILE="${VNSTATD_PIDFILE:-/run/vnstatd/vnstatd.pid}" - -start() { - ebegin "Starting vnstatd" - checkpath -q -d -m 755 -o vnstat:vnstat /run/vnstatd - checkpath -q -d -m 755 -o vnstat:vnstat /var/lib/vnstat - start-stop-daemon --start --quiet \ - --pidfile "${VNSTATD_PIDFILE}" \ - --user vnstat --group vnstat \ - --nicelevel ${VNSTATD_NICELEVEL:-0} \ - --exec /usr/bin/vnstatd -- \ - -d ${VNSTATD_EXTRAOPTS} -p ${VNSTATD_PIDFILE} - eend $? -} - -stop() { - ebegin "Stopping vnstatd" - start-stop-daemon --stop --quiet \ - --pidfile "${VNSTATD_PIDFILE}" - eend $? -} - -reload() { - ebegin "Reloading vnstatd configuration" - kill -HUP $(cat "${VNSTATD_PIDFILE}") 2>&1 >/dev/null - eend $? -} diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml index dace7f2e8f57..72f73094dea2 100644 --- a/net-analyzer/vnstat/metadata.xml +++ b/net-analyzer/vnstat/metadata.xml @@ -1,14 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> - </maintainer> -<longdescription> - vnStat is a network traffic monitor for Linux that keeps a log of daily - network traffic for the selected interface(s). vnStat isn't a packet sniffer. - The traffic information is analyzed from the /proc filesystem. That way vnStat - can be used even without root permissions. -</longdescription> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <longdescription> + vnStat is a network traffic monitor for Linux that keeps a log of daily + network traffic for the selected interface(s). vnStat isn't a packet sniffer. + The traffic information is analyzed from the /proc filesystem. That way vnStat + can be used even without root permissions. + </longdescription> + <upstream> + <remote-id type="github">vergoh/vnstat</remote-id> + <changelog>https://humdi.net/vnstat/CHANGES</changelog> + </upstream> </pkgmetadata> diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild deleted file mode 100644 index d48e9aa70bab..000000000000 --- a/net-analyzer/vnstat/vnstat-1.17.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /dev/null vnstat -} - -src_prepare() { - default - - tc-export CC - - sed -i \ - -e 's|vnstat[.]log|vnstatd.log|' \ - -e 's|vnstat[.]pid|vnstatd/vnstatd.pid|' \ - -e 's|/var/run|/run|' \ - cfg/${PN}.conf || die - sed -i \ - -e '/PIDFILE/s|/var/run|/run|' \ - src/common.h || die -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /etc/cron.hourly - newexe "${FILESDIR}"/vnstat.cron vnstat - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - newconfd "${FILESDIR}"/vnstatd.confd vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r1 vnstatd - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} diff --git a/net-analyzer/vnstat/vnstat-2.6.ebuild b/net-analyzer/vnstat/vnstat-2.11.ebuild index 12983f11d965..812aa69dbc7a 100644 --- a/net-analyzer/vnstat/vnstat-2.6.ebuild +++ b/net-analyzer/vnstat/vnstat-2.11.ebuild @@ -1,44 +1,60 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit systemd user +EAPI=8 + +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI=" + https://humdi.net/vnstat/${P}.tar.gz + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( + https://humdi.net/vnstat/${P}.tar.gz.asc + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc + ) + " + + KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" + acct-group/vnstat + acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" + PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch + "${FILESDIR}"/${PN}-2.9-conf.patch ) -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') + emake \ + ${PN} \ + ${PN}d \ + $(usev gd ${PN}i) } src_install() { @@ -59,11 +75,16 @@ src_install() { newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.8 newdoc INSTALL README.setup dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi } + +pkg_postinst() { + tmpfiles_process vnstatd.conf +} diff --git a/net-analyzer/vnstat/vnstat-2.4.ebuild b/net-analyzer/vnstat/vnstat-2.12.ebuild index 3c08307f0cf8..7403fef778be 100644 --- a/net-analyzer/vnstat/vnstat-2.4.ebuild +++ b/net-analyzer/vnstat/vnstat-2.12.ebuild @@ -1,44 +1,60 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit systemd user +EAPI=8 + +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI=" + https://humdi.net/vnstat/${P}.tar.gz + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( + https://humdi.net/vnstat/${P}.tar.gz.asc + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc + ) + " + + KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" + acct-group/vnstat + acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" + PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch + "${FILESDIR}"/${PN}-2.9-conf.patch ) -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') + emake \ + ${PN} \ + ${PN}d \ + $(usev gd ${PN}i) } src_install() { @@ -59,11 +75,16 @@ src_install() { newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 + doman man/vnstat.1 man/vnstatd.8 newdoc INSTALL README.setup dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi } + +pkg_postinst() { + tmpfiles_process vnstatd.conf +} diff --git a/net-analyzer/vnstat/vnstat-2.5.ebuild b/net-analyzer/vnstat/vnstat-2.5.ebuild deleted file mode 100644 index 12983f11d965..000000000000 --- a/net-analyzer/vnstat/vnstat-2.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit systemd user - -DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" -HOMEPAGE="https://humdi.net/vnstat/" -SRC_URI="https://humdi.net/vnstat/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="gd selinux test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-db/sqlite - gd? ( media-libs/gd[png] ) -" -DEPEND=" - ${COMMON_DEPEND} - test? ( dev-libs/check ) -" -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" -PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch -) - -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - -src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') -} - -src_install() { - use gd && dobin vnstati - dobin vnstat vnstatd - - exeinto /usr/share/${PN} - newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron - - insinto /etc - doins cfg/vnstat.conf - fowners root:vnstat /etc/vnstat.conf - - keepdir /var/lib/vnstat - fowners vnstat:vnstat /var/lib/vnstat - - newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd - newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd - - systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf - - use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.8 - - newdoc INSTALL README.setup - dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi -} diff --git a/net-analyzer/vnstat/vnstat-9999.ebuild b/net-analyzer/vnstat/vnstat-9999.ebuild index 7299c18fe077..3c0d869f10c3 100644 --- a/net-analyzer/vnstat/vnstat-9999.ebuild +++ b/net-analyzer/vnstat/vnstat-9999.ebuild @@ -1,44 +1,60 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit git-r3 systemd user +EAPI=8 + +inherit systemd tmpfiles DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="https://humdi.net/vnstat/" -EGIT_REPO_URI="https://github.com/vergoh/vnstat" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/vergoh/vnstat" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/teemutoivola.asc + inherit verify-sig + + SRC_URI=" + https://humdi.net/vnstat/${P}.tar.gz + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( + https://humdi.net/vnstat/${P}.tar.gz.asc + https://github.com/vergoh/vnstat/releases/download/v${PV}/${P}.tar.gz.asc + ) + " + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )" +fi LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="gd selinux test" RESTRICT="!test? ( test )" -COMMON_DEPEND=" +RDEPEND=" + acct-group/vnstat + acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) " DEPEND=" - ${COMMON_DEPEND} + ${RDEPEND} test? ( dev-libs/check ) " -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-vnstatd ) -" +RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )" + PATCHES=( - "${FILESDIR}"/${PN}-2.2-conf.patch - "${FILESDIR}"/${PN}-2.2-drop-root.patch - "${FILESDIR}"/${PN}-2.2-run.patch + "${FILESDIR}"/${PN}-2.9-conf.patch ) -pkg_setup() { - enewgroup vnstat - enewuser vnstat -1 -1 /var/lib/vnstat vnstat -} - src_compile() { - emake ${PN} ${PN}d $(usex gd ${PN}i '') + emake \ + ${PN} \ + ${PN}d \ + $(usev gd ${PN}i) } src_install() { @@ -59,11 +75,16 @@ src_install() { newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service - systemd_newtmpfilesd "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf + newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf use gd && doman man/vnstati.1 - doman man/vnstat.1 man/vnstatd.1 - newdoc INSTALL.md README.setup - dodoc CHANGES README.md UPGRADE.md FAQ examples/vnstat.cgi + doman man/vnstat.1 man/vnstatd.8 + + newdoc INSTALL README.setup + dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi +} + +pkg_postinst() { + tmpfiles_process vnstatd.conf } diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index fe849a333b93..4ca8b3c31830 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1 +1,2 @@ -DIST wapiti3-3.0.2.tar.gz 561658 BLAKE2B f013b7d3c23cc3b655503de9f14d53b24d281604344c558791561c900fbe8b1a591c6b56970b41c961b38f65680799bf254887f4613d8e2bc96ddbc0a6aa7c24 SHA512 02f0e2510ce428b6dd89251ec63b5806b34e8e02302c7fa8fb1d9460a4e8c073b4650c066183ef20dc554440721f0b659a6ea30ad38f05865fb0fccc1cca758f +DIST wapiti3-3.1.6.tar.gz 538064 BLAKE2B fca98e05af7e4979ce5cc1360c565748b720f84e640accc9abd6d60017696827fb119228fec37bcf905e6e9f29c07ad5b9041a16fb49a6204777df07dd642bbd SHA512 8017d88c35a232f20f97297f5955154bead777a1b3d3937d29e6a39d2eeb5167764aa81286bfca5b9d200a29c25a6173052ddd8cbfebc1cb18aa84c0e2bb0e22 +DIST wapiti3-3.1.7.tar.gz 537866 BLAKE2B 2c58e20b5f754d5c461103a457aa18cfeb93b4ee7ca4c7525e29642f9cd027ece6f64a547b43b4c257c9cf27ae562ef9cb130e5635f1c13c9fdcda6b3f0a4ebf SHA512 d5a49a0f4c361f699f792b2b0c19a3ca65131534e5b244a8692137d1c63f120d33c47de41a6e4639316b63dd301396ae4f0b26f41259077ca34fba5065a36857 diff --git a/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch new file mode 100644 index 000000000000..8df972aeb1bc --- /dev/null +++ b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch @@ -0,0 +1,14 @@ +diff -Naur wapiti3-3.1.6.orig/setup.py wapiti3-3.1.6/setup.py +--- wapiti3-3.1.6.orig/setup.py 2023-01-31 22:19:30.000000000 +0100 ++++ wapiti3-3.1.6/setup.py 2023-02-09 21:56:43.644507169 +0100 +@@ -81,10 +81,6 @@ + packages=find_packages(exclude=["tests", "tests.*"]), + data_files=doc_and_conf_files, + include_package_data=True, +- scripts=[ +- "bin/wapiti", +- "bin/wapiti-getcookie" +- ], + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml index 59ef9906d471..4de9c0e68a4e 100644 --- a/net-analyzer/wapiti/metadata.xml +++ b/net-analyzer/wapiti/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>voyageur@gentoo.org</email> @@ -14,7 +14,6 @@ Once it gets this list, Wapiti acts like a fuzzer, injecting payloads to see if <remote-id type="sourceforge">wapiti</remote-id> </upstream> <use> - <flag name="kerberos">Support Kerberos authentication</flag> - <flag name="ntlm">Support NTLM authentication</flag> + <!-- Need extra dep <flag name="ntlm">Support NTLM authentication</flag> --> </use> </pkgmetadata> diff --git a/net-analyzer/wapiti/wapiti-3.0.2.ebuild b/net-analyzer/wapiti/wapiti-3.0.2.ebuild deleted file mode 100644 index e54191bc86f1..000000000000 --- a/net-analyzer/wapiti/wapiti-3.0.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE='xml' - -inherit distutils-r1 - -MY_P=${PN}3-${PV} -DESCRIPTION="Web-application vulnerability scanner" -HOMEPAGE="http://wapiti.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="kerberos ntlm test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] - )" -RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}] - kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) - ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" - -S=${WORKDIR}/${MY_P} - -python_prepare_all() { - sed -e 's/"pytest-runner"//' -i setup.py || die - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/wapiti/wapiti-3.1.6.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild new file mode 100644 index 000000000000..cf4e1d331985 --- /dev/null +++ b/net-analyzer/wapiti/wapiti-3.1.6.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +# No 3.11 in loguru +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE='xml(+)' + +inherit distutils-r1 + +MY_P=${PN}3-${PV} +DESCRIPTION="Web-application vulnerability scanner" +HOMEPAGE="https://wapiti.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +# Requires httpx-ntlm (to package) +#IUSE="ntlm" +IUSE="test" + +# httpx requires brotli and socks, so depending on +# dev-python/socksio and dev-python/brotlicffi +RDEPEND=" + >=dev-python/aiocache-0.11.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}] + >=dev-python/aiosqlite-0.17.0[${PYTHON_USEDEP}] + >=dev-python/arsenic-21.8[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup4-4.10.0[${PYTHON_USEDEP}] + dev-python/brotlicffi[${PYTHON_USEDEP}] + >=dev-python/browser-cookie3-0.16.2[${PYTHON_USEDEP}] + >=dev-python/dnspython-2.1.0[${PYTHON_USEDEP}] + >=dev-python/h11-0.14[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23.3[${PYTHON_USEDEP}] + >=dev-python/loguru-0.5.3[${PYTHON_USEDEP}] + >=dev-python/mako-1.1.4[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] + dev-python/socksio[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.4.26[${PYTHON_USEDEP}] + >=dev-python/tld-0.12.5[${PYTHON_USEDEP}] + >=dev-python/yaswfp-0.9.3[${PYTHON_USEDEP}] + >=net-proxy/mitmproxy-9.0.0[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest +# Tests also require unpackaged respx +BDEPEND+=" test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + )" +# Many tests require execution of local test php server +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-3.1.6-setup_scripts.patch ) + +S=${WORKDIR}/${MY_P} + +python_prepare_all() { + sed -e 's/"pytest-runner"//' \ + -e "/DOC_DIR =/s/wapiti/${PF}/" \ + -i setup.py || die + distutils-r1_python_prepare_all +} diff --git a/net-analyzer/wapiti/wapiti-3.1.7.ebuild b/net-analyzer/wapiti/wapiti-3.1.7.ebuild new file mode 100644 index 000000000000..bc4e1553cee3 --- /dev/null +++ b/net-analyzer/wapiti/wapiti-3.1.7.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +# Deps missing for 3.12 +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE='xml(+)' + +inherit distutils-r1 + +MY_P=${PN}3-${PV} +DESCRIPTION="Web-application vulnerability scanner" +HOMEPAGE="https://wapiti.sourceforge.net/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +# Requires httpx-ntlm (to package) +#IUSE="ntlm" +IUSE="test" + +# httpx requires brotli and socks, so depending on +# dev-python/socksio and dev-python/brotlicffi +RDEPEND=" + >=dev-python/aiocache-0.12.0[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}] + >=dev-python/aiosqlite-0.17.0[${PYTHON_USEDEP}] + >=dev-python/arsenic-21.8[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup4-4.10.0[${PYTHON_USEDEP}] + dev-python/brotlicffi[${PYTHON_USEDEP}] + >=dev-python/browser-cookie3-0.16.2[${PYTHON_USEDEP}] + >=dev-python/dnspython-2.1.0[${PYTHON_USEDEP}] + >=dev-python/h11-0.14[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23.3[${PYTHON_USEDEP}] + >=dev-python/loguru-0.5.3[${PYTHON_USEDEP}] + >=dev-python/mako-1.1.4[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] + dev-python/socksio[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.4.26[${PYTHON_USEDEP}] + >=dev-python/tld-0.12.5[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.4.0[${PYTHON_USEDEP}] + >=dev-python/yaswfp-0.9.3[${PYTHON_USEDEP}] + >=net-proxy/mitmproxy-9.0.0[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest +# Tests also require unpackaged respx +BDEPEND+=" test? ( + dev-python/pytest-asyncio[${PYTHON_USEDEP}] + dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/responses[${PYTHON_USEDEP}] + )" +# Many tests require execution of local test php server +RESTRICT="test" + +PATCHES=( "${FILESDIR}"/${PN}-3.1.6-setup_scripts.patch ) + +python_prepare_all() { + sed -e 's/"pytest-runner"//' \ + -e "/DOC_DIR =/s/wapiti/${PF}/" \ + -i setup.py || die + distutils-r1_python_prepare_all +} diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild deleted file mode 100644 index 3b16236056bc..000000000000 --- a/net-analyzer/wapiti/wapiti-9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_6 ) -PYTHON_REQ_USE='xml' - -inherit distutils-r1 git-r3 - -DESCRIPTION="Web-application vulnerability scanner" -HOMEPAGE="http://wapiti.sourceforge.net/" -EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="kerberos ntlm test" - -RESTRICT="!test? ( test )" - -DEPEND="test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-runner[${PYTHON_USEDEP}] - )" -RDEPEND="dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}] - kerberos? ( dev-python/requests-kerberos[${PYTHON_USEDEP}] ) - ntlm? ( dev-python/requests-ntlm[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's/"pytest-runner"//' -i setup.py || die - distutils-r1_python_prepare_all -} diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/webfuzzer/metadata.xml +++ b/net-analyzer/webfuzzer/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild deleted file mode 100644 index 6b40638cf0bc..000000000000 --- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Poor man's web vulnerability scanner" -HOMEPAGE="http://gunzip.altervista.org/g.php?f=projects" -SRC_URI="http://gunzip.altervista.org/webfuzzer/webfuzzer-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -S=${WORKDIR}/devel - -src_prepare() { - sed -i Makefile \ - -e 's|CFLAGS=-g -O3|CFLAGS+=|' \ - -e 's| -o | $(LDFLAGS)&|g' \ - || die -} - -src_compile() { - emake CC=$(tc-getCC) -} - -src_install() { - dodoc CHANGES README TODO - dobin webfuzzer -} diff --git a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild index 66622a2b52db..f0f3240d23e2 100644 --- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild +++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ PATCHES=( ) src_compile() { - emake CC=$(tc-getCC) + emake CC="$(tc-getCC)" } src_install() { diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest index 246b61becd7b..3959fedc5576 100644 --- a/net-analyzer/wireshark/Manifest +++ b/net-analyzer/wireshark/Manifest @@ -1 +1,6 @@ -DIST wireshark-3.2.1.tar.xz 31522124 BLAKE2B 49a83f6c99d54b7a0910f5ace4b46caac680ea73f81d7a3bf7818ccbc6a2fc07cd8f63e1b6ef341cc516220320bb5e035ef6fe82d3d0aba04ec01d6f67f017a1 SHA512 78300f7d597132d54cabe3e51e0f069657d164823852a9f23f1c3c9e6cfdefe5d5ac05c817d06869f4efa4e3cac25ea646cc39d880e5296cf409a8e1a03c2530 +DIST wireshark-4.0.11-signatures.txt 2521 BLAKE2B 3fce906f2050fb990d80b912919c46d0e6e087c66a36bc18e8c57fa19d7ef7e966a26842770370e1211c4e4644deed31091ec929c53c80bfcdb1e472b149bd7c SHA512 d9b15d14b8e061bf2f4aaf0121c295db1992b7cbbb56e67b48fff4110e897f4f0d40304bdeaced2031bc802796a6f3ea7ba62a730f82d7469658924313f301a4 +DIST wireshark-4.0.11.tar.xz 43153680 BLAKE2B 1a90b9c20773758dbcfad85ea9a5c180e846307701ce75a471699544507b6dcf7cab611b5d71056d68ec1646a951729d7df416ef1a9a473bf96d9bf5a7066ebc SHA512 c027b279f9bc761c5c701131df9e57d3f2568129f63c919cd744f6626843eb0e000caebc3e01c9a10eedad35874c01c880d2c736b62f8e841da35c375a37c53f +DIST wireshark-4.0.14-signatures.txt 2521 BLAKE2B 371bf67dc0f36fe46848fef77194e221879db1ff422420949ba0fce4280fb9ee84ca18363046a0ce6fd1e7879ba336c1c16c9bdea13b8d14f14137f59d76212e SHA512 f084d454d1756be35e1e1ed4636cb994bd9c49bd4666d355ce3719d526bf71f9e3cc929b4dca311231d43b046711b223a379c6d915aa260966f0b7bab8a8e352 +DIST wireshark-4.0.14.tar.xz 43186416 BLAKE2B 1b67079cc0f9cdc33ce7e2fce0b49deb4d3016db79099a3bd2003099477a3bac43d4e31d4820c72a92135cca14572ac46406f41e477d794a63e96a6329d30199 SHA512 e88a4b2f41489f3ffe82c4c79c9c89ec521d931a716a5dacaede28c03b0625a0603935e723d5d869f801cfcab440a7d2f310c910707e15f9b0bca0c131398d73 +DIST wireshark-4.2.4-signatures.txt 2706 BLAKE2B 169c7eea2d89f4eedc58e833512cf813dfe76cbb76eb505d47153c1dc55f6d838b7a0187fdee4dae214ea04a3e062dd13f64df460fb16c042a889aac28e4428e SHA512 273182a2364b46bdbe89928e4776cf61ff70b91fcea9cc730ace6cd3501b51388ca9a85552b2ee26a68da42d033fdc8b2cfa279f0c52cc4cdd5278fbccaa8fb9 +DIST wireshark-4.2.4.tar.xz 44986232 BLAKE2B 03806a167a4b055409fadbc54ba338c9d2790df3ac2b9fb547c640c67d7bee6a3f8f19d30549228e494cabf8d303cef42ff098a9e1f45b092589643e568632f5 SHA512 963ac6938c08c6526240c270977057eeff7814686e11d1f3c6641a4838eb66f8d4349e48aa7373d25a8ca8911ad12eb8162f1c55af043f571d74979ddf4fd9a6 diff --git a/net-analyzer/wireshark/files/README.gentoo b/net-analyzer/wireshark/files/README.gentoo new file mode 100644 index 000000000000..a26d2c4dcb76 --- /dev/null +++ b/net-analyzer/wireshark/files/README.gentoo @@ -0,0 +1,3 @@ +NOTE: To capture traffic with wireshark as normal user you have to +add yourself to the pcap group. This security measure ensures +that only trusted users are allowed to sniff your traffic. diff --git a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch b/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch deleted file mode 100644 index 2272ef891c27..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.4-androiddump.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/extcap/androiddump.c -+++ b/extcap/androiddump.c -@@ -438,13 +438,13 @@ - pcap = pcap_open_dead_with_tstamp_precision(encap, PACKET_LENGTH, PCAP_TSTAMP_PRECISION_NANO); - extcap_dumper.dumper.pcap = pcap_dump_open(pcap, fifo); - if (!extcap_dumper.dumper.pcap) { -- g_warning("Can't open %s for saving packets: %s", pcap_geterr(pcap)); -+ g_warning("Can't open %s for saving packets: %s", fifo, pcap_geterr(pcap)); - pcap_close(pcap); - exit(EXIT_CODE_CANNOT_SAVE_LIBPCAP_DUMP); - } - extcap_dumper.encap = encap; - if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { -- g_warning("Write to %s failed: %s", g_strerror(errno)); -+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); - } - #else - wtap_dump_params params = WTAP_DUMP_PARAMS_INIT; -@@ -480,7 +480,7 @@ - - pcap_dump((u_char *) extcap_dumper.dumper.pcap, &pcap_header, buffer); - if (pcap_dump_flush(extcap_dumper.dumper.pcap) == -1) { -- g_warning("Write to %s failed: %s", g_strerror(errno)); -+ g_warning("Write to %s failed: %s", fifo, g_strerror(errno)); - } - #else - int err = 0; diff --git a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch b/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch deleted file mode 100644 index 40082c435010..000000000000 --- a/net-analyzer/wireshark/files/wireshark-2.9.0-tfshark-libm.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2314,6 +2314,7 @@ - - if(BUILD_tfshark) - set(tfshark_LIBS -+ m - ui - wiretap - epan diff --git a/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch new file mode 100644 index 000000000000..18f663b7d814 --- /dev/null +++ b/net-analyzer/wireshark/files/wireshark-3.4.2-cmake-lua-version.patch @@ -0,0 +1,11 @@ +--- a/cmake/modules/FindLUA.cmake ++++ b/cmake/modules/FindLUA.cmake +@@ -19,7 +19,7 @@ + + if(NOT WIN32) + find_package(PkgConfig) +- pkg_search_module(LUA lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51) ++ pkg_search_module(LUA lua) + if(NOT LUA_FOUND) + pkg_search_module(LUA "lua<=5.2.99") + endif() diff --git a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch b/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch deleted file mode 100644 index 5506c6ec2ad4..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-about_dialog-plugins_add_description.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/ui/qt/about_dialog.cpp -+++ b/ui/qt/about_dialog.cpp -@@ -112,7 +112,6 @@ QStringList AuthorListModel::headerColumns() const - return QStringList() << tr("Name") << tr("Email"); - } - --#if defined(HAVE_PLUGINS) || defined(HAVE_LUA) - static void plugins_add_description(const char *name, const char *version, - const char *types, const char *filename, - void *user_data) -@@ -121,7 +120,6 @@ static void plugins_add_description(const char *name, const char *version, - QStringList plugin_row = QStringList() << name << version << types << filename; - *plugin_data << plugin_row; - } --#endif - - PluginListModel::PluginListModel(QObject * parent) : AStringListListModel(parent) - { diff --git a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch b/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch deleted file mode 100644 index 3d3a2a9c9323..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-androiddump-wsutil.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/extcap/CMakeLists.txt -+++ b/extcap/CMakeLists.txt -@@ -91,6 +91,8 @@ if(BUILD_androiddump) - if(HAVE_LIBPCAP) - set(androiddump_LIBS - ui -+ wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${WIN_WS2_32_LIBRARY} - $<$<BOOL:${PCAP_FOUND}>:pcap::pcap> -@@ -102,6 +104,7 @@ if(BUILD_androiddump) - set(androiddump_LIBS - ui - wiretap -+ wsutil - ${GLIB2_LIBRARIES} - ${ZLIB_LIBRARIES} - ${CMAKE_DL_LIBS} diff --git a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch b/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch deleted file mode 100644 index 8cff4bdd0752..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-qtsvg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1058,7 +1058,6 @@ - Qt5LinguistTools - Qt5Multimedia - Qt5PrintSupport -- Qt5Svg - Qt5Widgets - ) - if(APPLE) diff --git a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch b/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch deleted file mode 100644 index c0bfc3acd5a6..000000000000 --- a/net-analyzer/wireshark/files/wireshark-99999999-ui-needs-wiretap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ui/CMakeLists.txt -+++ b/ui/CMakeLists.txt -@@ -76,6 +76,8 @@ - - add_library(ui STATIC ${UI_SRC}) - -+set(ui_LIBS wiretap) -+ - set_target_properties(ui PROPERTIES - LINK_FLAGS "${WS_LINK_FLAGS}" - FOLDER "UI" diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml index 95f198ad6c4a..50ce497801f7 100644 --- a/net-analyzer/wireshark/metadata.xml +++ b/net-analyzer/wireshark/metadata.xml @@ -1,63 +1,70 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> -<email>netmon@gentoo.org</email> -<name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription> -Wireshark is the world's foremost network protocol analyzer, and is the de -facto (and often de jure) standard across many industries and educational -institutions. Wireshark has a rich feature set which includes 1) deep -inspection of hundreds of protocols, with more being added all the time, 2) -live capture and offline analysis, 3) standard three-pane packet browser, 4) -captured network data can be browsed via a GUI, or via the TTY-mode TShark -utility, 5) the most powerful display filters in the industry, 6) rich VoIP -analysis, 7) read/write many different capture file formats: tcpdump (libpcap), -Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network -General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®, -Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer, -Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime, -WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files -compressed with gzip can be decompressed on the fly, 9) live data can be read -from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame -Relay, FDDI, and others, 10) decryption support for many protocols, including -IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules -can be applied to the packet list for quick, intuitive analysis, 12) output can -be exported to XML, PostScript®, CSV, or plain text. -</longdescription> -<use> -<flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> -<flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> -<flag name="brotli">Use <pkg>app-arch/brotli</pkg> for compression/decompression</flag> -<flag name="capinfos">Install capinfos, to print information about capture files</flag> -<flag name="captype">Install captype, to print the file types of capture files</flag> -<flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> -<flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> -<flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> -<flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> -<flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> -<flag name="http2">Use <pkg>net-libs/nghttp2</pkg> for HTTP/2 support</flag> -<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> -<flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> -<flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> -<flag name="minizip">Build with zip file compression support</flag> -<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> -<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> -<flag name="plugin-ifdemo">Install plugin interface demo</flag> -<flag name="plugins">Install plugins</flag> -<flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> -<flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> -<flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> -<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> -<flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag> -<flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> -<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> -<flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> -<flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> -<flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> -<flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> -<flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> -<flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> -</use> + <maintainer type="person"> + <email>sam@gentoo.org</email> + <name>Sam James</name> + </maintainer> + <longdescription> + Wireshark is the world's foremost network protocol analyzer, and is the de + facto (and often de jure) standard across many industries and educational + institutions. Wireshark has a rich feature set which includes 1) deep + inspection of hundreds of protocols, with more being added all the time, 2) + live capture and offline analysis, 3) standard three-pane packet browser, 4) + captured network data can be browsed via a GUI, or via the TTY-mode TShark + utility, 5) the most powerful display filters in the industry, 6) rich VoIP + analysis, 7) read/write many different capture file formats: tcpdump (libpcap), + Catapult DCT2000, Cisco Secure IDS iplog, Microsoft Network Monitor, Network + General Sniffer® (compressed and uncompressed), Sniffer® Pro, and NetXray®, + Network Instruments Observer, Novell LANalyzer, RADCOM WAN/LAN Analyzer, + Shomiti/Finisar Surveyor, Tektronix K12xx, Visual Networks Visual UpTime, + WildPackets EtherPeek/TokenPeek/AiroPeek, and many others, 8) capture files + compressed with gzip can be decompressed on the fly, 9) live data can be read + from Ethernet, IEEE 802.11, PPP/HDLC, ATM, Bluetooth, USB, Token Ring, Frame + Relay, FDDI, and others, 10) decryption support for many protocols, including + IPsec, ISAKMP, Kerberos, SNMPv3, SSL/TLS, WEP, and WPA/WPA2, 11) coloring rules + can be applied to the packet list for quick, intuitive analysis, 12) output can + be exported to XML, PostScript®, CSV, or plain text. + </longdescription> + <use> + <flag name="androiddump">Install androiddump, an extcap interface to capture from Android devices</flag> + <flag name="bcg729">Use <pkg>media-libs/bcg729</pkg> for G.729 codec support in RTP Player</flag> + <flag name="capinfos">Install capinfos, to print information about capture files</flag> + <flag name="captype">Install captype, to print the file types of capture files</flag> + <flag name="ciscodump">Install ciscodump, extcap interface to capture from a remote Cisco router</flag> + <flag name="dftest">Install dftest, to display filter byte-code, for debugging dfilter routines</flag> + <flag name="dpauxmon">Install dpauxmon, an external capture interface (extcap) that captures DisplayPort AUX channel data from linux kernel drivers</flag> + <flag name="dumpcap">Install dumpcap, to dump network traffic from inside wireshark</flag> + <flag name="editcap">Install editcap, to edit and/or translate the format of capture files</flag> + <flag name="http3">Install <pkg>net-libs/nghttp3</pkg> for enhanced HTTP3 analysis</flag> + <flag name="ilbc">Build with iLBC support in RTP Player using <pkg>media-libs/libilbc</pkg></flag> + <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for handling XML configuration in dissectors</flag> + <flag name="maxminddb">Use <pkg>dev-libs/libmaxminddb</pkg> for IP address geolocation</flag> + <flag name="mergecap">Install mergecap, to merge two or more capture files into one</flag> + <flag name="minizip">Build with zip file compression support</flag> + <flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag> + <flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag> + <flag name="plugins">Install plugins</flag> + <flag name="qt6">Build with Qt6 support instead of the default Qt5 for GUI support</flag> + <flag name="randpkt">Install randpkt, a utility for creating pcap trace files full of random packets</flag> + <flag name="randpktdump">Install randpktdump, an extcap interface to provide access to the random packet generator (randpkt)</flag> + <flag name="reordercap">Install reordercap, to reorder input file by timestamp into output file</flag> + <flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag> + <flag name="sdjournal">Install sdjournal, an extcap that captures systemd journal entries</flag> + <flag name="sharkd">Install sharkd, the daemon variant of wireshark</flag> + <flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag> + <flag name="spandsp">Use <pkg>media-libs/spandsp</pkg> for for G.722 and G.726 codec support in the RTP Player</flag> + <flag name="sshdump">Install sshdump, an extcap interface to capture from a remote host through SSH</flag> + <flag name="text2pcap">Install text2pcap, to generate a capture file from an ASCII hexdump of packets</flag> + <flag name="tfshark">Install tfshark, a terminal-based version of the FileShark capability</flag> + <flag name="tshark">Install tshark, to dump and analyzer network traffic from the command line</flag> + <flag name="udpdump">Install udpdump, to get packets exported from a source (like a network device or a GSMTAP producer) that are dumped to a pcap file</flag> + <flag name="wifi">Install wifidump, to dump and analyse 802.11 traffic</flag> + </use> + <upstream> + <changelog>https://www.wireshark.org/news/</changelog> + <remote-id type="github">wireshark/wireshark</remote-id> + <remote-id type="gitlab">wireshark/wireshark</remote-id> + <remote-id type="cpe">cpe:/a:wireshark:wireshark</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/wireshark/wireshark-3.2.1.ebuild b/net-analyzer/wireshark/wireshark-3.2.1.ebuild deleted file mode 100644 index 2427bff3fd55..000000000000 --- a/net-analyzer/wireshark/wireshark-3.2.1.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit fcaps flag-o-matic multilib python-any-r1 qmake-utils user xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc64 x86" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - +text2pcap tfshark +tshark +udpdump zlib -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - minizip? ( sys-libs/zlib[minizip] ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - plugin-ifdemo? ( plugins ) -" -PATCHES=( - "${FILESDIR}"/${PN}-2.4-androiddump.patch - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-2.9.0-tfshark-libm.patch - "${FILESDIR}"/${PN}-99999999-about_dialog-plugins_add_description.patch - "${FILESDIR}"/${PN}-99999999-androiddump-wsutil.patch - "${FILESDIR}"/${PN}-99999999-qtsvg.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_BROTLI=$(usex brotli) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_MINIZIP=$(usex minizip) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake_src_configure -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - local s - for s in 16 32 48 64 128 256 512 1024; do - insinto /usr/share/icons/hicolor/${s}x${s}/apps - newins image/wsicon${s}.png wireshark.png - done - for s in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes - newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wireshark/wireshark-4.0.11.ebuild b/net-analyzer/wireshark/wireshark-4.0.11.ebuild new file mode 100644 index 000000000000..f3715b72f3e7 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.0.11.ebuild @@ -0,0 +1,344 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +PYTHON_COMPAT=( python3_{10..11} ) + +inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + EPYTEST_DESELECT=( + # TODO: investigate + suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream + ) + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + cmake_src_install + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + readme.gentoo_print_elog +} diff --git a/net-analyzer/wireshark/wireshark-4.0.14.ebuild b/net-analyzer/wireshark/wireshark-4.0.14.ebuild new file mode 100644 index 000000000000..808132d6248f --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.0.14.ebuild @@ -0,0 +1,344 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +PYTHON_COMPAT=( python3_{10..11} ) + +inherit fcaps flag-o-matic readme.gentoo-r1 lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +# Tests restricted for now because rely on pytest internals w/ >=3.11 +# See bug #897078 and https://gitlab.com/wireshark/wireshark/-/issues/18740. +RESTRICT="!test? ( test ) test" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch + "${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + EPYTEST_DESELECT=( + # TODO: investigate + suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream + ) + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + cmake_src_install + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi + + readme.gentoo_create_doc +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + readme.gentoo_print_elog +} diff --git a/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild new file mode 100644 index 000000000000..0e0d86d74067 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-4.2.4-r1.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~hppa" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + dev-libs/libxslt + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DLUA_FIND_VERSIONS="${ELUA#lua}" + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + EPYTEST_DESELECT=( + # TODO: investigate + suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream + ) + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-9999.ebuild b/net-analyzer/wireshark/wireshark-9999.ebuild new file mode 100644 index 000000000000..0e0d86d74067 --- /dev/null +++ b/net-analyzer/wireshark/wireshark-9999.ebuild @@ -0,0 +1,348 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..2} ) +# TODO: check cmake/modules/UseAsn2Wrs.cmake for 3.12 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake + +DESCRIPTION="Network protocol analyzer (sniffer)" +HOMEPAGE="https://www.wireshark.org/" + +if [[ ${PV} == *9999* ]] ; then + EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark" + inherit git-r3 +else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/wireshark.asc + inherit verify-sig + + SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz" + SRC_URI+=" verify-sig? ( https://www.wireshark.org/download/SIGNATURES-${PV}.txt -> ${P}-signatures.txt )" + S="${WORKDIR}/${P/_/}" + + if [[ ${PV} != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm64 ~hppa" + fi +fi + +LICENSE="GPL-2" +SLOT="0/${PV}" +IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon" +IUSE+=" +dumpcap +editcap +gui http2 http3 ilbc kerberos libxml2 lua lz4 maxminddb" +IUSE+=" +mergecap +minizip +netlink opus +plugins +pcap qt6 +randpkt" +IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl" +IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump wifi zlib +zstd" + +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) +" + +RESTRICT="!test? ( test )" + +# bug #753062 for speexdsp +RDEPEND=" + acct-group/pcap + >=dev-libs/glib-2.50.0:2 + dev-libs/libpcre2 + >=net-dns/c-ares-1.13.0:= + >=dev-libs/libgcrypt-1.8.0:= + media-libs/speexdsp + bcg729? ( media-libs/bcg729 ) + brotli? ( app-arch/brotli:= ) + ciscodump? ( >=net-libs/libssh-0.6:= ) + filecaps? ( sys-libs/libcap ) + http2? ( >=net-libs/nghttp2-1.11.0:= ) + http3? ( net-libs/nghttp3 ) + ilbc? ( media-libs/libilbc:= ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2 ) + lua? ( ${LUA_DEPS} ) + lz4? ( app-arch/lz4:= ) + maxminddb? ( dev-libs/libmaxminddb:= ) + minizip? ( sys-libs/zlib[minizip] ) + netlink? ( dev-libs/libnl:3 ) + opus? ( media-libs/opus ) + pcap? ( net-libs/libpcap ) + gui? ( + x11-misc/xdg-utils + qt6? ( + dev-qt/qtbase:6[concurrent,dbus,gui,widgets] + dev-qt/qt5compat:6 + dev-qt/qtmultimedia:6 + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + ) + ) + sbc? ( media-libs/sbc ) + sdjournal? ( sys-apps/systemd:= ) + smi? ( net-libs/libsmi ) + snappy? ( app-arch/snappy:= ) + spandsp? ( media-libs/spandsp:= ) + sshdump? ( >=net-libs/libssh-0.6:= ) + ssl? ( >=net-libs/gnutls-3.5.8:= ) + wifi? ( >=net-libs/libssh-0.6:= ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd:= ) +" +DEPEND=" + ${RDEPEND} + gui? ( + !qt6? ( + dev-qt/qtdeclarative:5 + ) + ) +" +# TODO: 4.0.0_rc1 release notes say: +# "Perl is no longer required to build Wireshark, but may be required to build some source code files and run code analysis checks." +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + app-alternatives/lex + sys-devel/gettext + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-ruby/asciidoctor + dev-libs/libxslt + ) + gui? ( + qt6? ( + dev-qt/qttools:6[linguist] + ) + !qt6? ( + dev-qt/linguist-tools:5 + ) + ) + test? ( + $(python_gen_any_dep ' + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ') + ) +" +RDEPEND=" + ${RDEPEND} + gui? ( virtual/freedesktop-icon-theme ) + selinux? ( sec-policy/selinux-wireshark ) +" + +if [[ ${PV} != *9999* ]] ; then + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-wireshark )" +fi + +PATCHES=( + "${FILESDIR}"/${PN}-2.6.0-redhat.patch +) + +python_check_deps() { + use test || return 0 + + python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == *9999* ]] ; then + git-r3_src_unpack + else + if use verify-sig ; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + ${P}-signatures.txt \ + openssl-dgst \ + ${P}.tar.xz + cd "${WORKDIR}" || die + fi + + default + fi +} + +src_configure() { + local mycmakeargs + + python_setup + + # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass + # --with-ssl to ./configure. (Mimics code from acinclude.m4). + if use kerberos ; then + case $(krb5-config --libs) in + *-lcrypto*) + ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." + ewarn "Note there are annoying license incompatibilities between the OpenSSL" + ewarn "license and the GPL, so do your check before distributing such package." + mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) + ;; + esac + fi + + if use gui ; then + append-cxxflags -fPIC -DPIC + fi + + # crashes at runtime + # https://bugs.gentoo.org/754021 + filter-lto + + mycmakeargs+=( + -DPython3_EXECUTABLE="${PYTHON}" + -DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc) + + $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) + $(usex gui LRELEASE=$(qt5_get_bindir)/lrelease '') + $(usex gui MOC=$(qt5_get_bindir)/moc '') + $(usex gui RCC=$(qt5_get_bindir)/rcc '') + $(usex gui UIC=$(qt5_get_bindir)/uic '') + + -DBUILD_androiddump=$(usex androiddump) + -DBUILD_capinfos=$(usex capinfos) + -DBUILD_captype=$(usex captype) + -DBUILD_ciscodump=$(usex ciscodump) + -DBUILD_dftest=$(usex dftest) + -DBUILD_dpauxmon=$(usex dpauxmon) + -DBUILD_dumpcap=$(usex dumpcap) + -DBUILD_editcap=$(usex editcap) + -DBUILD_mergecap=$(usex mergecap) + -DBUILD_mmdbresolve=$(usex maxminddb) + -DBUILD_randpkt=$(usex randpkt) + -DBUILD_randpktdump=$(usex randpktdump) + -DBUILD_reordercap=$(usex reordercap) + -DBUILD_sdjournal=$(usex sdjournal) + -DBUILD_sharkd=$(usex sharkd) + -DBUILD_sshdump=$(usex sshdump) + -DBUILD_text2pcap=$(usex text2pcap) + -DBUILD_tfshark=$(usex tfshark) + -DBUILD_tshark=$(usex tshark) + -DBUILD_udpdump=$(usex udpdump) + + -DBUILD_wireshark=$(usex gui) + -DUSE_qt6=$(usex qt6) + + -DENABLE_WERROR=OFF + -DENABLE_BCG729=$(usex bcg729) + -DENABLE_BROTLI=$(usex brotli) + -DENABLE_CAP=$(usex filecaps caps) + -DENABLE_GNUTLS=$(usex ssl) + -DENABLE_ILBC=$(usex ilbc) + -DENABLE_KERBEROS=$(usex kerberos) + -DENABLE_LIBXML2=$(usex libxml2) + # only appends -flto + -DENABLE_LTO=OFF + -DENABLE_LUA=$(usex lua) + -DLUA_FIND_VERSIONS="${ELUA#lua}" + -DENABLE_LZ4=$(usex lz4) + -DENABLE_MINIZIP=$(usex minizip) + -DENABLE_NETLINK=$(usex netlink) + -DENABLE_NGHTTP2=$(usex http2) + -DENABLE_NGHTTP3=$(usex http3) + -DENABLE_OPUS=$(usex opus) + -DENABLE_PCAP=$(usex pcap) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_PLUGIN_IFDEMO=OFF + -DENABLE_SBC=$(usex sbc) + -DENABLE_SMI=$(usex smi) + -DENABLE_SNAPPY=$(usex snappy) + -DENABLE_SPANDSP=$(usex spandsp) + -DBUILD_wifidump=$(usex wifi) + -DENABLE_ZLIB=$(usex zlib) + -DENABLE_ZSTD=$(usex zstd) + ) + + cmake_src_configure +} + +src_test() { + cmake_build test-programs + + EPYTEST_DESELECT=( + # TODO: investigate + suite_follow_multistream.py::case_follow_multistream::test_follow_http2_multistream + ) + + # https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html + epytest \ + --disable-capture \ + --skip-missing-programs=all \ + --program-path "${BUILD_DIR}"/run +} + +src_install() { + # bug #928577 + # https://gitlab.com/wireshark/wireshark/-/commit/fe7bfdf6caac9204ab5f34eeba7b0f4a0314d3cd + cmake_src_install install-headers + + # FAQ is not required as is installed from help/faq.txt + dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* + + # install headers + insinto /usr/include/wireshark + doins "${BUILD_DIR}"/config.h + + # If trying to remove this, try build e.g. libvirt first! + # At last check, Fedora is still doing this too. + local dir dirs=( + epan + epan/crypt + epan/dfilter + epan/dissectors + epan/ftypes + wiretap + wsutil + wsutil/wmem + ) + + for dir in "${dirs[@]}" ; do + insinto /usr/include/wireshark/${dir} + doins ${dir}/*.h + done + + if use gui ; then + local s + + for s in 16 32 48 64 128 256 512 1024 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/apps + newins resources/icons/wsicon${s}.png wireshark.png + done + + for s in 16 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes + newins resources/icons//WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png + done + fi + + if [[ -d "${ED}"/usr/share/appdata ]] ; then + rm -r "${ED}"/usr/share/appdata || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + # Add group for users allowed to sniff. + chgrp pcap "${EROOT}"/usr/bin/dumpcap + + if use dumpcap && use pcap ; then + fcaps -o 0 -g pcap -m 4710 -M 0710 \ + cap_dac_read_search,cap_net_raw,cap_net_admin \ + "${EROOT}"/usr/bin/dumpcap + fi + + ewarn "NOTE: To capture traffic with wireshark as normal user you have to" + ewarn "add yourself to the pcap group. This security measure ensures" + ewarn "that only trusted users are allowed to sniff your traffic." +} diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild deleted file mode 100644 index 6f9470ca6ee5..000000000000 --- a/net-analyzer/wireshark/wireshark-99999999.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) -inherit fcaps flag-o-matic git-r3 multilib python-any-r1 qmake-utils user xdg-utils cmake - -DESCRIPTION="A network protocol analyzer formerly known as ethereal" -HOMEPAGE="https://www.wireshark.org/" -EGIT_REPO_URI="https://code.wireshark.org/review/wireshark" -LICENSE="GPL-2" - -SLOT="0/${PV}" -KEYWORDS="" -IUSE=" - androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon - +dumpcap +editcap http2 kerberos libxml2 lua lz4 maxminddb +mergecap - +minizip +netlink +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump - +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal - +text2pcap tfshark +tshark +udpdump zlib -" -S=${WORKDIR}/${P/_/} - -CDEPEND=" - >=dev-libs/glib-2.32:2 - >=net-dns/c-ares-1.5 - dev-libs/libgcrypt:0 - bcg729? ( media-libs/bcg729 ) - brotli? ( app-arch/brotli ) - ciscodump? ( >=net-libs/libssh-0.6 ) - filecaps? ( sys-libs/libcap ) - http2? ( net-libs/nghttp2 ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2 ) - lua? ( >=dev-lang/lua-5.1:* ) - lz4? ( app-arch/lz4 ) - maxminddb? ( dev-libs/libmaxminddb ) - minizip? ( sys-libs/zlib[minizip] ) - netlink? ( dev-libs/libnl:3 ) - pcap? ( net-libs/libpcap ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - x11-misc/xdg-utils - ) - sbc? ( media-libs/sbc ) - sdjournal? ( sys-apps/systemd ) - smi? ( net-libs/libsmi ) - snappy? ( app-arch/snappy ) - spandsp? ( media-libs/spandsp ) - sshdump? ( >=net-libs/libssh-0.6 ) - ssl? ( net-libs/gnutls:= ) - zlib? ( sys-libs/zlib ) -" -# We need perl for `pod2html`. The rest of the perl stuff is to block older -# and broken installs. #455122 -DEPEND=" - ${CDEPEND} - ${PYTHON_DEPS} -" -BDEPEND=" - dev-lang/perl - sys-devel/bison - sys-devel/flex - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-ruby/asciidoctor - ) - qt5? ( - dev-qt/linguist-tools:5 - ) -" -RDEPEND=" - ${CDEPEND} - qt5? ( virtual/freedesktop-icon-theme ) - selinux? ( sec-policy/selinux-wireshark ) -" -REQUIRED_USE=" - plugin-ifdemo? ( plugins ) -" -PATCHES=( - "${FILESDIR}"/${PN}-2.6.0-redhat.patch - "${FILESDIR}"/${PN}-99999999-ui-needs-wiretap.patch -) - -pkg_setup() { - enewgroup wireshark -} - -src_configure() { - local mycmakeargs - - # Workaround bug #213705. If krb5-config --libs has -lcrypto then pass - # --with-ssl to ./configure. (Mimics code from acinclude.m4). - if use kerberos; then - case $(krb5-config --libs) in - *-lcrypto*) - ewarn "Kerberos was built with ssl support: linkage with openssl is enabled." - ewarn "Note there are annoying license incompatibilities between the OpenSSL" - ewarn "license and the GPL, so do your check before distributing such package." - mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) ) - ;; - esac - fi - - if use qt5; then - export QT_MIN_VERSION=5.3.0 - append-cxxflags -fPIC -DPIC - fi - - python_setup - - mycmakeargs+=( - $(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes) - $(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '') - $(usex qt5 MOC=$(qt5_get_bindir)/moc '') - $(usex qt5 RCC=$(qt5_get_bindir)/rcc '') - $(usex qt5 UIC=$(qt5_get_bindir)/uic '') - -DBUILD_androiddump=$(usex androiddump) - -DBUILD_capinfos=$(usex capinfos) - -DBUILD_captype=$(usex captype) - -DBUILD_ciscodump=$(usex ciscodump) - -DBUILD_dftest=$(usex dftest) - -DBUILD_dpauxmon=$(usex dpauxmon) - -DBUILD_dumpcap=$(usex dumpcap) - -DBUILD_editcap=$(usex editcap) - -DBUILD_mergecap=$(usex mergecap) - -DBUILD_mmdbresolve=$(usex maxminddb) - -DBUILD_randpkt=$(usex randpkt) - -DBUILD_randpktdump=$(usex randpktdump) - -DBUILD_reordercap=$(usex reordercap) - -DBUILD_sdjournal=$(usex sdjournal) - -DBUILD_sharkd=$(usex sharkd) - -DBUILD_sshdump=$(usex sshdump) - -DBUILD_text2pcap=$(usex text2pcap) - -DBUILD_tfshark=$(usex tfshark) - -DBUILD_tshark=$(usex tshark) - -DBUILD_udpdump=$(usex udpdump) - -DBUILD_wireshark=$(usex qt5) - -DCMAKE_INSTALL_DOCDIR="${EROOT}/usr/share/doc/${PF}" - -DDISABLE_WERROR=yes - -DENABLE_BCG729=$(usex bcg729) - -DENABLE_BROTLI=$(usex brotli) - -DENABLE_CAP=$(usex filecaps caps) - -DENABLE_GNUTLS=$(usex ssl) - -DENABLE_KERBEROS=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_LUA=$(usex lua) - -DENABLE_LZ4=$(usex lz4) - -DENABLE_MINIZIP=$(usex minizip) - -DENABLE_NETLINK=$(usex netlink) - -DENABLE_NGHTTP2=$(usex http2) - -DENABLE_PCAP=$(usex pcap) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo) - -DENABLE_SBC=$(usex sbc) - -DENABLE_SMI=$(usex smi) - -DENABLE_SNAPPY=$(usex snappy) - -DENABLE_SPANDSP=$(usex spandsp) - -DENABLE_ZLIB=$(usex zlib) - ) - - cmake_src_configure -} - -src_test() { - cmake_src_test -} - -src_install() { - cmake_src_install - - # FAQ is not required as is installed from help/faq.txt - dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README* - - # install headers - insinto /usr/include/wireshark - doins ws_diag_control.h ws_symbol_export.h \ - "${BUILD_DIR}"/config.h "${BUILD_DIR}"/version.h - - local dir dirs=( - epan - epan/crypt - epan/dfilter - epan/dissectors - epan/ftypes - epan/wmem - wiretap - wsutil - ) - for dir in "${dirs[@]}" - do - insinto /usr/include/wireshark/${dir} - doins ${dir}/*.h - done - - #with the above this really shouldn't be needed, but things may be looking - # in wiretap/ instead of wireshark/wiretap/ - insinto /usr/include/wiretap - doins wiretap/wtap.h - - if use qt5; then - local s - for s in 16 32 48 64 128 256 512 1024; do - insinto /usr/share/icons/hicolor/${s}x${s}/apps - newins image/wsicon${s}.png wireshark.png - done - for s in 16 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes - newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png - done - fi -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update - - # Add group for users allowed to sniff. - enewgroup wireshark - chgrp wireshark "${EROOT}"/usr/bin/dumpcap - - if use dumpcap && use pcap; then - fcaps -o 0 -g wireshark -m 4710 -M 0710 \ - cap_dac_read_search,cap_net_raw,cap_net_admin \ - "${EROOT}"/usr/bin/dumpcap - fi - - ewarn "NOTE: To capture traffic with wireshark as normal user you have to" - ewarn "add yourself to the wireshark group. This security measure ensures" - ewarn "that only trusted users are allowed to sniff your traffic." -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/net-analyzer/wtfis/Manifest b/net-analyzer/wtfis/Manifest new file mode 100644 index 000000000000..2f306e359f37 --- /dev/null +++ b/net-analyzer/wtfis/Manifest @@ -0,0 +1,2 @@ +DIST wtfis-0.7.1.gh.tar.gz 548395 BLAKE2B fbcc19358a0a357fdc9f4b5f27d4bda60e20a118c3c3b7cdfd90fad956d2ef0375efe4f0c8a3a94bfa8a6657d5bb710eaacb403b8c3d446921b963e3e8909442 SHA512 9a77c17e1e922e6d17aba9c6cc7364c8b65bc401cbca311280a4eef958056238aef87c2a8891c1bce5848083d1a7e5e00b0b63ead5ffefdea80ae7baee40c845 +DIST wtfis-0.8.0.gh.tar.gz 576810 BLAKE2B ac4573893aacc2533fe9ed3248613d3bf5ffb390a2dcbf01fd0590093a7bf753ee8da6e67b60142111726d55928a7913bb3f7ae1a22474876dec1cb3d81d3a3c SHA512 b709948d0ccd75472d9ccc0bfc4cec943700e57eccc42cc486075b8b89516fff054b6df92d6b23999987bab97b80db755de575cba4b56e2bd01a6bf24f058798 diff --git a/net-analyzer/wtfis/metadata.xml b/net-analyzer/wtfis/metadata.xml new file mode 100644 index 000000000000..495aa987e99e --- /dev/null +++ b/net-analyzer/wtfis/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription> + wtfis is a commandline tool that gathers information about a domain, + FQDN or IP address using various OSINT services. Unlike other tools of + its kind, it's built specifically for human consumption, providing + results that are pretty (YMMV) and easy to read and understand. + </longdescription> + <upstream> + <remote-id type="github">pirxthepilot/wtfis</remote-id> + <remote-id type="pypi">wtfis</remote-id> + </upstream> +</pkgmetadata> diff --git a/net-analyzer/wtfis/wtfis-0.7.1.ebuild b/net-analyzer/wtfis/wtfis-0.7.1.ebuild new file mode 100644 index 000000000000..08106d305363 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.7.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-2.0.3[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + >=dev-python/rich-13.4.2[${PYTHON_USEDEP}] + <dev-python/rich-13.5.0[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.29.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/wtfis/wtfis-0.8.0.ebuild b/net-analyzer/wtfis/wtfis-0.8.0.ebuild new file mode 100644 index 000000000000..eb5e05b23963 --- /dev/null +++ b/net-analyzer/wtfis/wtfis-0.8.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..11} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="amd64 ~loong x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-2.0.3[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + >=dev-python/rich-13.4.2[${PYTHON_USEDEP}] + <dev-python/rich-13.5.0[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.29.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/wtfis/wtfis-9999.ebuild b/net-analyzer/wtfis/wtfis-9999.ebuild new file mode 100644 index 000000000000..27c081820a3e --- /dev/null +++ b/net-analyzer/wtfis/wtfis-9999.ebuild @@ -0,0 +1,39 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=hatchling +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 + +DESCRIPTION="Passive hostname, domain and IP lookup tool for non-robots" +HOMEPAGE="https://github.com/pirxthepilot/wtfis" + +if [[ ${PV} = "9999" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/pirxthepilot/wtfis.git" +else + SRC_URI="https://github.com/pirxthepilot/wtfis/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="~amd64 ~loong ~x86" +fi + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + >=dev-python/pydantic-2.0.3[${PYTHON_USEDEP}] + >=dev-python/python-dotenv-1.0.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.31.0[${PYTHON_USEDEP}] + >=dev-python/rich-13.4.2[${PYTHON_USEDEP}] + <dev-python/rich-13.5.0[${PYTHON_USEDEP}] + >=net-analyzer/shodan-1.29.1[${PYTHON_USEDEP}] +" +BDEPEND=" + test? ( + dev-python/freezegun[${PYTHON_USEDEP}] + dev-python/rich[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest diff --git a/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch new file mode 100644 index 000000000000..3bfbd619c112 --- /dev/null +++ b/net-analyzer/xnetload/files/xnetload-1.11.3-libdir.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ CC = gcc + + # The next two lines are for building an optimized and stripped program. + CFLAGS += -Wall -DNDEBUG -I/usr/include +-LFLAGS = $(LDFLAGS) -L/usr/lib ++LFLAGS = $(LDFLAGS) + + # These three lines are for building Athlon optimized programs on my system. + #CC=gcc-3.1 diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/xnetload/metadata.xml +++ b/net-analyzer/xnetload/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild index d1caa9933a52..1b3e67000f2a 100644 --- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild +++ b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild @@ -1,14 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + inherit toolchain-funcs -DESCRIPTION="displays a count and a graph of the traffic over a specified network connection" -LICENSE="GPL-2" -HOMEPAGE="http://www.xs4all.nl/~rsmith/software/" -SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +DESCRIPTION="Displays a count and a graph of the traffic over a specified network connection" +HOMEPAGE="https://www.xs4all.nl/~rsmith/software/" +SRC_URI="https://www.xs4all.nl/~rsmith/software/${P}.tar.gz" +LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" @@ -19,13 +20,19 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.11.3-libdir.patch" +) + src_prepare() { sed -i \ - -e 's:CFLAGS = -pipe -O2 -Wall:CFLAGS += -Wall:' \ - -e 's:LFLAGS = -s -pipe:LFLAGS = $(LDFLAGS):' \ + -e 's;CFLAGS = -pipe -O2 -Wall;CFLAGS += -Wall;' \ + -e 's;LFLAGS = -s -pipe;LFLAGS = $(LDFLAGS);' \ -e 's:gcc -MM:$(CC) -MM:' \ -e 's:/usr/X11R6:/usr:g' \ Makefile || die + + default } src_compile() { diff --git a/net-analyzer/xprobe/files/xprobe-0.3-cxx11.patch b/net-analyzer/xprobe/files/xprobe-0.3-cxx11.patch new file mode 100644 index 000000000000..7ec38a9c2756 --- /dev/null +++ b/net-analyzer/xprobe/files/xprobe-0.3-cxx11.patch @@ -0,0 +1,11 @@ +--- a/src/defines.h.in ++++ b/src/defines.h.in +@@ -24,7 +24,7 @@ + + #define VERSION "@VERSION@" + #define BANNER \ +-"\nXprobe2 v."VERSION\ ++"\nXprobe2 v." VERSION \ + " Copyright (c) 2002-2005 fyodor@o0o.nu, ofir@sys-security.com, meder@o0o.nu"\ + "\n" + diff --git a/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch new file mode 100644 index 000000000000..534d17cb019b --- /dev/null +++ b/net-analyzer/xprobe/files/xprobe-0.3-gcc-12.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/852119 +--- a/libs-external/USI++/src/datalink.cc ++++ b/libs-external/USI++/src/datalink.cc +@@ -15,6 +15,7 @@ + #include <string.h> + #include <unistd.h> + #include <errno.h> ++#include <ctime> + #include <sys/ioctl.h> + + #ifdef IMMEDIATE +--- a/libs-external/USI++/src/tcp.cc ++++ b/libs-external/USI++/src/tcp.cc +@@ -16,6 +16,7 @@ + #include <string.h> + #include <stdlib.h> + #include <errno.h> ++#include <ctime> + + namespace usipp { + diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml index 0552dd858870..5832f45c51f6 100644 --- a/net-analyzer/xprobe/metadata.xml +++ b/net-analyzer/xprobe/metadata.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> <name>Gentoo network monitoring and analysis project</name> </maintainer> <longdescription> -Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to -xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting. -xprobe2 relies on fuzzy signature matching, probabilistic guesses, multiple -matches simultaneously, and a signature database. -</longdescription> + Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to + xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting. + xprobe2 relies on fuzzy signature matching, probabilistic guesses, multiple + matches simultaneously, and a signature database. + </longdescription> <upstream> <remote-id type="sourceforge">xprobe</remote-id> </upstream> diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild index fd60ee96cc6d..8416f8e294ac 100644 --- a/net-analyzer/xprobe/xprobe-0.3.ebuild +++ b/net-analyzer/xprobe/xprobe-0.3-r1.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils +EAPI=7 + +inherit toolchain-funcs MY_P=${PN}2-${PV} DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2" HOMEPAGE="http://sys-security.com/blog/xprobe2" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} LICENSE="GPL-2" SLOT="0" @@ -17,14 +19,23 @@ KEYWORDS="~amd64 ~ppc ~sparc x86" DEPEND="net-libs/libpcap" RDEPEND="${DEPEND}" -S=${WORKDIR}/${MY_P} +PATCHES=( + "${FILESDIR}"/${P}-gcc43.patch + "${FILESDIR}"/${P}-cxx11.patch + "${FILESDIR}"/${P}-gcc-12.patch +) src_prepare() { - epatch "${FILESDIR}"/${P}-gcc43.patch + default + sed -i -e 's:strip:true:' src/Makefile.in || die + sed -i -e 's:ar cr:$(AR) cr:g' $(find -name '*Makefile*') || die + + tc-export AR } src_install() { default + dodoc AUTHORS CHANGELOG CREDITS README TODO docs/*.{txt,pdf} } diff --git a/net-analyzer/yersinia/Manifest b/net-analyzer/yersinia/Manifest index 3795e6db1ced..36a60ac06592 100644 --- a/net-analyzer/yersinia/Manifest +++ b/net-analyzer/yersinia/Manifest @@ -1,2 +1 @@ -DIST yersinia-0.7.3.tar.gz 378124 BLAKE2B 032015045cd5683c8853504bd821ebb3decbeaeea933a14983eec6498de33db79771ddeb08934c6ddf82db620aba89c84ac8c369af25e7bc19d820395ba68b57 SHA512 60a1b58e6d76448e9332656645b468a6aa66afa0f45ea4b70a929651194a294b9b559bbe5fbacaeb475126e7ac248cd97c29f3177e5080286b2f551f1400d339 DIST yersinia-0.8.2.tar.gz 387889 BLAKE2B 67fe92b9cd1253874c61fa38c8e89e023f7d0ec3b83fe3001b5bc203d4033e36cb94b453ed56426b34d942036a143bd135f247466425337478f292797a433652 SHA512 2c7c89f19b6791150c472a6066b6ffaf9ac5b3d1a3d2e6a27f91293bba9a0f72d147266731e5e2670e4bf7e67ccf04b6e353071ca42d3d281b25126c9bfcb1dd diff --git a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch new file mode 100644 index 000000000000..427be023a021 --- /dev/null +++ b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16-deux.patch @@ -0,0 +1,38 @@ +https://github.com/tomac/yersinia/commit/867b309eced9e02b63412855440cd4f5f7727431 + +From 5db403f8aa4101589f33246eaa23b5f31228fc3b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Sat, 19 Nov 2022 18:43:26 +0000 +Subject: [PATCH] configure: fix -Wimplicit-function-declaration, + -Wimplicit-int + +Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default. Unfortunately, +this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Followup to 6414681ae99d6a0f460f827648f114aa3cb2e419. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -79,8 +79,10 @@ AC_DEFUN([AC_LBL_UNALIGNED_ACCESS], + # include <sys/types.h> + # include <sys/wait.h> + # include <stdio.h> ++# include <stdlib.h> ++# include <unistd.h> + unsigned char a[[5]] = { 1, 2, 3, 4, 5 }; +- main() { ++ int main(void) { + unsigned int i; + pid_t pid; + int status; + diff --git a/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch new file mode 100644 index 000000000000..f2366c02dfb4 --- /dev/null +++ b/net-analyzer/yersinia/files/yersinia-0.8.2-configure-clang16.patch @@ -0,0 +1,53 @@ +https://github.com/tomac/yersinia/pull/76 + +From ec9d31932fca39e3160b0d0bfd0383db82ff5bcf Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 16 Nov 2022 23:10:45 +0000 +Subject: [PATCH] configure: fix -Wimplicit-function-declaration, + -Wstrict-prototypes + +Clang 16 makes -Wimplicit-function-declaration an error by default. Unfortunately, +this can lead to misconfiguration or miscompilation of software as configure +tests may then return the wrong result. + +For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [2], +or the (new) c-std-porting mailing list [3]. + +[0] https://lwn.net/Articles/913505/ +[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213 +[2] https://wiki.gentoo.org/wiki/Modern_C_porting +[3] hosted at lists.linux.dev. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.in ++++ b/configure.in +@@ -233,12 +233,13 @@ dnl fi + + AC_MSG_CHECKING(if libnet is at least version 1.1.2) + AC_TRY_RUN([ +-#include<stdio.h> +-#include<libnet.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <libnet.h> + #define HOPE_MAJOR 1 + #define HOPE_MEDIUM 1 + #define HOPE_MINOR 2 +-int main() ++int main(void) + { + unsigned int major,medium,minor,current, desired; + desired = HOPE_MAJOR*10000 + HOPE_MEDIUM*100 + HOPE_MINOR; +@@ -419,9 +420,9 @@ AC_CHECK_FUNCS(strerror_r, have_strerror_r=yes,have_strerror_r=no) + if test $have_strerror_r = yes; then + AC_MSG_CHECKING(if strerror_r is on glibc version >= 2.0) + AC_TRY_RUN([ +-#include <stdio.h> ++#include <stdlib.h> + #include <features.h> +-int main() ++int main(void) + { + #if defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 + exit(0); + diff --git a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch b/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch deleted file mode 100644 index b5bf566c107d..000000000000 --- a/net-analyzer/yersinia/files/yersinia-9999-tinfo.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -467,6 +467,7 @@ - AC_DEFINE(HAVE_REMOTE_ADMIN) - fi - -+PKG_CHECK_MODULES(ncurses,ncurses) - - dnl Curses detection: Munged from Midnight Commander's configure.in - dnl -@@ -616,6 +617,16 @@ - AC_DEFINE(USE_NCURSES) - AC_DEFINE(HAS_CURSES) - has_curses=true -+ else -+ if test "$ncurses_LIBS" ; then -+ CURSES_LIBS="$ncurses_LIBS" -+ CURSES_INCLUDEDIR="$ncurses_CFLAGS" -+ search_ncurses=false -+ screen_manager="ncurses" -+ AC_DEFINE(USE_NCURSES) -+ AC_DEFINE(HAS_CURSES) -+ has_curses=true -+ fi - fi - ) - diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml index a0e9a2ee4c47..6356df3a0a4c 100644 --- a/net-analyzer/yersinia/metadata.xml +++ b/net-analyzer/yersinia/metadata.xml @@ -1,13 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>netmon@gentoo.org</email> - <name>Gentoo network monitoring and analysis project</name> -</maintainer> -<longdescription> -Yersinia is a network tool designed to take advantage of some weakeness -in different network protocols. It intends to be a solid framework for -analyzing and testing the deployed networks and systems. -</longdescription> + <maintainer type="project"> + <email>netmon@gentoo.org</email> + <name>Gentoo network monitoring and analysis project</name> + </maintainer> + <longdescription> + Yersinia is a network tool designed to take advantage of some weakeness + in different network protocols. It intends to be a solid framework for + analyzing and testing the deployed networks and systems. + </longdescription> + <upstream> + <remote-id type="github">tomac/yersinia</remote-id> + </upstream> </pkgmetadata> diff --git a/net-analyzer/yersinia/yersinia-0.7.3.ebuild b/net-analyzer/yersinia/yersinia-0.7.3.ebuild deleted file mode 100644 index bc346d8cf0d3..000000000000 --- a/net-analyzer/yersinia/yersinia-0.7.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="A layer 2 attack framework" -HOMEPAGE="http://www.yersinia.net/" -SRC_URI="http://www.yersinia.net/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gtk ncurses" - -RDEPEND=" - ncurses? ( >=sys-libs/ncurses-5.5 ) - gtk? ( =x11-libs/gtk+-2* ) - >=net-libs/libnet-1.1.2 - >=net-libs/libpcap-0.9.4 -" -DEPEND=" - virtual/pkgconfig - ${RDEPEND} -" - -DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch - epatch "${FILESDIR}"/${PN}-0.7.3-tinfo.patch - - if ! use gtk; then - #bug #514802 - sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die - fi - - eautoreconf -} - -src_configure() { - econf \ - --enable-admin \ - --with-pcap-includes=/usr/include \ - $(use_with ncurses) \ - $(use_enable gtk) -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/net-analyzer/yersinia/yersinia-0.8.2.ebuild b/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild index 669aa0df2290..be2de6bbc614 100644 --- a/net-analyzer/yersinia/yersinia-0.8.2.ebuild +++ b/net-analyzer/yersinia/yersinia-0.8.2-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools flag-o-matic DESCRIPTION="A framework for layer 2 attacks" @@ -10,34 +11,36 @@ SRC_URI="https://github.com/tomac/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gtk ncurses" RDEPEND=" + >=net-libs/libnet-1.1.2 + >=net-libs/libpcap-0.9.4 ncurses? ( >=sys-libs/ncurses-5.5:= ) gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf =x11-libs/gtk+-2* ) - >=net-libs/libnet-1.1.2 - >=net-libs/libpcap-0.9.4 -" -DEPEND=" - virtual/pkgconfig - ${RDEPEND} " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) + PATCHES=( "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch "${FILESDIR}"/${PN}-0.7.3-tinfo.patch + "${FILESDIR}"/${PN}-0.8.2-configure-clang16.patch + "${FILESDIR}"/${PN}-0.8.2-configure-clang16-deux.patch ) src_prepare() { default if ! use gtk; then - #bug #514802 + # bug #514802 sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die fi diff --git a/net-analyzer/yersinia/yersinia-9999.ebuild b/net-analyzer/yersinia/yersinia-9999.ebuild deleted file mode 100644 index f2825d6f6f13..000000000000 --- a/net-analyzer/yersinia/yersinia-9999.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic git-r3 - -DESCRIPTION="A framework for layer 2 attacks" -HOMEPAGE="https://github.com/tomac/yersinia" -EGIT_REPO_URI="https://github.com/tomac/yersinia" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="gtk ncurses" - -RDEPEND=" - ncurses? ( >=sys-libs/ncurses-5.5:= ) - gtk? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf - =x11-libs/gtk+-2* - ) - >=net-libs/libnet-1.1.2 - >=net-libs/libpcap-0.9.4 -" -DEPEND=" - virtual/pkgconfig - ${RDEPEND} -" -DOCS=( AUTHORS ChangeLog FAQ README THANKS TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-0.7.1-no-ncurses.patch - "${FILESDIR}"/${PN}-9999-tinfo.patch -) - -src_prepare() { - default - - if ! use gtk; then - #bug #514802 - sed -i -e '/AM_GLIB_GNU_GETTEXT/d' configure.in || die - fi - - eautoreconf -} - -src_configure() { - append-cflags -fcommon - - econf \ - --enable-admin \ - --with-pcap-includes=/usr/include \ - $(use_with ncurses) \ - $(use_enable gtk) -} - -src_compile() { - emake CFLAGS="${CFLAGS}" -} diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest index 0ca440546b73..e1b29fcf52ba 100644 --- a/net-analyzer/zabbix/Manifest +++ b/net-analyzer/zabbix/Manifest @@ -1,7 +1,10 @@ -DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd -DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46 -DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f -DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba -DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9 -DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406 -DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114 +DIST zabbix-5.0.42-go-deps.tar.xz 27792520 BLAKE2B 900f47dd211d761204d9b47ad386974512a9d51761407893b5be986b3a8f577a8bc12fb8f3d7b7c6c2cd2af1170080901875f6fdb5697089d08f6843d5af6eb0 SHA512 eee469e4b638c50a375fc6802676c76d138295545b41118cd6cd36d8dbec626ae16b05844f74d3ea7f4e3f96d48653a53c4332cc7bc668154c060da0e07b7d07 +DIST zabbix-5.0.42.tar.gz 21825176 BLAKE2B 378b740ec70d29156b4a9cf4b67436ff63057513bcd9ad596f3da2c2737cff16a5b88e84763f94c621e549a8749ef8995b4d51d578e533d62b9e07842bbe4dea SHA512 305b2d1873aad091aeb893e82f5c9aeb253c71683a1a95f7711c824fe0b9b29c7c6e96a17a727f9eb0f512d0983bb7d62bfb32e9a50b7ff2e7b0e9bf7d9ff42e +DIST zabbix-6.0.28-go-deps.tar.xz 30907444 BLAKE2B 3530aa97f3c6119005e9ca9d5e929f443b2fb068cc5bf8c207c12af9ff4a5bc3cf1fcf02bf564fa20db3b36e9b6e97aa31ab587b18c72636267a923019209a09 SHA512 ab57cf33df42179951df764a261be624b81f531d1376c55df80d6646024c186bed8525b2c261a56f9dec3521b08bc2d2be8f1f1ac3af69805ee154d7047d8724 +DIST zabbix-6.0.28.tar.gz 44803777 BLAKE2B ebf4ec01f31026e76db6fd06ef799918e556b42efebf6bd5ef3bd034f6334c3d0862bea275d04821e3ea2bbde4db8a49a280d896d59cfc758fd657fb5b1d7acf SHA512 3e392cd44ca98ef922913f3d47fe0b23559736384dfdb296212b766a5d599002ad22708c127e493282b885d0b0ca0b182a29d53e3dea92f83739d2bd14064c1d +DIST zabbix-6.0.29-go-deps.tar.xz 30833084 BLAKE2B 8d856dba3bcfce88c0ec68461b1de39b7d106303fc7d2997b9f508ad7ab32673ac08b7f6b2d0a99f3d9303afe02e60cb75764d47f2fde5f381405116bc6c0d75 SHA512 ecc7df70e5be5517295c83a688c22fa3fa74a58653900083caf9f1a9de3f3f33b0f261add4601175f289fd9c77975ad7a5ed5a2df039b67123cb14d0779b4698 +DIST zabbix-6.0.29.tar.gz 44962896 BLAKE2B dbf1031435b155c6122018fdeb18012bb7828c65b36f9384fb4c1bf90d703c939e68546749307fe76b9648633b050f1f1718c3dd20021fe642462347b5b5c848 SHA512 3189a534e250a02f7661340700d6c6d852eeae552db8a15f94e6d917aea84f7292660a22580d6fc59479498aedecdbf58b19c51b649266a9de229f0d0c35c3e0 +DIST zabbix-6.4.13-go-deps.tar.xz 33322660 BLAKE2B 36371454fcf3447325c19e5057a61b15db220412d56e5d0011a5d788b326f2c44b9f219c9a053334dfde460be3cffdc608d2b8a56c0cd246f47d6d610242599a SHA512 c975e11a18231522db7af86eb0763db26e5c1d0fba5a337d2224310e2c308a686a0749184dd32e0523f83381e299dfb1bc6f52d6681b117585ad70dd0f098f30 +DIST zabbix-6.4.13.tar.gz 46358395 BLAKE2B 316f476a94a6b19422cf4b81df3d2905d632ed78e52ece37c761035d20f928130d5d9ca85365c8f6bc61404aba15bb367b45d134ba15d21417af2754d2c1c6e6 SHA512 d268305dcda8f9384f1424d4f8f70c0006b48c832b24c633eac006e14ae0a5a788ea2205ecc423bbb44732eb6843a9dfd467ffb9ac24c0e4c6ca2553900ea8bd +DIST zabbix-6.4.14-go-deps.tar.xz 33272120 BLAKE2B 1554414dd9ed837938d6d560b01c14d63c49cbb7e927d9c15bbd8ec62246b808be27834c48a2e255a3d13bc0cb3062929ca48deafa8a6cf1bda84a0a7538acd5 SHA512 619c77dbbb26f0d5f7018fa5d80bdad4678f30cf2fe6127e6d3d37d21c28db41dcdf4b741fe8a27f98d2f7859a7db1b55824f808a9d147dba6ef0678a6443840 +DIST zabbix-6.4.14.tar.gz 46517773 BLAKE2B 5036019a051b6a84209a695b1a0aa33b65800e21ee77e61a80edd113999230c0566741b27cdc2c973051cfe8b87af446dd08ce1b92e6e1a71f844c16b17f8202 SHA512 fa1f404a509d0e7f78f195807469cedb049e06a9e6bd6afe53fa7f87bda008ad80158116b13558ef537ce25cb1974a920d73c6338cade9903b2d4d6d02b83317 diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd deleted file mode 100644 index 50db578f6b5a..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_agentd.pid" - -depend() { - need net - provide zabbix-agent - use zabbix-server -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix agent" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix agent" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy deleted file mode 100644 index 81bd4f3607a1..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_proxy.pid" - -depend() { - need net - provide zabbix-proxy -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix proxy" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix proxy" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server deleted file mode 100644 index abc9002f4646..000000000000 --- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_server.pid" - -depend() { - need net - use mysql postgresql -} -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix server" - start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ - --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix server" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch deleted file mode 100644 index 79bb92f4bae0..000000000000 --- a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch +++ /dev/null @@ -1,83 +0,0 @@ -Index: src/libs/zbxsysinfo/sysinfo.c -=================================================================== ---- src/libs/zbxsysinfo/sysinfo.c (revision 40348) -+++ src/libs/zbxsysinfo/sysinfo.c (working copy) -@@ -427,13 +427,49 @@ - test_aliases(); - } - -+static int zbx_check_user_parameter(const char *param, char *error, int max_error_len) -+{ -+ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c; -+ char *buf = NULL; -+ size_t buf_alloc = 128, buf_offset = 0; -+ -+ if (0 != CONFIG_UNSAFE_USER_PARAMETERS) -+ return SUCCEED; -+ -+ for (c = suppressed_chars; '\0' != *c; c++) -+ { -+ if (NULL == strchr(param, *c)) -+ continue; -+ -+ buf = zbx_malloc(buf, buf_alloc); -+ -+ for (c = suppressed_chars; '\0' != *c; c++) -+ { -+ if (c != suppressed_chars) -+ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", "); -+ -+ if (0 != isprint(*c)) -+ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c); -+ else -+ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c); -+ } -+ -+ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf); -+ -+ zbx_free(buf); -+ -+ return FAIL; -+ } -+ -+ return SUCCEED; -+} -+ - static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len) - { - int ret = SUCCEED; - char buf[MAX_STRING_LEN]; - char command[MAX_STRING_LEN]; - char *pl, *pr; -- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c; - - assert(out); - -@@ -465,25 +501,10 @@ - { - get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf)); - -- if (0 == CONFIG_UNSAFE_USER_PARAMETERS) -- { -- for (c = suppressed_chars; '\0' != *c; c++) -- { -- if (NULL != strchr(buf, *c)) -- { -- zbx_snprintf(error, max_error_len, "Special characters '%s'" -- " are not allowed in the parameters", -- suppressed_chars); -- ret = FAIL; -- break; -- } -- } -- } -+ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len))) -+ break; - } - -- if (FAIL == ret) -- break; -- - zbx_strlcat(out, buf, outlen); - outlen -= MIN((int)strlen(buf), (int)outlen); - diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch deleted file mode 100644 index 076e10ab75a4..000000000000 --- a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch +++ /dev/null @@ -1,53 +0,0 @@ -Index: frontends/php/include/defines.inc.php -=================================================================== ---- frontends/php/include/defines.inc.php (revision 46596) -+++ frontends/php/include/defines.inc.php (revision 46655) -@@ -835,6 +835,14 @@ - - define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts'); - -+// XML import flags -+// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed -+// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml -+// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND -+// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name - -+// so this flag is not needed here. -+define('LIBXML_IMPORT_FLAGS', LIBXML_NONET); -+ - // API errors - define('ZBX_API_ERROR_INTERNAL', 111); - define('ZBX_API_ERROR_PARAMETERS', 100); -Index: frontends/php/include/classes/import/readers/CXmlImportReader.php -=================================================================== ---- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596) -+++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655) -@@ -32,7 +32,8 @@ - */ - public function read($string) { - libxml_use_internal_errors(true); -- $result = simplexml_load_string($string); -+ libxml_disable_entity_loader(true); -+ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS); - if (!$result) { - $errors = libxml_get_errors(); - libxml_clear_errors(); -Index: frontends/php/include/classes/import/CXmlImport18.php -=================================================================== ---- frontends/php/include/classes/import/CXmlImport18.php (revision 46596) -+++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655) -@@ -390,12 +390,13 @@ - return $array; - } - -- public static function import($file) { -+ public static function import($source) { - - libxml_use_internal_errors(true); -+ libxml_disable_entity_loader(true); - - $xml = new DOMDocument(); -- if (!$xml->loadXML($file)) { -+ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) { - $text = ''; - foreach (libxml_get_errors() as $error) { - switch ($error->level) { diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf deleted file mode 100644 index dcb4b7248c2e..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf +++ /dev/null @@ -1,81 +0,0 @@ -# This is a config file for Zabbix internet service daemon agent -# To get more information about Zabbix visit http://www.zabbix.com - -### Option: Server -# IP address of Zabbix server -# Connections from other hosts will be denied -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: yes -# Default: -# Server= - -Server=127.0.0.1 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agent.userparams.conf -# Include=/usr/local/etc/zabbix_agent.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf deleted file mode 100644 index 4d49d3685e81..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf +++ /dev/null @@ -1,278 +0,0 @@ -# This is a config file for the Zabbix agent daemon (Unix) -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_agentd.pid - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_agentd.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: EnableRemoteCommands -# Whether remote commands from Zabbix server are allowed. -# 0 - not allowed -# 1 - allowed -# -# Mandatory: no -# Default: -# EnableRemoteCommands=0 - -### Option: LogRemoteCommands -# Enable logging of executed shell commands as warnings. -# 0 - disabled -# 1 - enabled -# -# Mandatory: no -# Default: -# LogRemoteCommands=0 - -##### Passive checks related - -### Option: Server -# List of comma delimited IP addresses (or hostnames) of Zabbix servers. -# Incoming connections will be accepted only from the hosts listed here. -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: no -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ListenPort -# Agent will listen on this port for connections from the server. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10050 - -### Option: ListenIP -# List of comma delimited IP addresses that the agent should listen on. -# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: StartAgents -# Number of pre-forked instances of zabbix_agentd that process passive checks. -# If set to 0, disables passive checks and the agent will not listen on any TCP port. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartAgents=3 - -##### Active checks related - -### Option: ServerActive -# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. -# If port is not specified, default port is used. -# IPv6 addresses must be enclosed in square brackets if port for that host is specified. -# If port is not specified, square brackets for IPv6 addresses are optional. -# If this parameter is not specified, active checks are disabled. -# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] -# -# Mandatory: no -# Default: -# ServerActive= - -ServerActive=127.0.0.1 - -### Option: Hostname -# Unique, case sensitive hostname. -# Required for active checks and must match hostname as configured on the server. -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix server - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: HostMetadata -# Optional parameter that defines host metadata. -# Host metadata is used at host auto-registration process. -# An agent will issue an error and not start if the value is over limit of 255 characters. -# If not defined, value will be acquired from HostMetadataItem. -# -# Mandatory: no -# Range: 0-255 characters -# Default: -# HostMetadata= - -### Option: HostMetadataItem -# Optional parameter that defines an item used for getting host metadata. -# Host metadata is used at host auto-registration process. -# During an auto-registration request an agent will log a warning message if -# the value returned by specified item is over limit of 255 characters. -# This option is only used when HostMetadata is not defined. -# -# Mandatory: no -# Default: -# HostMetadataItem= - -### Option: RefreshActiveChecks -# How often list of active checks is refreshed, in seconds. -# -# Mandatory: no -# Range: 60-3600 -# Default: -# RefreshActiveChecks=120 - -### Option: BufferSend -# Do not keep data longer than N seconds in buffer. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# BufferSend=5 - -### Option: BufferSize -# Maximum number of values in a memory buffer. The agent will send -# all collected data to Zabbix Server or Proxy if the buffer is full. -# -# Mandatory: no -# Range: 2-65535 -# Default: -# BufferSize=100 - -### Option: MaxLinesPerSecond -# Maximum number of new lines the agent will send per second to Zabbix Server -# or Proxy processing 'log' and 'logrt' active checks. -# The provided value will be overridden by the parameter 'maxlines', -# provided in 'log' or 'logrt' item keys. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# MaxLinesPerSecond=100 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: AllowRoot -# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Range: 0-1 -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf deleted file mode 100644 index d4bae2ea962f..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf +++ /dev/null @@ -1,519 +0,0 @@ -# This is a configuration file for Zabbix Proxy process -# To get more information about Zabbix, -# visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ProxyMode -# Proxy operating mode -# 0 - proxy in the active mode -# 1 - proxy in the passive mode -# -# Mandatory: no -# Default: -# ProxyMode=0 - -### Option: Server -# IP address (or hostname) of Zabbix server. -# Active proxy will get configuration data from the server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: yes (if ProxyMode is set to 0) -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ServerPort -# Port of Zabbix trapper on Zabbix server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ServerPort=10051 - -### Option: Hostname -# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix proxy - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_proxy.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_proxy.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# Warning: do not attempt to use the same database Zabbix server is using. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix_proxy - -### Option: DBSchema -# Schema name. Used for IBM DB2. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Default: -# DBUser= - -DBUser=root - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -# Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Default (for MySQL): -# DBPort=3306 - -######### PROXY SPECIFIC PARAMETERS ############# - -### Option: ProxyLocalBuffer -# Proxy will keep data locally for N hours, even if the data have already been synced with the server. -# This parameter may be used if local data will be used by third party applications. -# -# Mandatory: no -# Range: 0-720 -# Default: -# ProxyLocalBuffer=0 - -### Option: ProxyOfflineBuffer -# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. -# Older data will be lost. -# -# Mandatory: no -# Range: 1-720 -# Default: -# ProxyOfflineBuffer=1 - -### Option: HeartbeatFrequency -# Frequency of heartbeat messages in seconds. -# Used for monitoring availability of Proxy on server side. -# 0 - heartbeat messages disabled. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 0-3600 -# Default: -# HeartbeatFrequency=60 - -### Option: ConfigFrequency -# How often proxy retrieves configuration data from Zabbix Server in seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ConfigFrequency=3600 - -### Option: DataSenderFrequency -# Proxy will send collected data to the Server every N seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# DataSenderFrequency=1 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender and active agents. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the proxy. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing unnecessary information from history, alert, and alarms tables. -# -# Mandatory: no -# Range: 1-24 -# Default: -# HousekeepingFrequency=1 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size, for storing hosts and items data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# CacheSize=8M - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=8M - -### Option: HistoryTextCacheSize -# Size of text history cache, in bytes. -# Shared memory size for storing character, text or log history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryTextCacheSize=16M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: AllowRoot -# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_proxy.general.conf -# Include=/usr/local/etc/zabbix_proxy.conf.d/ - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of proxy modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at proxy startup. Modules are used to extend functionality of the proxy. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf deleted file mode 100644 index caba0190668e..000000000000 --- a/net-analyzer/zabbix/files/2.2/zabbix_server.conf +++ /dev/null @@ -1,546 +0,0 @@ -# This is a configuration file for Zabbix Server process -# To get more information about Zabbix, -# visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: NodeID -# Unique NodeID in distributed setup. -# 0 - standalone server -# -# Mandatory: no -# Range: 0-999 -# Default: -# NodeID=0 - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogFile -# Name of log file. -# If not set, syslog is used. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_server.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level -# 0 - no debug -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# -# Mandatory: no -# Range: 0-4 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -PidFile=/run/zabbix/zabbix_server.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix - -### Option: DBSchema -# Schema name. Used for IBM DB2. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Mandatory: no -# Default: -# DBUser= - -DBUser=root - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -### Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Range: 1024-65535 -# Default (for MySQL): -# DBPort=3306 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI). -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes. -# At least one trapper process must be running to display server availability in the frontend. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: StartTimers -# Number of pre-forked instances of timers. -# Timers process time-based trigger functions and maintenance periods. -# Only the first timer process handles the maintenance periods. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# StartTimers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the server. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -# ListenIP=127.0.0.1 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing unnecessary information from history, alert, and alarms tables. -# -# Mandatory: no -# Range: 1-24 -# Default: -# HousekeepingFrequency=1 - -### Option: MaxHousekeeperDelete -# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: -# [housekeeperid], [tablename], [field], [value]. -# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) -# will be deleted per one task in one housekeeping cycle. -# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. -# If set to 0 then no limit is used at all. In this case you must know what you are doing! -# -# Mandatory: no -# Range: 0-1000000 -# Default: -# MaxHousekeeperDelete=500 - -### Option: SenderFrequency -# How often Zabbix will try to send unsent alerts (in seconds). -# -# Mandatory: no -# Range: 5-3600 -# Default: -# SenderFrequency=30 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size for storing host, item and trigger data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# CacheSize=8M - -### Option: CacheUpdateFrequency -# How often Zabbix will perform update of configuration cache, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# CacheUpdateFrequency=60 - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=8M - -### Option: TrendCacheSize -# Size of trend cache, in bytes. -# Shared memory size for storing trends data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# TrendCacheSize=4M - -### Option: HistoryTextCacheSize -# Size of text history cache, in bytes. -# Shared memory size for storing character, text or log history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryTextCacheSize=16M - -### Option: ValueCacheSize -# Size of history value cache, in bytes. -# Shared memory size for caching item history data requests -# Setting to 0 disables value cache. -# -# Mandatory: no -# Range: 0,128K-64G -# Default: -# ValueCacheSize=8M - -### Option: NodeNoEvents -# If set to '1' local events won't be sent to master node. -# This won't impact ability of this node to propagate events from its child nodes. -# -# Mandatory: no -# Range: 0-1 -# Default: -# NodeNoEvents=0 - -### Option: NodeNoHistory -# If set to '1' local history won't be sent to master node. -# This won't impact ability of this node to propagate history from its child nodes. -# -# Mandatory: no -# Range: 0-1 -# Default: -# NodeNoHistory=0 - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: AlertScriptsPath -# Full path to location of custom alert scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -AlertScriptsPath=/var/lib/zabbix/alertscripts - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -ExternalScripts=/var/lib/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: StartProxyPollers -# Number of pre-forked instances of pollers for passive proxies. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartProxyPollers=1 - -### Option: ProxyConfigFrequency -# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ProxyConfigFrequency=3600 - -### Option: ProxyDataFrequency -# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# ProxyDataFrequency=1 - -### Option: AllowRoot -# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server -# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_server.general.conf -#Include=/etc/zabbix/zabbix_server.conf.d/ - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of server modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at server startup. Modules are used to extend functionality of the server. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd deleted file mode 100755 index d803d4450cac..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_agentd.pid" - -depend() { - need net - provide zabbix-agent - use zabbix-server -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix agent" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix agent" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy deleted file mode 100755 index 6aa1793435c8..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_proxy.pid" - -depend() { - need net - provide zabbix-proxy -} - -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix proxy" - start-stop-daemon --start --pidfile ${pid_file} \ - --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix proxy" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server deleted file mode 100755 index 109c6545d456..000000000000 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -pid_file="/run/zabbix/zabbix_server.pid" - -depend() { - need net - use mysql postgresql -} -start_pre() { - checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix -} - -start() { - ebegin "Starting Zabbix server" - start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \ - --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf - eend $? -} - -stop() { - ebegin "Stopping Zabbix server" - start-stop-daemon --stop --pidfile ${pid_file} - eend $? -} diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf deleted file mode 100644 index dcb4b7248c2e..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf +++ /dev/null @@ -1,81 +0,0 @@ -# This is a config file for Zabbix internet service daemon agent -# To get more information about Zabbix visit http://www.zabbix.com - -### Option: Server -# IP address of Zabbix server -# Connections from other hosts will be denied -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: yes -# Default: -# Server= - -Server=127.0.0.1 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agent.userparams.conf -# Include=/usr/local/etc/zabbix_agent.conf.d/ - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf deleted file mode 100644 index 5ff17ce33d65..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf +++ /dev/null @@ -1,390 +0,0 @@ -# This is a configuration file for Zabbix agent daemon (Unix) -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_agentd.pid -PidFile=/run/zabbix/zabbix_agentd.pid - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_agentd.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: EnableRemoteCommands -# Whether remote commands from Zabbix server are allowed. -# 0 - not allowed -# 1 - allowed -# -# Mandatory: no -# Default: -# EnableRemoteCommands=0 - -### Option: LogRemoteCommands -# Enable logging of executed shell commands as warnings. -# 0 - disabled -# 1 - enabled -# -# Mandatory: no -# Default: -# LogRemoteCommands=0 - -##### Passive checks related - -### Option: Server -# List of comma delimited IP addresses (or hostnames) of Zabbix servers. -# Incoming connections will be accepted only from the hosts listed here. -# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally. -# -# Mandatory: no -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ListenPort -# Agent will listen on this port for connections from the server. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10050 - -### Option: ListenIP -# List of comma delimited IP addresses that the agent should listen on. -# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: StartAgents -# Number of pre-forked instances of zabbix_agentd that process passive checks. -# If set to 0, disables passive checks and the agent will not listen on any TCP port. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartAgents=3 - -##### Active checks related - -### Option: ServerActive -# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks. -# If port is not specified, default port is used. -# IPv6 addresses must be enclosed in square brackets if port for that host is specified. -# If port is not specified, square brackets for IPv6 addresses are optional. -# If this parameter is not specified, active checks are disabled. -# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1] -# -# Mandatory: no -# Default: -# ServerActive= - -ServerActive=127.0.0.1 - -### Option: Hostname -# Unique, case sensitive hostname. -# Required for active checks and must match hostname as configured on the server. -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix server - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined. -# Does not support UserParameters or aliases. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: HostMetadata -# Optional parameter that defines host metadata. -# Host metadata is used at host auto-registration process. -# An agent will issue an error and not start if the value is over limit of 255 characters. -# If not defined, value will be acquired from HostMetadataItem. -# -# Mandatory: no -# Range: 0-255 characters -# Default: -# HostMetadata= - -### Option: HostMetadataItem -# Optional parameter that defines an item used for getting host metadata. -# Host metadata is used at host auto-registration process. -# During an auto-registration request an agent will log a warning message if -# the value returned by specified item is over limit of 255 characters. -# This option is only used when HostMetadata is not defined. -# -# Mandatory: no -# Default: -# HostMetadataItem= - -### Option: RefreshActiveChecks -# How often list of active checks is refreshed, in seconds. -# -# Mandatory: no -# Range: 60-3600 -# Default: -# RefreshActiveChecks=120 - -### Option: BufferSend -# Do not keep data longer than N seconds in buffer. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# BufferSend=5 - -### Option: BufferSize -# Maximum number of values in a memory buffer. The agent will send -# all collected data to Zabbix Server or Proxy if the buffer is full. -# -# Mandatory: no -# Range: 2-65535 -# Default: -# BufferSize=100 - -### Option: MaxLinesPerSecond -# Maximum number of new lines the agent will send per second to Zabbix Server -# or Proxy processing 'log' and 'logrt' active checks. -# The provided value will be overridden by the parameter 'maxlines', -# provided in 'log' or 'logrt' item keys. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# MaxLinesPerSecond=20 - -############ ADVANCED PARAMETERS ################# - -### Option: Alias -# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one. -# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed. -# Different Alias keys may reference the same item key. -# For example, to retrieve the ID of user 'zabbix': -# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1] -# Now shorthand key zabbix.userid may be used to retrieve data. -# Aliases can be used in HostMetadataItem but not in HostnameItem parameters. -# -# Mandatory: no -# Range: -# Default: - -### Option: Timeout -# Spend no more than Timeout seconds on processing -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -### Option: AllowRoot -# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf - -####### USER-DEFINED MONITORED PARAMETERS ####### - -### Option: UnsafeUserParameters -# Allow all characters to be passed in arguments to user-defined parameters. -# The following characters are not allowed: -# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @ -# Additionally, newline characters are not allowed. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Range: 0-1 -# Default: -# UnsafeUserParameters=0 - -### Option: UserParameter -# User-defined parameter to monitor. There can be several user-defined parameters. -# Format: UserParameter=<key>,<shell command> -# See 'zabbix_agentd' directory for examples. -# -# Mandatory: no -# Default: -# UserParameter= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of agent modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at agent startup. Modules are used to extend functionality of the agent. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSConnect -# How the agent should connect to server or proxy. Used for active checks. -# Only one value can be specified: -# unencrypted - connect without encryption -# psk - connect using TLS and a pre-shared key -# cert - connect using TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSConnect=unencrypted - -### Option: TLSAccept -# What incoming connections to accept. -# Multiple values can be specified, separated by comma: -# unencrypted - accept connections without encryption -# psk - accept connections secured with TLS and a pre-shared key -# cert - accept connections secured with TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSAccept=unencrypted - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSServerCertIssuer -# Allowed server certificate issuer. -# -# Mandatory: no -# Default: -# TLSServerCertIssuer= - -### Option: TLSServerCertSubject -# Allowed server certificate subject. -# -# Mandatory: no -# Default: -# TLSServerCertSubject= - -### Option: TLSCertFile -# Full pathname of a file containing the agent certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the agent private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= - -### Option: TLSPSKIdentity -# Unique, case sensitive string used to identify the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKIdentity= - -### Option: TLSPSKFile -# Full pathname of a file containing the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKFile= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf deleted file mode 100644 index f96b0d01f51e..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf +++ /dev/null @@ -1,674 +0,0 @@ -# This is a configuration file for Zabbix proxy daemon -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ProxyMode -# Proxy operating mode. -# 0 - proxy in the active mode -# 1 - proxy in the passive mode -# -# Mandatory: no -# Default: -# ProxyMode=0 - -### Option: Server -# IP address (or hostname) of Zabbix server. -# Active proxy will get configuration data from the server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: yes (if ProxyMode is set to 0) -# Default: -# Server= - -Server=127.0.0.1 - -### Option: ServerPort -# Port of Zabbix trapper on Zabbix server. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ServerPort=10051 - -### Option: Hostname -# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server! -# Value is acquired from HostnameItem if undefined. -# -# Mandatory: no -# Default: -# Hostname= - -Hostname=Zabbix proxy - -### Option: HostnameItem -# Item used for generating Hostname if it is undefined. -# Ignored if Hostname is defined. -# -# Mandatory: no -# Default: -# HostnameItem=system.hostname - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_proxy.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_proxy.pid -PidFile=/run/zabbix/zabbix_proxy.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# Warning: do not attempt to use the same database Zabbix server is using. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix_proxy - -### Option: DBSchema -# Schema name. Used for IBM DB2 and PostgreSQL. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Default: -# DBUser= - -DBUser=zabbix - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -# Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Default (for MySQL): -# DBPort=3306 - -######### PROXY SPECIFIC PARAMETERS ############# - -### Option: ProxyLocalBuffer -# Proxy will keep data locally for N hours, even if the data have already been synced with the server. -# This parameter may be used if local data will be used by third party applications. -# -# Mandatory: no -# Range: 0-720 -# Default: -# ProxyLocalBuffer=0 - -### Option: ProxyOfflineBuffer -# Proxy will keep data for N hours in case if no connectivity with Zabbix Server. -# Older data will be lost. -# -# Mandatory: no -# Range: 1-720 -# Default: -# ProxyOfflineBuffer=1 - -### Option: HeartbeatFrequency -# Frequency of heartbeat messages in seconds. -# Used for monitoring availability of Proxy on server side. -# 0 - heartbeat messages disabled. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 0-3600 -# Default: -# HeartbeatFrequency=60 - -### Option: ConfigFrequency -# How often proxy retrieves configuration data from Zabbix Server in seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ConfigFrequency=3600 - -### Option: DataSenderFrequency -# Proxy will send collected data to the Server every N seconds. -# For a proxy in the passive mode this parameter will be ignored. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# DataSenderFrequency=1 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). -# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers -# are started. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender and active agents. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwarePerfFrequency -# How often Zabbix will connect to VMware service to obtain performance data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwarePerfFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: VMwareTimeout -# Specifies how many seconds vmware collector waits for response from VMware service. -# -# Mandatory: no -# Range: 1-300 -# Default: -# VMwareTimeout=10 - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the proxy. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing outdated information from the database. -# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency -# hours of outdated information are deleted in one housekeeping cycle. -# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start. -# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. -# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the -# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. -# -# Mandatory: no -# Range: 0-24 -# Default: -# HousekeepingFrequency=1 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size, for storing hosts and items data. -# -# Mandatory: no -# Range: 128K-8G -# Default: -# CacheSize=8M - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers. -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=16M - -### Option: HistoryIndexCacheSize -# Size of history index cache, in bytes. -# Shared memory size for indexing history cache. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryIndexCacheSize=4M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -Timeout=4 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3 or 4. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -LogSlowQueries=3000 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: AllowRoot -# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_proxy.general.conf -# Include=/usr/local/etc/zabbix_proxy.conf.d/ -# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf - -### Option: SSLCertLocation -# Location of SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCertLocation=${datadir}/zabbix/ssl/certs - -### Option: SSLKeyLocation -# Location of private keys for SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLKeyLocation=${datadir}/zabbix/ssl/keys - -### Option: SSLCALocation -# Location of certificate authority (CA) files for SSL server certificate verification. -# If not set, system-wide directory will be used. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCALocation= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of proxy modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at proxy startup. Modules are used to extend functionality of the proxy. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSConnect -# How the proxy should connect to Zabbix server. Used for an active proxy, ignored on a passive proxy. -# Only one value can be specified: -# unencrypted - connect without encryption -# psk - connect using TLS and a pre-shared key -# cert - connect using TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSConnect=unencrypted - -### Option: TLSAccept -# What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy. -# Multiple values can be specified, separated by comma: -# unencrypted - accept connections without encryption -# psk - accept connections secured with TLS and a pre-shared key -# cert - accept connections secured with TLS and a certificate -# -# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection) -# Default: -# TLSAccept=unencrypted - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSServerCertIssuer -# Allowed server certificate issuer. -# -# Mandatory: no -# Default: -# TLSServerCertIssuer= - -### Option: TLSServerCertSubject -# Allowed server certificate subject. -# -# Mandatory: no -# Default: -# TLSServerCertSubject= - -### Option: TLSCertFile -# Full pathname of a file containing the proxy certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the proxy private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= - -### Option: TLSPSKIdentity -# Unique, case sensitive string used to identify the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKIdentity= - -### Option: TLSPSKFile -# Full pathname of a file containing the pre-shared key. -# -# Mandatory: no -# Default: -# TLSPSKFile= diff --git a/net-analyzer/zabbix/files/3.0/zabbix_server.conf b/net-analyzer/zabbix/files/3.0/zabbix_server.conf deleted file mode 100644 index 81a4961ee587..000000000000 --- a/net-analyzer/zabbix/files/3.0/zabbix_server.conf +++ /dev/null @@ -1,635 +0,0 @@ -# This is a configuration file for Zabbix server daemon -# To get more information about Zabbix, visit http://www.zabbix.com - -############ GENERAL PARAMETERS ################# - -### Option: ListenPort -# Listen port for trapper. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# ListenPort=10051 - -### Option: SourceIP -# Source IP address for outgoing connections. -# -# Mandatory: no -# Default: -# SourceIP= - -### Option: LogType -# Specifies where log messages are written to: -# system - syslog -# file - file specified with LogFile parameter -# console - standard output -# -# Mandatory: no -# Default: -# LogType=file - -### Option: LogFile -# Log file name for LogType 'file' parameter. -# -# Mandatory: no -# Default: -# LogFile= - -LogFile=/var/log/zabbix/zabbix_server.log - -### Option: LogFileSize -# Maximum size of log file in MB. -# 0 - disable automatic log rotation. -# -# Mandatory: no -# Range: 0-1024 -# Default: -# LogFileSize=1 -LogFileSize=128 - -### Option: DebugLevel -# Specifies debug level: -# 0 - basic information about starting and stopping of Zabbix processes -# 1 - critical information -# 2 - error information -# 3 - warnings -# 4 - for debugging (produces lots of information) -# 5 - extended debugging (produces even more information) -# -# Mandatory: no -# Range: 0-5 -# Default: -# DebugLevel=3 - -### Option: PidFile -# Name of PID file. -# -# Mandatory: no -# Default: -# PidFile=/tmp/zabbix_server.pid -PidFile=/run/zabbix/zabbix_server.pid - -### Option: DBHost -# Database host name. -# If set to localhost, socket is used for MySQL. -# If set to empty string, socket is used for PostgreSQL. -# -# Mandatory: no -# Default: -# DBHost=localhost - -### Option: DBName -# Database name. -# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored. -# -# Mandatory: yes -# Default: -# DBName= - -DBName=zabbix - -### Option: DBSchema -# Schema name. Used for IBM DB2 and PostgreSQL. -# -# Mandatory: no -# Default: -# DBSchema= - -### Option: DBUser -# Database user. Ignored for SQLite. -# -# Mandatory: no -# Default: -# DBUser= - -DBUser=zabbix - -### Option: DBPassword -# Database password. Ignored for SQLite. -# Comment this line if no password is used. -# -# Mandatory: no -# Default: -# DBPassword= - -### Option: DBSocket -# Path to MySQL socket. -# -# Mandatory: no -# Default: -# DBSocket=/tmp/mysql.sock - -### Option: DBPort -# Database port when not using local socket. Ignored for SQLite. -# -# Mandatory: no -# Range: 1024-65535 -# Default (for MySQL): -# DBPort=3306 - -############ ADVANCED PARAMETERS ################ - -### Option: StartPollers -# Number of pre-forked instances of pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollers=5 - -### Option: StartIPMIPollers -# Number of pre-forked instances of IPMI pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartIPMIPollers=0 - -### Option: StartPollersUnreachable -# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java). -# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers -# are started. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPollersUnreachable=1 - -### Option: StartTrappers -# Number of pre-forked instances of trappers. -# Trappers accept incoming connections from Zabbix sender, active agents and active proxies. -# At least one trapper process must be running to display server availability and view queue -# in the frontend. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartTrappers=5 - -### Option: StartPingers -# Number of pre-forked instances of ICMP pingers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartPingers=1 - -### Option: StartDiscoverers -# Number of pre-forked instances of discoverers. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartDiscoverers=1 - -### Option: StartHTTPPollers -# Number of pre-forked instances of HTTP pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartHTTPPollers=1 - -### Option: StartTimers -# Number of pre-forked instances of timers. -# Timers process time-based trigger functions and maintenance periods. -# Only the first timer process handles the maintenance periods. -# -# Mandatory: no -# Range: 1-1000 -# Default: -# StartTimers=1 - -### Option: StartEscalators -# Number of pre-forked instances of escalators. -# -# Mandatory: no -# Range: 0-100 -# Default: -# StartEscalators=1 - -### Option: JavaGateway -# IP address (or hostname) of Zabbix Java gateway. -# Only required if Java pollers are started. -# -# Mandatory: no -# Default: -# JavaGateway= - -### Option: JavaGatewayPort -# Port that Zabbix Java gateway listens on. -# -# Mandatory: no -# Range: 1024-32767 -# Default: -# JavaGatewayPort=10052 - -### Option: StartJavaPollers -# Number of pre-forked instances of Java pollers. -# -# Mandatory: no -# Range: 0-1000 -# Default: -# StartJavaPollers=0 - -### Option: StartVMwareCollectors -# Number of pre-forked vmware collector instances. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartVMwareCollectors=0 - -### Option: VMwareFrequency -# How often Zabbix will connect to VMware service to obtain a new data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwareFrequency=60 - -### Option: VMwarePerfFrequency -# How often Zabbix will connect to VMware service to obtain performance data. -# -# Mandatory: no -# Range: 10-86400 -# Default: -# VMwarePerfFrequency=60 - -### Option: VMwareCacheSize -# Size of VMware cache, in bytes. -# Shared memory size for storing VMware data. -# Only used if VMware collectors are started. -# -# Mandatory: no -# Range: 256K-2G -# Default: -# VMwareCacheSize=8M - -### Option: VMwareTimeout -# Specifies how many seconds vmware collector waits for response from VMware service. -# -# Mandatory: no -# Range: 1-300 -# Default: -# VMwareTimeout=10 - -### Option: SNMPTrapperFile -# Temporary file used for passing data from SNMP trap daemon to the server. -# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file. -# -# Mandatory: no -# Default: -# SNMPTrapperFile=/tmp/zabbix_traps.tmp - -### Option: StartSNMPTrapper -# If 1, SNMP trapper process is started. -# -# Mandatory: no -# Range: 0-1 -# Default: -# StartSNMPTrapper=0 - -### Option: ListenIP -# List of comma delimited IP addresses that the trapper should listen on. -# Trapper will listen on all network interfaces if this parameter is missing. -# -# Mandatory: no -# Default: -# ListenIP=0.0.0.0 - -# ListenIP=127.0.0.1 - -### Option: HousekeepingFrequency -# How often Zabbix will perform housekeeping procedure (in hours). -# Housekeeping is removing outdated information from the database. -# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency -# hours of outdated information are deleted in one housekeeping cycle, for each item. -# To lower load on server startup housekeeping is postponed for 30 minutes after server start. -# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option. -# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the -# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days. -# -# Mandatory: no -# Range: 0-24 -# Default: -# HousekeepingFrequency=1 - -### Option: MaxHousekeeperDelete -# The table "housekeeper" contains "tasks" for housekeeping procedure in the format: -# [housekeeperid], [tablename], [field], [value]. -# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value]) -# will be deleted per one task in one housekeeping cycle. -# SQLite3 does not use this parameter, deletes all corresponding rows without a limit. -# If set to 0 then no limit is used at all. In this case you must know what you are doing! -# -# Mandatory: no -# Range: 0-1000000 -# Default: -# MaxHousekeeperDelete=5000 - -### Option: SenderFrequency -# How often Zabbix will try to send unsent alerts (in seconds). -# -# Mandatory: no -# Range: 5-3600 -# Default: -# SenderFrequency=30 - -### Option: CacheSize -# Size of configuration cache, in bytes. -# Shared memory size for storing host, item and trigger data. -# -# Mandatory: no -# Range: 128K-8G -# Default: -# CacheSize=8M - -### Option: CacheUpdateFrequency -# How often Zabbix will perform update of configuration cache, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# CacheUpdateFrequency=60 - -### Option: StartDBSyncers -# Number of pre-forked instances of DB Syncers. -# -# Mandatory: no -# Range: 1-100 -# Default: -# StartDBSyncers=4 - -### Option: HistoryCacheSize -# Size of history cache, in bytes. -# Shared memory size for storing history data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryCacheSize=16M - -### Option: HistoryIndexCacheSize -# Size of history index cache, in bytes. -# Shared memory size for indexing history cache. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# HistoryIndexCacheSize=4M - -### Option: TrendCacheSize -# Size of trend cache, in bytes. -# Shared memory size for storing trends data. -# -# Mandatory: no -# Range: 128K-2G -# Default: -# TrendCacheSize=4M - -### Option: ValueCacheSize -# Size of history value cache, in bytes. -# Shared memory size for caching item history data requests. -# Setting to 0 disables value cache. -# -# Mandatory: no -# Range: 0,128K-64G -# Default: -# ValueCacheSize=8M - -### Option: Timeout -# Specifies how long we wait for agent, SNMP device or external check (in seconds). -# -# Mandatory: no -# Range: 1-30 -# Default: -# Timeout=3 - -Timeout=4 - -### Option: TrapperTimeout -# Specifies how many seconds trapper may spend processing new data. -# -# Mandatory: no -# Range: 1-300 -# Default: -# TrapperTimeout=300 - -### Option: UnreachablePeriod -# After how many seconds of unreachability treat a host as unavailable. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachablePeriod=45 - -### Option: UnavailableDelay -# How often host is checked for availability during the unavailability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnavailableDelay=60 - -### Option: UnreachableDelay -# How often host is checked for availability during the unreachability period, in seconds. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# UnreachableDelay=15 - -### Option: AlertScriptsPath -# Full path to location of custom alert scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# AlertScriptsPath=${datadir}/zabbix/alertscripts -AlertScriptsPath=/var/lib/zabbix/alertscripts - -### Option: ExternalScripts -# Full path to location of external scripts. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# ExternalScripts=${datadir}/zabbix/externalscripts -ExternalScripts=/var/lib/zabbix/externalscripts - -### Option: FpingLocation -# Location of fping. -# Make sure that fping binary has root ownership and SUID flag set. -# -# Mandatory: no -# Default: -# FpingLocation=/usr/sbin/fping - -### Option: Fping6Location -# Location of fping6. -# Make sure that fping6 binary has root ownership and SUID flag set. -# Make empty if your fping utility is capable to process IPv6 addresses. -# -# Mandatory: no -# Default: -# Fping6Location=/usr/sbin/fping6 - -### Option: SSHKeyLocation -# Location of public and private keys for SSH checks and actions. -# -# Mandatory: no -# Default: -# SSHKeyLocation= - -### Option: LogSlowQueries -# How long a database query may take before being logged (in milliseconds). -# Only works if DebugLevel set to 3, 4 or 5. -# 0 - don't log slow queries. -# -# Mandatory: no -# Range: 1-3600000 -# Default: -# LogSlowQueries=0 - -LogSlowQueries=3000 - -### Option: TmpDir -# Temporary directory. -# -# Mandatory: no -# Default: -# TmpDir=/tmp - -### Option: StartProxyPollers -# Number of pre-forked instances of pollers for passive proxies. -# -# Mandatory: no -# Range: 0-250 -# Default: -# StartProxyPollers=1 - -### Option: ProxyConfigFrequency -# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600*24*7 -# Default: -# ProxyConfigFrequency=3600 - -### Option: ProxyDataFrequency -# How often Zabbix Server requests history data from a Zabbix Proxy in seconds. -# This parameter is used only for proxies in the passive mode. -# -# Mandatory: no -# Range: 1-3600 -# Default: -# ProxyDataFrequency=1 - -### Option: AllowRoot -# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server -# will try to switch to the user specified by the User configuration option instead. -# Has no effect if started under a regular user. -# 0 - do not allow -# 1 - allow -# -# Mandatory: no -# Default: -# AllowRoot=0 - -### Option: User -# Drop privileges to a specific, existing user on the system. -# Only has effect if run as 'root' and AllowRoot is disabled. -# -# Mandatory: no -# Default: -# User=zabbix - -### Option: Include -# You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. -# -# Mandatory: no -# Default: -# Include= - -# Include=/usr/local/etc/zabbix_server.general.conf -# Include=/usr/local/etc/zabbix_server.conf.d/ -# Include=/usr/local/etc/zabbix_server.conf.d/*.conf - -### Option: SSLCertLocation -# Location of SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLCertLocation=${datadir}/zabbix/ssl/certs - -### Option: SSLKeyLocation -# Location of private keys for SSL client certificates. -# This parameter is used only in web monitoring. -# -# Mandatory: no -# Default: -# SSLKeyLocation=${datadir}/zabbix/ssl/keys - -### Option: SSLCALocation -# Override the location of certificate authority (CA) files for SSL server certificate verification. -# If not set, system-wide directory will be used. -# This parameter is used only in web monitoring and SMTP authentication. -# -# Mandatory: no -# Default: -# SSLCALocation= - -####### LOADABLE MODULES ####### - -### Option: LoadModulePath -# Full path to location of server modules. -# Default depends on compilation options. -# -# Mandatory: no -# Default: -# LoadModulePath=${libdir}/modules - -### Option: LoadModule -# Module to load at server startup. Modules are used to extend functionality of the server. -# Format: LoadModule=<module.so> -# The modules must be located in directory specified by LoadModulePath. -# It is allowed to include multiple LoadModule parameters. -# -# Mandatory: no -# Default: -# LoadModule= - -####### TLS-RELATED PARAMETERS ####### - -### Option: TLSCAFile -# Full pathname of a file containing the top-level CA(s) certificates for -# peer certificate verification. -# -# Mandatory: no -# Default: -# TLSCAFile= - -### Option: TLSCRLFile -# Full pathname of a file containing revoked certificates. -# -# Mandatory: no -# Default: -# TLSCRLFile= - -### Option: TLSCertFile -# Full pathname of a file containing the server certificate or certificate chain. -# -# Mandatory: no -# Default: -# TLSCertFile= - -### Option: TLSKeyFile -# Full pathname of a file containing the server private key. -# -# Mandatory: no -# Default: -# TLSKeyFile= diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch new file mode 100644 index 000000000000..b2635ff7d8a1 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch @@ -0,0 +1,41 @@ +--- a/conf/zabbix_agentd.conf ++++ b/conf/zabbix_agentd.conf +@@ -5,6 +5,7 @@ + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +--- a/conf/zabbix_proxy.conf ++++ b/conf/zabbix_proxy.conf +@@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +--- a/conf/zabbix_server.conf ++++ b/conf/zabbix_server.conf +@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log + + ### Option: PidFile + # Name of PID file. ++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884) + # + # Mandatory: no + # Default: +--- a/src/libs/zbxnix/pid.c ++++ b/src/libs/zbxnix/pid.c +@@ -26,6 +26,8 @@ static int fdpid = -1; + + int create_pid_file(const char *pidfile) + { ++ return SUCCEED; ++ + int fd; + zbx_stat_t buf; + struct flock fl; diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch index c0d1650fb85c..3e4ed297ebc0 100644 --- a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch +++ b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch @@ -1,5 +1,5 @@ ---- zabbix-4.0.1/configure 2018-10-29 10:36:05.000000000 -0700 -+++ zfx/configure 2018-11-07 16:59:28.015968345 -0800 +--- zabbix-4.0.1/configure ++++ zfx/configure @@ -12510,7 +12510,7 @@ CURL_SSL_CERT_LOCATION="${datadir}/zabbix/ssl/certs" CURL_SSL_KEY_LOCATION="${datadir}/zabbix/ssl/keys" diff --git a/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch new file mode 100644 index 000000000000..537c3491bb5f --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-5.0.22-system.sw.packages.patch @@ -0,0 +1,26 @@ +From 884982a87fc14918b062f09aa2bc3f8d2f777a14 Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Mon, 21 Mar 2022 11:23:54 +0300 +Subject: [PATCH] Allow to use system.sw.packages on gentoo linux + +Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -164,6 +164,7 @@ func getManagers() []manager { + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex}, + } + } + +--- a/src/libs/zbxsysinfo/linux/software.c ++++ b/src/libs/zbxsysinfo/linux/software.c +@@ -176,6 +176,7 @@ static ZBX_PACKAGE_MANAGER package_managers[] = + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", NULL}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", NULL}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", NULL}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", NULL}, + {NULL} + }; + diff --git a/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch new file mode 100644 index 000000000000..3cb4b74fb15d --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.0.3-system.sw.packages.patch @@ -0,0 +1,26 @@ +From 1869f67549ea9491377269ef11a99ed5fc38e3cc Mon Sep 17 00:00:00 2001 +From: Alexey Shvetsov <alexxy@gentoo.org> +Date: Mon, 21 Mar 2022 11:23:54 +0300 +Subject: [PATCH] Allow to use system.sw.packages on gentoo linux + +Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org> +--- a/src/go/plugins/system/sw/sw.go ++++ b/src/go/plugins/system/sw/sw.go +@@ -165,6 +165,7 @@ func getManagers() []manager { + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", parseRegex}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", parseRegex}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", parseRegex}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", parseRegex}, + } + } + +--- a/src/libs/zbxsysinfo/linux/software.c ++++ b/src/libs/zbxsysinfo/linux/software.c +@@ -177,6 +177,7 @@ static ZBX_PACKAGE_MANAGER package_managers[] = + {"pkgtools", "[ -d /var/log/packages ] && echo true", "ls /var/log/packages", NULL}, + {"rpm", "rpm --version 2> /dev/null", "rpm -qa", NULL}, + {"pacman", "pacman --version 2> /dev/null", "pacman -Q", NULL}, ++ {"portage", "emerge --version 2> /dev/null", "qlist -IRCv", NULL}, + {NULL} + }; + diff --git a/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch new file mode 100644 index 000000000000..0a95780c4505 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.4.0-configure-sscanf.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -952,8 +952,9 @@ dnl Check for %qu format (FreeBSD 4.x) + dnl FreeBSD 4.x does not support %llu + AC_MSG_CHECKING(for long long format) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++#include <stdio.h> + #include <sys/types.h> +-int main() ++int main(void) + { + uint64_t i; diff --git a/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch b/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch new file mode 100644 index 000000000000..4160a42ee6eb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-6.4.6-clang16-build-fix.patch @@ -0,0 +1,58 @@ +https://github.com/zabbix/zabbix/pull/110 +From: Brahmajit Das <brahmajit.xyz@gmail.com> +Date: Sun, 24 Sep 2023 14:40:05 +0000 +Subject: [PATCH] Fix incompatible pointer to integer conversion initializing + +Makes struct members explicit. + +First found on Gentoo linux, with MUSL LLVM profile. Most probably due +to newer compilers (like Clang 16 and GCC 14) have turned various errors +on by default and we get build errors such as: + +``` +net.c:115:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; + ^~~~ +/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' + ^~~~~~~~~~ +net.c:121:79: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' [-Wint-conversion] + struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; + ^~~~ +/usr/include/unistd.h:25:14: note: expanded from macro 'NULL' +``` + +Bug: https://bugs.gentoo.org/897840 +Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> +--- a/src/libs/zbxsysinfo/linux/net.c ++++ b/src/libs/zbxsysinfo/linux/net.c +@@ -112,13 +112,25 @@ static int find_tcp_port_by_state_nl(unsigned short port, int state, int *found) + + struct sockaddr_nl s_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec s_io[1] = { { &request, sizeof(request) } }; +- struct msghdr s_msg = { (void *)&s_sa, sizeof(struct sockaddr_nl), s_io, 1, NULL, 0, 0}; ++ struct msghdr s_msg = { .msg_name = (void *)&s_sa, ++ .msg_namelen = sizeof(struct sockaddr_nl), ++ .msg_iov = s_io, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0}; + + char buffer[BUFSIZ] = { 0 }; + + struct sockaddr_nl r_sa = { AF_NETLINK, 0, 0, 0 }; + struct iovec r_io[1] = { { buffer, BUFSIZ } }; +- struct msghdr r_msg = { (void *)&r_sa, sizeof(struct sockaddr_nl), r_io, 1, NULL, 0, 0}; ++ struct msghdr r_msg = { .msg_name = (void *)&r_sa, ++ .msg_namelen = sizeof(struct sockaddr_nl), ++ .msg_iov = r_io, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0}; + + struct nlmsghdr *r_hdr; + +-- +2.42.0 + diff --git a/net-analyzer/zabbix/files/zabbix-agent2.init b/net-analyzer/zabbix/files/zabbix-agent2.init new file mode 100644 index 000000000000..6a88e62b429a --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_agent2" +command_args="--foreground --config /etc/zabbix/zabbix_agent2.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} diff --git a/net-analyzer/zabbix/files/zabbix-agent2.service b/net-analyzer/zabbix/files/zabbix-agent2.service new file mode 100644 index 000000000000..b182482fde97 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.service @@ -0,0 +1,12 @@ +[Unit] +Description=Zabbix agent +Documentation=https://zabbix.com/manuals +After=network.target network-online.target + +[Service] +User=zabbix +Group=zabbix +ExecStart=/usr/sbin/zabbix_agent2 --foreground --config /etc/zabbix/zabbix_agent2.conf + +[Install] +WantedBy=multi-user.target diff --git a/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles b/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles new file mode 100644 index 000000000000..56471bb42c0a --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agent2.tmpfiles @@ -0,0 +1 @@ +d /run/zabbix 0755 zabbix zabbix - diff --git a/net-analyzer/zabbix/files/zabbix-agentd.init b/net-analyzer/zabbix/files/zabbix-agentd.init new file mode 100644 index 000000000000..e2433ff8f6e9 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-agentd.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_agentd" +command_args="--foreground --config /etc/zabbix/zabbix_agentd.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-agent + use zabbix-server +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service index 8485d06f5a3a..dc13089e0cf5 100644 --- a/net-analyzer/zabbix/files/zabbix-agentd.service +++ b/net-analyzer/zabbix/files/zabbix-agentd.service @@ -1,14 +1,12 @@ [Unit] -Description=Zabbix agent daemon -After=network.target +Description=Zabbix agent +Documentation=https://zabbix.com/manuals +After=network.target network-online.target [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf -PIDFile=/run/zabbix/zabbix_agentd.pid +ExecStart=/usr/sbin/zabbix_agentd --foreground --config /etc/zabbix/zabbix_agentd.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf index 6aa3cf96f84d..6aa3cf96f84d 100644 --- a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy +++ b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init index 5722814173e8..5722814173e8 100755..100644 --- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy +++ b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init diff --git a/net-analyzer/zabbix/files/zabbix-proxy.init b/net-analyzer/zabbix/files/zabbix-proxy.init new file mode 100644 index 000000000000..8347b481fffb --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-proxy.init @@ -0,0 +1,20 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_proxy" +command_args="--foreground --config /etc/zabbix/zabbix_proxy.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + provide zabbix-proxy +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} + diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service index 85ecd79cc889..78b07be05062 100644 --- a/net-analyzer/zabbix/files/zabbix-proxy.service +++ b/net-analyzer/zabbix/files/zabbix-proxy.service @@ -1,14 +1,12 @@ [Unit] Description=Zabbix proxy -After=network.target +Documentation=https://zabbix.com/manuals +After=network.target network-online.target [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf -PIDFile=/run/zabbix/zabbix_proxy.pid +ExecStart=/usr/sbin/zabbix_proxy --foreground --config /etc/zabbix/zabbix_proxy.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/files/zabbix-server-r1.init b/net-analyzer/zabbix/files/zabbix-server-r1.init new file mode 100644 index 000000000000..1652ba782fa8 --- /dev/null +++ b/net-analyzer/zabbix/files/zabbix-server-r1.init @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/zabbix_server" +command_args="--foreground --config /etc/zabbix/zabbix_server.conf" +command_background="true" +command_user="zabbix:zabbix" +pidfile="/run/${RC_SVCNAME}.pid" + +depend() { + need net + use mysql postgresql +} + +start_pre() { + checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix + checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf +} + +reload() { + /usr/sbin/zabbix_server \ + -c /etc/zabbix/zabbix_server.conf \ + -R config_cache_reload +} diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service index 3ea973356eff..a7bdc0d1e06d 100644 --- a/net-analyzer/zabbix/files/zabbix-server.service +++ b/net-analyzer/zabbix/files/zabbix-server.service @@ -1,14 +1,15 @@ [Unit] Description=Zabbix server -After=syslog.target network.target postgresql.service +Documentation=https://zabbix.com/manuals +After=syslog.target syslog.service network.target network-online.target postgresql.service +After=postgresql-9.6.service postgresql-10.service +After=postgresql-11.service postgresql-12.service + [Service] -Type=forking User=zabbix Group=zabbix -ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf -PIDFile=/run/zabbix/zabbix_server.pid +ExecStart=/usr/sbin/zabbix_server --foreground --config /etc/zabbix/zabbix_server.conf [Install] WantedBy=multi-user.target - diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml index 05a299b3033d..d6088f15ce3c 100644 --- a/net-analyzer/zabbix/metadata.xml +++ b/net-analyzer/zabbix/metadata.xml @@ -1,17 +1,13 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>fordfrog@gentoo.org</email> <name>Miroslav Šulc</name> </maintainer> <maintainer type="person"> - <email>patrick@gentoo.org</email> - <name>Patrick Lauer</name> - </maintainer> - <maintainer type="person"> - <email>alicef@gentoo.org</email> - <name>Alice Ferrazzi</name> + <name>Florian Schmaus</name> + <email>flow@gentoo.org</email> </maintainer> <longdescription> ZABBIX is software for monitoring of your applications, network and servers. @@ -21,15 +17,17 @@ configure different types of notifications for pre-defined events. </longdescription> <use> <flag name="agent">Enable zabbix agent (for to-be-monitored machines)</flag> + <flag name="agent2">Enable go-based zabbix agent 2 (for to-be-monitored machines)</flag> <flag name="frontend">Enable zabbix web frontend</flag> <flag name="ipv6">Turn on support of IPv6</flag> - <flag name="proxy">Enable proxy support</flag> + <flag name="java">Enable Zabbix Java JMX Management Gateway</flag> + <flag name="libxml2">Use libxml2 client library</flag> + <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag> <flag name="openipmi">Enable openipmi things</flag> + <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as TLS backend</flag> + <flag name="proxy">Enable proxy support</flag> <flag name="server">Enable zabbix server</flag> <flag name="ssh">SSH v2 based checks</flag> - <flag name="odbc">Enable Database Monitor and use UnixODBC Library by default</flag> <flag name="static">Build statically linked binaries</flag> - <flag name="java">Enable Zabbix Java JMX Management Gateway</flag> - <flag name="libxml2">Use libxml2 client library</flag> </use> </pkgmetadata> diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild deleted file mode 100644 index 26b70005d753..000000000000 --- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild +++ /dev/null @@ -1,340 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/2.2"/zabbix_server.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd \ - "${FILESDIR}/2.2"/init.d/zabbix-proxy - dosbin \ - src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins \ - "${FILESDIR}/2.2"/zabbix_agent.conf \ - "${FILESDIR}/2.2"/zabbix_agentd.conf - doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd - dosbin \ - src/zabbix_agent/zabbix_agent \ - src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - fperms 0640 \ - /etc/zabbix/zabbix_agent.conf \ - /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agent.conf \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild deleted file mode 100644 index 09ba412f2f86..000000000000 --- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild +++ /dev/null @@ -1,330 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping ) - server? ( net-analyzer/fping - app-admin/webapp-config ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - exeinto /${ZABBIXJAVA_BASE}/ - doexe \ - src/zabbix_java/settings.sh \ - src/zabbix_java/startup.sh \ - src/zabbix_java/shutdown.sh - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild deleted file mode 100644 index 0169c3ac73bf..000000000000 --- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( dev-db/postgresql:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( dev-db/postgresql:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - default -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild deleted file mode 100644 index 2e1f7d320991..000000000000 --- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild +++ /dev/null @@ -1,332 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libpcre - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild deleted file mode 100644 index bf5db4ac645c..000000000000 --- a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="amd64 x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - server? ( dev-libs/libevent ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libpcre ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf - fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.5.ebuild deleted file mode 100644 index 2ff7b0830d7d..000000000000 --- a/net-analyzer/zabbix/zabbix-4.4.5.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# needed to make webapp-config dep optional -WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs - -DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" -HOMEPAGE="https://www.zabbix.com/" -MY_P=${P/_/} -MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) - static? ( !oracle !snmp )" - -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) - ldap? ( - net-nds/openldap - =dev-libs/cyrus-sasl-2* - net-libs/gnutls - ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) - openipmi? ( sys-libs/openipmi ) - ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - server? ( dev-libs/libevent ) - ssl? ( dev-libs/openssl:=[-bindist] )" - -RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] - app-admin/webapp-config - dev-libs/libpcre ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api - ) - frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) - mysql? ( dev-lang/php[mysqli] ) - odbc? ( dev-lang/php[odbc] ) - oracle? ( dev-lang/php[oci8-instant-client] ) - postgres? ( dev-lang/php[postgres] ) - sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" -DEPEND="${COMMON_DEPEND} - static? ( - ldap? ( - net-nds/openldap[static-libs] - =dev-libs/cyrus-sasl-2*[static-libs] - net-libs/gnutls[static-libs] - ) - mysql? ( >=virtual/mysql-5.0.3[static] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) - ) - virtual/pkgconfig" - -S=${WORKDIR}/${MY_P} - -ZABBIXJAVA_BASE="opt/zabbix_java" - -pkg_setup() { - if use oracle; then - if [ -z "${ORACLE_HOME}" ]; then - eerror - eerror "The environment variable ORACLE_HOME must be set" - eerror "and point to the correct location." - eerror "It looks like you don't have Oracle installed." - eerror - die "Environment variable ORACLE_HOME is not set" - fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi - fi - - if use frontend; then - webapp_pkg_setup - fi - - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api -} - -src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user -} - -src_configure() { - econf \ - $(use_enable server) \ - $(use_enable proxy) \ - $(use_enable agent) \ - $(use_enable ipv6) \ - $(use_enable static) \ - $(use_enable java) \ - $(use_with ldap) \ - $(use_with snmp net-snmp) \ - $(use_with mysql) \ - $(use_with postgres postgresql) \ - $(use_with oracle) \ - $(use_with sqlite sqlite3) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) -} - -src_compile() { - if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" - fi -} - -src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - if use server; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf - fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf - fi - - if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf - fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf - fi - - if use agent; then - insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf - fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd - dosbin src/zabbix_agent/zabbix_agentd - dobin \ - src/zabbix_sender/zabbix_sender \ - src/zabbix_get/zabbix_get - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf - fi - - fowners zabbix:zabbix \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - fperms 0750 \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix - - dodoc README INSTALL NEWS ChangeLog \ - conf/zabbix_agentd.conf \ - conf/zabbix_proxy.conf \ - conf/zabbix_agentd/userparameter_examples.conf \ - conf/zabbix_agentd/userparameter_mysql.conf \ - conf/zabbix_server.conf - - if use frontend; then - webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" - webapp_configfile \ - "${MY_HTDOCSDIR}"/include/db.inc.php \ - "${MY_HTDOCSDIR}"/include/config.inc.php - webapp_src_install - fi - - if use java; then - dodir \ - /${ZABBIXJAVA_BASE} \ - /${ZABBIXJAVA_BASE}/bin \ - /${ZABBIXJAVA_BASE}/lib - keepdir /${ZABBIXJAVA_BASE} - exeinto /${ZABBIXJAVA_BASE}/bin - doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar - exeinto /${ZABBIXJAVA_BASE}/lib - doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ - src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ - src/zabbix_java/lib/logback.xml \ - src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy - fi -} - -pkg_postinst() { - if use server || use proxy ; then - elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " - elog - - zabbix_homedir=$(egethome zabbix) - if [ -n "${zabbix_homedir}" ] && \ - [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then - ewarn - ewarn "The user 'zabbix' should have his homedir changed" - ewarn "to /var/lib/zabbix/home if you want to use" - ewarn "custom alert scripts." - ewarn - ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." - ewarn - ewarn "To change the homedir use:" - ewarn " usermod -d /var/lib/zabbix/home zabbix" - ewarn - fi - fi - - if use server; then - elog - elog "For distributed monitoring you have to run:" - elog - elog "zabbix_server -n <nodeid>" - elog - elog "This will convert database data for use with Node ID" - elog "and also adds a local node." - elog - fi - - elog "--" - elog - elog "You may need to add these lines to /etc/services:" - elog - elog "zabbix-agent 10050/tcp Zabbix Agent" - elog "zabbix-agent 10050/udp Zabbix Agent" - elog "zabbix-trapper 10051/tcp Zabbix Trapper" - elog "zabbix-trapper 10051/udp Zabbix Trapper" - elog - - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi -} diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-5.0.42.ebuild index 190162272899..ff7c470a27bf 100644 --- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild +++ b/net-analyzer/zabbix/zabbix-5.0.42.ebuild @@ -1,86 +1,128 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod +EAPI=8 + +GO_OPTIONAL="yes" # needed to make webapp-config dep optional WEBAPP_OPTIONAL="yes" -inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" HOMEPAGE="https://www.zabbix.com/" MY_P=${P/_/} MY_PV=${PV/_/} -SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz" +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" -SLOT="0" +SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" -KEYWORDS="~amd64 ~x86" -IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static" -REQUIRED_USE="|| ( agent frontend proxy server ) - proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) - server? ( ^^ ( mysql oracle postgres odbc ) ) +KEYWORDS="amd64 ~x86" +IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )" -COMMON_DEPEND="snmp? ( net-analyzer/net-snmp ) +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) ldap? ( - net-nds/openldap =dev-libs/cyrus-sasl-2* - net-libs/gnutls + net-libs/gnutls:= + net-nds/openldap:= ) - mysql? ( >=virtual/mysql-5.0.3 ) - sqlite? ( >=dev-db/sqlite-3.3.5 ) - postgres? ( >=dev-db/postgresql-8.1:* ) - oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) - xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) - curl? ( net-misc/curl ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) ssh? ( net-libs/libssh2 ) - java? ( virtual/jdk:* ) - odbc? ( dev-db/unixODBC ) - server? ( sys-libs/zlib ) - proxy? ( sys-libs/zlib ) - ssl? ( dev-libs/openssl:=[-bindist] )" +" RDEPEND="${COMMON_DEPEND} - proxy? ( net-analyzer/fping[suid] ) - server? ( net-analyzer/fping[suid] + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( app-admin/webapp-config dev-libs/libpcre - dev-libs/libevent ) - java? ( - >=virtual/jre-1.4 - dev-java/slf4j-api + net-analyzer/fping[suid] ) frontend? ( - >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] - || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) - media-libs/gd[png] - app-admin/webapp-config )" + ) +" DEPEND="${COMMON_DEPEND} static? ( + curl? ( net-misc/curl[static-libs] ) ldap? ( - net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] ) - mysql? ( >=virtual/mysql-5.0.3[static-libs] ) - sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) - postgres? ( >=dev-db/postgresql-8.1:*[static-libs] ) - libxml2? ( dev-libs/libxml2[static-libs] ) - curl? ( net-misc/curl[static-libs] ) - ssh? ( net-libs/libssh2 ) - odbc? ( dev-db/unixODBC[static-libs] ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip ) - virtual/pkgconfig" +" -S=${WORKDIR}/${MY_P} +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch" +) ZABBIXJAVA_BASE="opt/zabbix_java" @@ -94,55 +136,41 @@ pkg_setup() { eerror die "Environment variable ORACLE_HOME is not set" fi - if has_version 'dev-db/oracle-instantclient-basic'; then - ewarn - ewarn "Please ensure you have a full install of the Oracle client." - ewarn "dev-db/oracle-instantclient* is NOT sufficient." - ewarn - fi fi if use frontend; then webapp_pkg_setup fi - enewgroup zabbix - enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix -} - -java_prepare() { - cd "${S}/src/zabbix_java/lib" - rm -v *.jar || die - - java-pkg_jar-from slf4j-api + java-pkg-opt-2_pkg_setup } src_prepare() { - eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch" - eapply_user + default } src_configure() { econf \ - $(use_enable server) \ - $(use_enable proxy) \ $(use_enable agent) \ + $(use_enable agent2) \ $(use_enable ipv6) \ - $(use_enable static) \ $(use_enable java) \ + $(use_enable proxy) \ + $(use_enable server) \ + $(use_enable static) \ + $(use_with curl libcurl) \ + $(use_with gnutls) \ $(use_with ldap) \ - $(use_with snmp net-snmp) \ + $(use_with libxml2) \ $(use_with mysql) \ - $(use_with postgres postgresql) \ + $(use_with odbc unixodbc) \ + $(use_with openipmi openipmi) \ + $(use_with openssl) \ $(use_with oracle) \ + $(use_with postgres postgresql) \ + $(use_with snmp net-snmp) \ $(use_with sqlite sqlite3) \ - $(use_with xmpp jabber) \ - $(use_with curl libcurl) \ - $(use_with openipmi openipmi) \ - $(use_with ssh ssh2) \ - $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - $(use_with ssl openssl) + $(use_with ssh ssh2) } src_compile() { @@ -152,67 +180,88 @@ src_compile() { } src_install() { - dodir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts /var/log/zabbix + ) - keepdir \ - /etc/zabbix \ - /var/lib/zabbix \ - /var/lib/zabbix/home \ - /var/lib/zabbix/scripts \ - /var/lib/zabbix/alertscripts \ - /var/lib/zabbix/externalscripts \ - /var/log/zabbix + for dir in "${dirs[@]}"; do + dodir "${dir}" + keepdir "${dir}" + done if use server; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_server.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-server - dosbin src/zabbix_server/zabbix_server - fowners root:zabbix /etc/zabbix/zabbix_server.conf + doins "${S}"/conf/zabbix_server.conf fperms 0640 /etc/zabbix/zabbix_server.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-server.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf fi if use proxy; then - doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy - dosbin src/zabbix_proxy/zabbix_proxy insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_proxy.conf - fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + doins "${S}"/conf/zabbix_proxy.conf fperms 0640 /etc/zabbix/zabbix_proxy.conf - dodir /usr/share/zabbix - /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/ - systemd_dounit "${FILESDIR}/zabbix-proxy.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf fi if use agent; then insinto /etc/zabbix - doins "${FILESDIR}/3.0"/zabbix_agentd.conf - fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + doins "${S}"/conf/zabbix_agentd.conf fperms 0640 /etc/zabbix/zabbix_agentd.conf - doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + dosbin src/zabbix_agent/zabbix_agentd dobin \ src/zabbix_sender/zabbix_sender \ src/zabbix_get/zabbix_get - fperms 0640 /etc/zabbix/zabbix_agentd.conf - systemd_dounit "${FILESDIR}/zabbix-agentd.service" - systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix fowners zabbix:zabbix \ - /etc/zabbix \ /var/lib/zabbix \ /var/lib/zabbix/home \ /var/lib/zabbix/scripts \ @@ -237,7 +286,7 @@ src_install() { if use frontend; then webapp_src_preinst - cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}" + cp -R ui/* "${D}/${MY_HTDOCSDIR}" webapp_configfile \ "${MY_HTDOCSDIR}"/include/db.inc.php \ "${MY_HTDOCSDIR}"/include/config.inc.php @@ -254,23 +303,22 @@ src_install() { doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar exeinto /${ZABBIXJAVA_BASE}/lib doexe \ - src/zabbix_java/lib/logback-classic-0.9.27.jar \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ src/zabbix_java/lib/logback-console.xml \ - src/zabbix_java/lib/logback-core-0.9.27.jar \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ src/zabbix_java/lib/logback.xml \ src/zabbix_java/lib/android-json-4.3_r3.1.jar \ - src/zabbix_java/lib/slf4j-api-1.6.1.jar - fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE} - doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy - doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy fi } pkg_postinst() { if use server || use proxy ; then elog - elog "You may need to configure your database for Zabbix," - elog "if you have not already done so. " + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." elog zabbix_homedir=$(egethome zabbix) @@ -282,8 +330,7 @@ pkg_postinst() { ewarn "custom alert scripts." ewarn ewarn "A real homedir might be needed for configfiles" - ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when" - ewarn "using sendxmpp for Jabber alerts)." + ewarn "for custom alert scripts." ewarn ewarn "To change the homedir use:" ewarn " usermod -d /var/lib/zabbix/home zabbix" @@ -292,6 +339,8 @@ pkg_postinst() { fi if use server; then + tmpfiles_process zabbix-server.conf + elog elog "For distributed monitoring you have to run:" elog @@ -302,6 +351,18 @@ pkg_postinst() { elog fi + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + elog "--" elog elog "You may need to add these lines to /etc/services:" @@ -311,25 +372,8 @@ pkg_postinst() { elog "zabbix-trapper 10051/tcp Zabbix Trapper" elog "zabbix-trapper 10051/udp Zabbix Trapper" elog +} - if use server || use proxy ; then - # check for fping - fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null) - case "${fping_perms}" in - 4[157][157][157]) - ;; - *) - ewarn - ewarn "If you want to use the checks 'icmpping' and 'icmppingsec'," - ewarn "you have to make /usr/sbin/fping setuid root and executable" - ewarn "by everyone. Run the following command to fix it:" - ewarn - ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping" - ewarn - ewarn "Please be aware that this might impose a security risk," - ewarn "depending on the code quality of fping." - ewarn - ;; - esac - fi +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm } diff --git a/net-analyzer/zabbix/zabbix-6.0.28.ebuild b/net-analyzer/zabbix/zabbix-6.0.28.ebuild new file mode 100644 index 000000000000..e79c51a185e1 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.28.ebuild @@ -0,0 +1,382 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-6.0.29.ebuild b/net-analyzer/zabbix/zabbix-6.0.29.ebuild new file mode 100644 index 000000000000..44884d9f45ff --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.0.29.ebuild @@ -0,0 +1,389 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-6.4.13.ebuild b/net-analyzer/zabbix/zabbix-6.4.13.ebuild new file mode 100644 index 000000000000..2fc51b6f2e74 --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.13.ebuild @@ -0,0 +1,386 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf zabbix-${PV}-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + oracle? ( dev-lang/php[oci8-instant-client] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" + "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". + eautoreconf +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zabbix/zabbix-6.4.14.ebuild b/net-analyzer/zabbix/zabbix-6.4.14.ebuild new file mode 100644 index 000000000000..1f01c04f346d --- /dev/null +++ b/net-analyzer/zabbix/zabbix-6.4.14.ebuild @@ -0,0 +1,393 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# To create the go modules tarball: +# cd src/go +# GOMODCACHE="${PWD}"/go-mod go mod download -modcacherw +# tar -acf $(pwd | grep -Eo 'zabbix-[0-9.]+')-go-deps.tar.xz go-mod + +EAPI=8 + +GO_OPTIONAL="yes" +# needed to make webapp-config dep optional +WEBAPP_OPTIONAL="yes" +inherit autotools webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info + +DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers" +HOMEPAGE="https://www.zabbix.com/" +MY_P=${P/_/} +MY_PV=${PV/_/} +SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz + agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) +" + +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0/$(ver_cut 1-2)" +WEBAPP_MANUAL_SLOT="yes" +KEYWORDS="~amd64 ~x86" +IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static" +REQUIRED_USE="|| ( agent agent2 frontend proxy server ) + ?? ( gnutls openssl ) + agent2? ( !gnutls ) + proxy? ( ^^ ( mysql oracle postgres sqlite ) ) + server? ( ^^ ( mysql oracle postgres ) !sqlite ) + static? ( !oracle !snmp )" + +COMMON_DEPEND=" + curl? ( net-misc/curl ) + gnutls? ( net-libs/gnutls:0= ) + java? ( >=virtual/jdk-1.8:* ) + ldap? ( + =dev-libs/cyrus-sasl-2* + net-libs/gnutls:= + net-nds/openldap:= + ) + libxml2? ( dev-libs/libxml2 ) + mysql? ( dev-db/mysql-connector-c:= ) + odbc? ( dev-db/unixODBC ) + openipmi? ( sys-libs/openipmi ) + openssl? ( dev-libs/openssl:=[-bindist(-)] ) + oracle? ( dev-db/oracle-instantclient[odbc,sdk] ) + postgres? ( dev-db/postgresql:* ) + proxy? ( + dev-libs/libevent:= + sys-libs/zlib + ) + server? ( + dev-libs/libevent:= + sys-libs/zlib + ) + snmp? ( net-analyzer/net-snmp:= ) + sqlite? ( dev-db/sqlite ) + ssh? ( net-libs/libssh2 ) +" + +RDEPEND="${COMMON_DEPEND} + acct-group/zabbix + acct-user/zabbix + java? ( >=virtual/jre-1.8:* ) + mysql? ( virtual/mysql ) + proxy? ( + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + selinux? ( sec-policy/selinux-zabbix ) + server? ( + app-admin/webapp-config + dev-libs/libpcre2:= + net-analyzer/fping[suid] + ) + frontend? ( + app-admin/webapp-config + dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] + media-libs/gd[png] + virtual/httpd-php:* + mysql? ( dev-lang/php[mysqli] ) + odbc? ( dev-lang/php[odbc] ) + postgres? ( dev-lang/php[postgres] ) + sqlite? ( dev-lang/php[sqlite] ) + ) +" +DEPEND="${COMMON_DEPEND} + static? ( + curl? ( net-misc/curl[static-libs] ) + ldap? ( + =dev-libs/cyrus-sasl-2*[static-libs] + net-libs/gnutls[static-libs] + net-nds/openldap[static-libs] + ) + libxml2? ( dev-libs/libxml2[static-libs] ) + mysql? ( dev-db/mysql-connector-c[static-libs] ) + odbc? ( dev-db/unixODBC[static-libs] ) + postgres? ( dev-db/postgresql:*[static-libs] ) + sqlite? ( dev-db/sqlite[static-libs] ) + ssh? ( net-libs/libssh2 ) + ) +" +BDEPEND=" + virtual/pkgconfig + agent2? ( + >=dev-lang/go-1.12 + app-arch/unzip + ) +" + +# upstream tests fail for agent2 +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch" + "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch" + "${FILESDIR}/${PN}-6.4.0-configure-sscanf.patch" + "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" +) + +ZABBIXJAVA_BASE="opt/zabbix_java" + +pkg_setup() { + if use oracle; then + if [ -z "${ORACLE_HOME}" ]; then + eerror + eerror "The environment variable ORACLE_HOME must be set" + eerror "and point to the correct location." + eerror "It looks like you don't have Oracle installed." + eerror + die "Environment variable ORACLE_HOME is not set" + fi + fi + + if use frontend; then + webapp_pkg_setup + fi + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + default + + # Since we patch configure.ac with e.g., ${PN}-6.4.0-configure-sscanf.patch". + eautoreconf +} + +src_configure() { + local econf_args=( + --with-libpcre2 + "$(use_enable agent)" + "$(use_enable agent2)" + "$(use_enable ipv6)" + "$(use_enable java)" + "$(use_enable proxy)" + "$(use_enable server)" + "$(use_enable static)" + "$(use_with curl libcurl)" + "$(use_with gnutls)" + "$(use_with ldap)" + "$(use_with libxml2)" + "$(use_with mysql)" + "$(use_with odbc unixodbc)" + "$(use_with openipmi openipmi)" + "$(use_with openssl)" + "$(use_with oracle)" + "$(use_with postgres postgresql)" + "$(use_with snmp net-snmp)" + "$(use_with sqlite sqlite3)" + "$(use_with ssh ssh2)" + ) + + econf ${econf_args[@]} +} + +src_compile() { + if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" + fi +} + +src_install() { + local dirs=( + /etc/zabbix + /var/lib/zabbix + /var/lib/zabbix/home + /var/lib/zabbix/scripts + /var/lib/zabbix/alertscripts + /var/lib/zabbix/externalscripts + /var/log/zabbix + ) + + for dir in "${dirs[@]}"; do + keepdir "${dir}" + done + + if use server; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_server.conf + fperms 0640 /etc/zabbix/zabbix_server.conf + fowners root:zabbix /etc/zabbix/zabbix_server.conf + + newinitd "${FILESDIR}"/zabbix-server-r1.init zabbix-server + + dosbin src/zabbix_server/zabbix_server + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-server.service + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf + fi + + if use proxy; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_proxy.conf + fperms 0640 /etc/zabbix/zabbix_proxy.conf + fowners root:zabbix /etc/zabbix/zabbix_proxy.conf + + newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy + + dosbin src/zabbix_proxy/zabbix_proxy + + insinto /usr/share/zabbix + doins -r "${S}"/database/ + + systemd_dounit "${FILESDIR}"/zabbix-proxy.service + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf + fi + + if use agent; then + insinto /etc/zabbix + doins "${S}"/conf/zabbix_agentd.conf + fperms 0640 /etc/zabbix/zabbix_agentd.conf + fowners root:zabbix /etc/zabbix/zabbix_agentd.conf + + newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd + + dosbin src/zabbix_agent/zabbix_agentd + dobin \ + src/zabbix_sender/zabbix_sender \ + src/zabbix_get/zabbix_get + + systemd_dounit "${FILESDIR}"/zabbix-agentd.service + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf + fi + if use agent2; then + insinto /etc/zabbix + doins "${S}"/src/go/conf/zabbix_agent2.conf + fperms 0640 /etc/zabbix/zabbix_agent2.conf + fowners root:zabbix /etc/zabbix/zabbix_agent2.conf + keepdir /etc/zabbix/zabbix_agent2.d/plugins.d + + newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2 + + dosbin src/go/bin/zabbix_agent2 + + systemd_dounit "${FILESDIR}"/zabbix-agent2.service + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf + fi + + fowners root:zabbix /etc/zabbix + fowners zabbix:zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + fperms 0750 \ + /etc/zabbix \ + /var/lib/zabbix \ + /var/lib/zabbix/home \ + /var/lib/zabbix/scripts \ + /var/lib/zabbix/alertscripts \ + /var/lib/zabbix/externalscripts \ + /var/log/zabbix + + dodoc README INSTALL NEWS ChangeLog \ + conf/zabbix_agentd.conf \ + conf/zabbix_proxy.conf \ + conf/zabbix_agentd/userparameter_examples.conf \ + conf/zabbix_agentd/userparameter_mysql.conf \ + conf/zabbix_server.conf + + if use frontend; then + webapp_src_preinst + cp -R ui/* "${D}/${MY_HTDOCSDIR}" + webapp_configfile \ + "${MY_HTDOCSDIR}"/include/db.inc.php \ + "${MY_HTDOCSDIR}"/include/config.inc.php + webapp_src_install + fi + + if use java; then + dodir \ + /${ZABBIXJAVA_BASE} \ + /${ZABBIXJAVA_BASE}/bin \ + /${ZABBIXJAVA_BASE}/lib + keepdir /${ZABBIXJAVA_BASE} + exeinto /${ZABBIXJAVA_BASE}/bin + doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar + exeinto /${ZABBIXJAVA_BASE}/lib + doexe \ + src/zabbix_java/lib/logback-classic-1.2.9.jar \ + src/zabbix_java/lib/logback-console.xml \ + src/zabbix_java/lib/logback-core-1.2.9.jar \ + src/zabbix_java/lib/logback.xml \ + src/zabbix_java/lib/android-json-4.3_r3.1.jar \ + src/zabbix_java/lib/slf4j-api-1.7.32.jar + newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy + newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy + fi +} + +pkg_postinst() { + if use server || use proxy ; then + elog + elog "You may need to configure your database for Zabbix" + elog "if you have not already done so." + elog + + zabbix_homedir=$(egethome zabbix) + if [ -n "${zabbix_homedir}" ] && \ + [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then + ewarn + ewarn "The user 'zabbix' should have his homedir changed" + ewarn "to /var/lib/zabbix/home if you want to use" + ewarn "custom alert scripts." + ewarn + ewarn "A real homedir might be needed for configfiles" + ewarn "for custom alert scripts." + ewarn + ewarn "To change the homedir use:" + ewarn " usermod -d /var/lib/zabbix/home zabbix" + ewarn + fi + fi + + if use server; then + tmpfiles_process zabbix-server.conf + + elog + elog "For distributed monitoring you have to run:" + elog + elog "zabbix_server -n <nodeid>" + elog + elog "This will convert database data for use with Node ID" + elog "and also adds a local node." + elog + fi + + if use oracle; then + ewarn + ewarn "Support for Oracle database has been dropped from PHP" + ewarn "so to make the web frontend work, you need to install" + ewarn "PECL extension for Oracle database." + ewarn "For details see https://bugs.gentoo.org/928386" + fi + + if use proxy; then + tmpfiles_process zabbix-proxy.conf + fi + + if use agent; then + tmpfiles_process zabbix-agentd.conf + fi + + if use agent2; then + tmpfiles_process zabbix-agent2.conf + fi + + elog "--" + elog + elog "You may need to add these lines to /etc/services:" + elog + elog "zabbix-agent 10050/tcp Zabbix Agent" + elog "zabbix-agent 10050/udp Zabbix Agent" + elog "zabbix-trapper 10051/tcp Zabbix Trapper" + elog "zabbix-trapper 10051/udp Zabbix Trapper" + elog +} + +pkg_prerm() { + (use frontend || use server) && webapp_pkg_prerm +} diff --git a/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch new file mode 100644 index 000000000000..b3a8f9003dc5 --- /dev/null +++ b/net-analyzer/zmap/files/zmap-2.1.1-always-install-config.patch @@ -0,0 +1,20 @@ +We always want to install configs as the host machine may be different from +the one where zmap is installed to. Plus we have CONFIG_PROTECT in Gentoo +for protecting the user's existing configuration. + +Bug: https://bugs.gentoo.org/885707 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -135,11 +135,7 @@ message(STATUS "Default ZMap configuration file location is /etc/zmap") + foreach(EACH_CONF ${CONF_FILES}) + get_filename_component(CONF_BASENAME ${EACH_CONF} NAME) + message(STATUS "Checking if ${CONF_BASENAME} exists there...") +- if(NOT EXISTS "/etc/zmap/${CONF_BASENAME}") +- install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) +- else() +- message(WARNING "Existing configuration file detected at /etc/zmap/${CONF_BASENAME}, ${CONF_BASENAME} from sources will NOT be installed. Please check and install manually!") +- endif() ++ install(FILES ${EACH_CONF} DESTINATION ${CONFIG_DESTINATION}) + endforeach() + + # Allow Debian Packaging diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml index 46f0b4cadbc4..378248ac6c65 100644 --- a/net-analyzer/zmap/metadata.xml +++ b/net-analyzer/zmap/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>jlec@gentoo.org</email> + <email>jsmolic@gentoo.org</email> + <name>Jakov Smolić</name> </maintainer> <longdescription> ZMap is an open-source network scanner that enables researchers to easily @@ -16,7 +17,6 @@ availability, and help us better understand large systems distributed across the Internet. </longdescription> <use> - <flag name="json">Add support to store results JSON based</flag> <flag name="mongo"> Add support for storing in a mongo DB via <pkg>dev-db/mongodb</pkg> </flag> diff --git a/net-analyzer/zmap/zmap-2.1.1-r5.ebuild b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild new file mode 100644 index 000000000000..b413d47fc165 --- /dev/null +++ b/net-analyzer/zmap/zmap-2.1.1-r5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake fcaps + +DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" +HOMEPAGE="https://zmap.io/" +SRC_URI="https://github.com/zmap/zmap/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 arm ~arm64 x86" +IUSE="mongo redis" + +RDEPEND=" + dev-libs/gmp:= + net-libs/libpcap + dev-libs/json-c:= + mongo? ( + dev-db/mongodb + dev-libs/mongo-c-driver + ) + redis? ( dev-libs/hiredis:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gengetopt + app-alternatives/lex + dev-util/byacc +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1-always-install-config.patch +) + +FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) + +src_prepare() { + sed \ + -e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \ + -i src/CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DEVELOPMENT=OFF + -DWITH_WERROR=OFF + -DWITH_MONGO="$(usex mongo)" + -DWITH_REDIS="$(usex redis)" + ) + + cmake_src_configure +} diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild deleted file mode 100644 index bab11e96bbfc..000000000000 --- a/net-analyzer/zmap/zmap-2.1.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils fcaps - -DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" -HOMEPAGE="https://zmap.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="json mongo redis" - -RDEPEND=" - dev-libs/gmp:0 - net-libs/libpcap - dev-libs/json-c:= - mongo? ( dev-db/mongodb ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} - dev-util/gengetopt - sys-devel/flex - dev-util/byacc" - -src_prepare() { - sed \ - -e '/ggo/s:CMAKE_CURRENT_SOURCE_DIR}:CMAKE_BINARY_DIR}/src:g' \ - -i src/CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DEVELOPMENT=OFF - -DENABLE_HARDENING=OFF - -DWITH_WERROR=OFF - -DWITH_mongo="$(usex mongo)" - -DWITH_redis="$(usex redis)" - ) - cmake-utils_src_configure -} - -FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) diff --git a/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild index eaed24c6933d..5d5794b8f52a 100644 --- a/net-analyzer/zmap/zmap-9999.ebuild +++ b/net-analyzer/zmap/zmap-9999.ebuild @@ -1,41 +1,43 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils fcaps git-r3 +inherit cmake fcaps git-r3 DESCRIPTION="Fast network scanner designed for Internet-wide network surveys" HOMEPAGE="https://zmap.io/" -SRC_URI="" -EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" +EGIT_REPO_URI="https://github.com/zmap/zmap.git" -SLOT="0" LICENSE="Apache-2.0" -KEYWORDS="" -IUSE="mongo redis" +SLOT="0" +IUSE="redis" RDEPEND=" - dev-libs/gmp:0 + dev-libs/gmp:= net-libs/libpcap dev-libs/json-c:= - mongo? ( dev-db/mongodb ) - redis? ( dev-libs/hiredis )" -DEPEND="${RDEPEND} + redis? ( dev-libs/hiredis:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/gengetopt - sys-devel/flex + app-alternatives/lex dev-util/byacc " +PATCHES=( + "${FILESDIR}"/${PN}-2.1.1-always-install-config.patch +) + +FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) + src_configure() { local mycmakeargs=( -DENABLE_DEVELOPMENT=OFF - -DENABLE_HARDENING=OFF -DWITH_WERROR=OFF - -DWITH_mongo="$(usex mongo)" - -DWITH_redis="$(usex redis)" - ) - cmake-utils_src_configure -} + -DWITH_REDIS="$(usex redis)" + ) -FILECAPS=( cap_net_raw=ep usr/sbin/zmap ) + cmake_src_configure +} diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml index 74c2baebb4ec..dce3f3be66c0 100644 --- a/net-analyzer/zniper/metadata.xml +++ b/net-analyzer/zniper/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>netmon@gentoo.org</email> diff --git a/net-analyzer/zniper/zniper-1.0-r1.ebuild b/net-analyzer/zniper/zniper-1.0-r3.ebuild index dae03274def1..e9aa11ad3172 100644 --- a/net-analyzer/zniper/zniper-1.0-r1.ebuild +++ b/net-analyzer/zniper/zniper-1.0-r3.ebuild @@ -1,29 +1,28 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Displays and kill active TCP connections seen by the selected interface" HOMEPAGE="http://www.signedness.org/tools/" -SRC_URI="https://dev.gentoo.org/~jer/${P}.tgz" +SRC_URI="https://dev.gentoo.org/~jsmolic/distfiles/${P}.tgz" +S="${WORKDIR}/zniper" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" -DEPEND=" - net-libs/libpcap - sys-libs/ncurses -" RDEPEND=" - ${DEPEND} - virtual/pkgconfig + net-libs/libpcap + sys-libs/ncurses:= " - -S=${WORKDIR}/"zniper" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { + default sed -i \ -e 's| -o | $(LDFLAGS)&|g' \ -e 's|@make|@$(MAKE)|g' \ @@ -34,7 +33,7 @@ src_prepare() { src_compile() { emake \ - CC=$(tc-getCC) \ + CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ linux_x86 } |