summaryrefslogtreecommitdiff
path: root/net-analyzer
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-09 16:53:27 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-09 16:53:27 +0000
commit80208fb578cf92cc308906660ca6d7860c6b2a1f (patch)
tree6f06818031b553c506fc10dfe9908a835df288aa /net-analyzer
parent06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff)
gentoo resync : 09.03.2018
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/Manifest.gzbin49792 -> 49786 bytes
-rw-r--r--net-analyzer/chaosreader/Manifest2
-rw-r--r--net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild4
-rw-r--r--net-analyzer/dnstracer/Manifest2
-rw-r--r--net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild2
-rw-r--r--net-analyzer/dsniff/Manifest2
-rw-r--r--net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild83
-rw-r--r--net-analyzer/dsniff/files/2.4_beta1-rpc.patch39
-rw-r--r--net-analyzer/nagios-check_linux_bonding/Manifest2
-rw-r--r--net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild34
-rw-r--r--net-analyzer/nagios-plugins/Manifest2
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild4
-rw-r--r--net-analyzer/nessus-client/Manifest2
-rw-r--r--net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild4
-rw-r--r--net-analyzer/nsat/Manifest1
-rw-r--r--net-analyzer/nsat/nsat-1.5-r5.ebuild75
-rw-r--r--net-analyzer/prometheus-alertmanager/Manifest3
-rw-r--r--net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild52
-rw-r--r--net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild52
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/Manifest2
-rw-r--r--net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild54
-rw-r--r--net-analyzer/prometheus-snmp_exporter/Manifest2
-rw-r--r--net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.8.0.ebuild50
-rw-r--r--net-analyzer/prometheus/Manifest4
-rw-r--r--net-analyzer/prometheus/prometheus-2.2.0.ebuild (renamed from net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild)6
-rw-r--r--net-analyzer/speedtest-cli/Manifest1
-rw-r--r--net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch36
27 files changed, 217 insertions, 303 deletions
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index dbc4aa94a808..1b794f403c60 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
Binary files differ
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index cd376e087e9b..3b127691165f 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -4,6 +4,6 @@ AUX chaosreader-0.94-divisionbyzero.patch 640 BLAKE2B 50d8d24212d1150128f22d74d0
AUX chaosreader-0.94-oldmultiline.patch 487 BLAKE2B 596eac7253649813d6f3486522a998c8c647d2cde8830964480a394b91486f3b710c2fb7a54862be6ef8f60c8db40052cf8d4e6c8e638efc648194462354e244 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941
AUX chaosreader-0.94-zombies.patch 349 BLAKE2B 607cd4f48c77613ab794f8d2fe00f5653854fe3d5a669412190e520015724cc9ad1c246e308a0c43c1ec0b4e29ec261c6eb77910dccbc0f8ddfdc730ff9f8cac SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3
DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
-EBUILD chaosreader-0.94-r1.ebuild 799 BLAKE2B 871075548cb81be80492b772bae911260f94c183beb071db10aecceb624728a71d235046d9f1e81363d573cc428f3aabdac7daaa1537b43babe71f15a824b534 SHA512 cba13a42550990f43ffc14e8c2b6030e14e5ae0dda02f10c8f6463387251018f3e673548562edd6f4a8cfbd913d41fa1469b2b9fd835bb433391859b9d46a2b1
+EBUILD chaosreader-0.94-r1.ebuild 798 BLAKE2B 21f05d27abc4da3457da6c49f43c4a132c5a83b2e6a23ce78b58d6b9b9422629f411bae7b6dec704685d32137a17731a01b653da6f5403f8f95f818d79dd6dc1 SHA512 c0d95454d4cb0bc2b8c429d2c40e0c0fcc5ada85e726c6511e5c1ed5bd168a61f44ccecfc89a60ee4b27d1987a8fbbbb1486c38757524a2d17ee6b339269641d
EBUILD chaosreader-0.94.ebuild 578 BLAKE2B a5f7f8a8333ad8f5f17d8ee2254ab8d0f94650576f15977f8c1ba1372456ec35c06f6ae3df2515c7a67bd879360891c95c60b4107e79461ff27f43e64b0a04e6 SHA512 2aa14858e54b22764d751dda2a08520ea38abff12740719d31d596712d916a4bb0faafb0f39d3ec601c68d12bc2b459e4a5422287472c528a3251e78dcb3e5d6
MISC metadata.xml 412 BLAKE2B c0864f8b120780471a2c840a1258abc3a70d3183e318aecd7e2ac4852428bf2c57fa32713e50283dbcb5de311ab33893c0b8f66a2bc72463872e7758e5d96ab9 SHA512 fe8a71cba4549b081b24d302c3b97cfbce59e5c338089fd12f706320fd9752fe2ca7f8875a768da68a9ef9c8e36a3e291a29b5a79e414586c38c21e6d54d340c
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
index 24abf84e93e8..a1d5cbdad5b1 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -10,7 +10,7 @@ HOMEPAGE="http://chaosreader.sourceforge.net"
SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
LICENSE="GPL-2"
IUSE=""
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index e9ba17aa2295..172ad79714ac 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -1,5 +1,5 @@
AUX dnstracer-1.9-argv0.patch 343 BLAKE2B d3a1fe5b9aec3099ef2e385fdbd4e638cd8877bf533e59abbbfdf46bb80d6c0a64f4d3ad6ebc96e83bb007bc3bd22a1c26815fc7a7e98e63d8ef7a975f0307f4 SHA512 6871b93a4ebf1d307c4ef56ca134d8e39c152fe22564e6845ead6d7d97c96ff21982649808618d098b7105159a9bf09a201c4147c61be0b98676a69a9f4bfaa2
DIST dnstracer-1.9.tar.gz 130884 BLAKE2B cf08795eed59851c6da5d5c0ecc1a0b8445584ab10a9adf3cc526f5f831ceef9ed8deee8728ec964c35808a71e865f841f698403bcc0f16346e3abd5e13cac8b SHA512 e69fe772062ff315ff3148c26df78bd41c75d11dcfa6431f1e9374e6069182bd80826b22dc116011d975838d9527913d46edd78de049edd25e3ac9247d5f3473
EBUILD dnstracer-1.9-r1.ebuild 477 BLAKE2B 93d941b4915e6604fb79c4ca398cd6cec9ad68c9f4ab074fbe9251e825fbe7330c73f8317b771908dacbd63fd9f795d5fc8f972e64b998287cdd9c02360a5feb SHA512 d4eb0a6b6ed57a8325ba5d98d524888052d729d2b06e117de4ccad1bd66049fe35ef95886e049ac6723c3cf57276cd33939d589f8063f91b54e8bf3b7bd50565
-EBUILD dnstracer-1.9-r2.ebuild 530 BLAKE2B e1127f76b4b8106342f6a7c8fd237695ef67bd4b11d93210e2643f5d345e02397b1b5c0d2ea42b647cf8094d7f03e14af597080212d1f04f2ab06b3ed8c15ef9 SHA512 a7e1da3b3948d816b7ac23471280670f4b97d40d9d8875ea3f19f7ff79d0957bf6abb9400ec03377baa29aec87451349ef845fddd180783bdd86b6da26b4061b
+EBUILD dnstracer-1.9-r2.ebuild 529 BLAKE2B 70d722378fd265e2a44c2094abcacc9cad8eec64a8f0c1512f6857a17b527775c81857fa3cece1ecb8e7e587368d00d0e94685320eb850a06285baba520d0da8 SHA512 f0d9608ca4aeb09ec4dca0b028b778343ee1899cb7d808b90a6b3fb2b8d390cb53842ae022f29cb4841ffd4afb0cf74361eb020ed8271b6e7fcbc195692ab3fa
MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
index ac1c0165ea7b..339c4fa5b304 100644
--- a/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.9-r2.ebuild
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="amd64 ~arm hppa ia64 ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux"
IUSE="ipv6"
DOCS=( CHANGES README )
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index 794c002482aa..6b2b1c8b72e1 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -3,10 +3,12 @@ AUX 2.4_beta1-httppostfix.patch 674 BLAKE2B b716835e750e4029f974115ee54e86b05675
AUX 2.4_beta1-libtirpc.patch 590 BLAKE2B ea64ccdee4f518e9b667460805d82609df114082a4046c308d8978baa92be81c973b28b07da5b7277043ed3a4f2257a671db56e3d6c717c5e217e66096ab0e22 SHA512 c794ba7d43d7fac77a4d427f164efed1514a9caf93af8c11d6e094448b8b5c26be2d3da85e3ad62611a4bf337a3cca68ba27d3813c51d0692e9a793788c31f9d
AUX 2.4_beta1-macof-size-calculation.patch 369 BLAKE2B 0562e78434326d7e5b4d266b607d67f6b23a58fafd0deb5db23fd896ecc9c8f7fc05de71b43698926b8eeed6f033998b7942844e1e845d8e55cb12705d286271 SHA512 070695aae4a0374f6d073e71f4e9362387b3b6a444058c9371564779b22c2218f32e830c7a1e39879860e956f8c826199ba90a0cb67423379358c1d0dd857ff1
AUX 2.4_beta1-make.patch 2086 BLAKE2B 5808455a9751c64f17f08bfdd04073acc80e21d9ff18cc8ab41fbcc57ac7046348e6b1a8fe77ff6410afebcd10c77e7418dcae9cec57254e7eba039cb79ebfeb SHA512 bd16046e6ed429494f036234ac741f32d14e6f61f9cfdf303a18e04ed378ee2485d3b10cb2371d0cad30c18d7d2805dbb005cd48eece1bc2956187238a05b0b1
+AUX 2.4_beta1-rpc.patch 1157 BLAKE2B 9055c393ff3f8fe5c31ddf1141c2b2edf0d93b27b754d08e27124b196a9c30e28054a6a9c0e12481ce5247c46b9a69bb979831974fdb16a9db65111842ae87e3 SHA512 c45a3ab69222a25ac66a07c557431dd84e13ae8082ddf0ccf9f94e395a1b68a09fb136a36a8e3ba4dae4fe8e1f2f67c229ca1dc7488174893b2d43dc2eb8a471
AUX 2.4_beta1-urlsnarf-pcap_timestamps.patch 463 BLAKE2B 77512cb1fc1449d90006c4a2d795172a8bd20532b3c5e4d37c993f45def3894950c254bec7cd406757f8db8973270b3d9ccc7eab8f583bfb5ddbb3b6f2e39853 SHA512 57a7e9e50b76ae260617f3c66036de41329c744ac1f08d70993a2bf724e22828320107776ca726b3c0bf20d921134368087dedeae19f287770cee6dca7d6e3e1
DIST dsniff-2.4b1.tar.gz 131666 BLAKE2B f0cc3c875ed37ee573a28d2c54e7dc89bd14df233b047273ebb054820c2f8c61be22b0310c9354446a9ca6e99fdcd7f027fa7a122da667d4a809362dcb8c957f SHA512 62dafab293de6dc3e9b01561b3627d63ca334467c01c3550a6318d8bcbe99d5a301ec16967af34065a14e8bca1c4b6a41da766cbd51ebd8338615b950c4f642f
DIST dsniff_2.4b1+debian-18.diff.gz 44819 BLAKE2B 79b5614cbe4f36c2d321cd392cbfd2db94530680fbbab35f5069850ab6bda0fab6b7a2a93a983773793b9f645499c24393d6c652f0aba6c48651ae17ff4b24fe SHA512 9f219dfa7fd68399126cd2b373a7054168638606c03e8297af46a89c242f81e45f99857922e6782cab608b8cafab528bcfaeb37acd3cca85f5b4a8efd91e71d5
DIST dsniff_2.4b1+debian-22.1.debian.tar.gz 29657 BLAKE2B 88333aad1498cb5b4fd68776f8e0599672c9c69ee5b0d5424f0a8e9f0958412fb420a6d6ae6d46dc5e6c73c4ab39b1fedbef1a4c6879bb4c2bd363271cb6d98b SHA512 11c6a3c04b5a8b3afb78901003132186964e88019011bea69b43a000c31d23f15c1a1c343c2ad1b03bf0a09664aebfa6f99e335fdfa1496bb020db6541eab6e3
+EBUILD dsniff-2.4_beta1-r10.ebuild 1971 BLAKE2B 6119b39b1d96ef00cf73e92447750b06e6ae351cd17ff75206163829b21e6b720f1b7d88dd33997dbef0ebfc962ee4965cee329815800ab0e15c881608674639 SHA512 95cd00f4758b4d779201453d98484ed1c2e25c815c1aafe6baa016e42f5f50912aa9d85cdf05932279bf3d5e0f3a7d65e406722b13c0ea72333f4c2a777fb255
EBUILD dsniff-2.4_beta1-r4.ebuild 1418 BLAKE2B 9b7a847cd8e524b0e553b8d847b55660f2af0e9e889cab1a01944d37b7309581d0d2e68a0bfe55d42fdc0b5965f7c5f8989d808b49e06fb48cf72afd7024908b SHA512 6dfbc3a94e4c9361dcb5875097c15547b61d8754f282b9b71c223be033712c8d2e0fe83ebf45017ad00c26f2646320077c7c102053f452ca5f60e0297cadcb32
EBUILD dsniff-2.4_beta1-r7.ebuild 1563 BLAKE2B 18a30d1705e82d23edd6fb19ad5474c7f00d6a627f819ad6b39942755ab0344874f73757d9404edf0e2c029426858d1a7ae8486f8f4ac694d7a4a40ec60fcdc1 SHA512 941d3954e19d99513298fc8c18a2c9bc257efb2611311aeb1d0e9a079c4e2f4439f95389e8e3f103e97a7c8dc87860c1b45b29c6a43f579ce7a001a0c4d4e8fe
EBUILD dsniff-2.4_beta1-r9.ebuild 2082 BLAKE2B de5c86f3f0d7944314893e9fef88b35c6794445c250e5adae147eaedbee3c107f9f2830fe74ae28ebaa196e6abb1097236d33c003ed2586f5820dc6d479e9231 SHA512 54484074acf7b0f906985530d3f7a1c0139bbd30325ba53234627d40d154377e6e53ef5fc99c33db6381d3ba329d6b26d7002e8a979eabfa5db69dcb9de1a2c9
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
new file mode 100644
index 000000000000..6cf8570555a7
--- /dev/null
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="A collection of tools for network auditing and penetration testing"
+HOMEPAGE="http://monkey.org/~dugsong/dsniff/"
+SRC_URI="
+ http://monkey.org/~dugsong/${PN}/beta/${P/_beta/b}.tar.gz
+ mirror://debian/pool/main/d/${PN}/${PN}_2.4b1+debian-22.1.debian.tar.gz
+"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl X"
+
+DEPEND="net-libs/libpcap
+ >=net-libs/libnet-1.1.2.1-r1
+ >=net-libs/libnids-1.21
+ net-libs/libnsl:0=
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=sys-libs/db-4:*
+ X? ( x11-libs/libXmu )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_beta1/}"
+
+src_prepare() {
+ # replace Debian patch 23 with a simpler one (bug #506076)
+ mv -v \
+ "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch{,.old} || die
+ cp -v \
+ "${FILESDIR}"/${PV}-urlsnarf-pcap_timestamps.patch \
+ "${WORKDIR}"/debian/patches/23_urlsnarf_timestamp.patch || die
+
+ # Debian patchset, needs to be applied in the exact order that "series"
+ # lists or patching will fail.
+ # Bug #479882
+ eapply $(
+ for file in $(< "${WORKDIR}"/debian/patches/series ); do
+ printf "%s/debian/patches/%s " "${WORKDIR}" "${file}"
+ done
+ )
+
+ # Bug 125084
+ eapply "${FILESDIR}"/${PV}-httppostfix.patch
+
+ # various Makefile.in patches
+ eapply "${FILESDIR}"/${PV}-make.patch
+
+ # bug #538462
+ eapply "${FILESDIR}"/${PV}-macof-size-calculation.patch
+
+ # libtirpc support
+ eapply "${FILESDIR}"/${PV}-rpc.patch
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --with-libtirpc \
+ $(use_with X x) \
+ || die "econf failed"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake install install_prefix="${D}"
+ dodir /etc/dsniff
+ cp "${D}"/usr/share/dsniff/{dnsspoof.hosts,dsniff.{magic,services}} \
+ "${D}"/etc/dsniff/ || die
+ dodoc CHANGES README TODO
+}
diff --git a/net-analyzer/dsniff/files/2.4_beta1-rpc.patch b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
new file mode 100644
index 000000000000..b43c91d95815
--- /dev/null
+++ b/net-analyzer/dsniff/files/2.4_beta1-rpc.patch
@@ -0,0 +1,39 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -37,8 +37,8 @@
+ X11INC = @X_CFLAGS@
+ X11LIB = @X_LIBS@ @X_PRE_LIBS@ -lXmu -lX11 @X_EXTRA_LIBS@
+
+-INCS = -I. $(X11INC) -I$(srcdir)/missing
+-LIBS = @LIBS@ -L$(srcdir) -lmissing
++INCS = -I. $(X11INC) -I$(srcdir)/missing @RPC_CFLAGS@
++LIBS = @LIBS@ -L$(srcdir) -lmissing @RPC_LIBS@
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- a/configure.in
++++ b/configure.in
+@@ -337,4 +337,23 @@
+ AC_SUBST(SSLINC)
+ AC_SUBST(SSLLIB)
+
++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_OUTPUT(Makefile)
diff --git a/net-analyzer/nagios-check_linux_bonding/Manifest b/net-analyzer/nagios-check_linux_bonding/Manifest
index eea02f0954a6..f2f35a0e4254 100644
--- a/net-analyzer/nagios-check_linux_bonding/Manifest
+++ b/net-analyzer/nagios-check_linux_bonding/Manifest
@@ -1,5 +1,3 @@
-DIST check_linux_bonding-1.3.2.tar.gz 24540 BLAKE2B 19074887bc4decb8f0d6700beef0c47f35718d1665c409f5a517352be4146b66c65621cf07c915606ac730fff2777fe9e8f9456297606ef63bb82c4db1dd6de1 SHA512 c00eb7b209d49c8552b1e5e38196890bc4c5bed26d57af8c8b89e750488bd0822c74ab2efa58ba20309cfe6444e5aafd98db14946a5b09e334fb5f9a4fd404e8
DIST check_linux_bonding-1.4.tar.gz 24670 BLAKE2B 6f136043fdcc74f677963ad4798ea18a8f813c3bf6cf1d00f6649d72dfc7d953c01a43bd3050758a8461f255ce3a9d3ddbdd1bcb29de316ea6438f20409ce699 SHA512 2b1e11007680accd8667ceb8710c7a7448766fd0c5aa3be60a34209f1b25892e7fecc46f9fc5e7cc0d4776f68cc17f8db8d8f2758695c82045a5832e8a4c7e81
-EBUILD nagios-check_linux_bonding-1.3.2.ebuild 715 BLAKE2B 7a7274e75740d03026e83d8c9d7dd6b17d65259e76c9ef5e52b46da00fe932a68b66c470cc013c103c5efd663a83b3eb1cf4619e4098139a62cbf7ba68dc94c5 SHA512 1c3e9cabe175877fb22d3e9821b9d9d54eabd37e7c2ac1f49071e618a335a24b4f8293ec26fc44048c45136ef33630a7e12c3c54396664cf1593d4ff4db8cd2a
EBUILD nagios-check_linux_bonding-1.4.ebuild 715 BLAKE2B 7a7274e75740d03026e83d8c9d7dd6b17d65259e76c9ef5e52b46da00fe932a68b66c470cc013c103c5efd663a83b3eb1cf4619e4098139a62cbf7ba68dc94c5 SHA512 1c3e9cabe175877fb22d3e9821b9d9d54eabd37e7c2ac1f49071e618a335a24b4f8293ec26fc44048c45136ef33630a7e12c3c54396664cf1593d4ff4db8cd2a
MISC metadata.xml 254 BLAKE2B ac21e0d512ed35dc324c06da92be70b3da50223304de1259df23a113a27d298699b15f7ccea4aa70f25340d35fdcf765925e4c8d4a826088a37360cc95c7e1a5 SHA512 d54bbd438702882474a84ef2661d0010a26676a9b1d2315076519409fe5432f4e818fa8c4838f3f773be36dc1ebe18f291e9ed81f87ef6e059ef2ecde072cfd6
diff --git a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild
deleted file mode 100644
index f4770fb1ae58..000000000000
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.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 multilib
-
-MY_P=${P/nagios-/}
-
-DESCRIPTION="Nagios plugin to monitor bonding status of network interfaces"
-HOMEPAGE="http://folk.uio.no/trondham/software/check_linux_bonding.html"
-SRC_URI="http://folk.uio.no/trondham/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
- default
-
- local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins
- dodir "${nagiosplugindir}"
- exeinto ${nagiosplugindir}
- doexe check_linux_bonding
-
- dodoc CHANGES
- doman man/check_linux_bonding.8
-}
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index da4e8875e38e..3539622d3c6a 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -2,5 +2,5 @@ AUX define-own-mysql-port-constant.patch 3271 BLAKE2B a9776567af41b106616c10aac0
DIST nagios-plugins-2.0.3.tar.gz 2659772 BLAKE2B d4deccf04458daccde5fbe7e6c659282d36fec69096e6b1b8487455db0089f7a5073ce14ef6a74f82869de08ad740b0d3b617d691c85b8895e475302152ca33c SHA512 2753e6f3fc7433a5583fee01e63a65b9ea74155964f2b6e6bf3458e56cb29ea5dbd020f83816044a717b66d6548d203b3a082fba0faedcd629c7a8457bc19b36
DIST nagios-plugins-2.2.1.tar.gz 2728818 BLAKE2B ea89862935491d9c31403a36712d39557fa8e90dc2306e027531e974933cd13cc6b55ebfdd7dfc7541d6458741aaf57714df57fdddc92049001a59f0ffb6413a SHA512 6ffe313a56a305b382f62abc0f0958d7078f9050e1340f30721d6e6f71944b57b1650e90e6835c35dd7c9f3f4b4cee9f235b8382b0811db30b3729daaafc9bc3
EBUILD nagios-plugins-2.0.3-r2.ebuild 2828 BLAKE2B 2581655bd322f74c6253811b6a10de420c5f1c90677d87d5f344f4939d45b00d394fe8b026b44ed9bf76024d18ef67d4f7ab222e6fa75e72d88e7c4f44eae94a SHA512 cabe19f142006c4d104721361c2c58fc7a103717041050a21bc21b47adb6702bf05c77f1ed8b063f74b11a59a2dd1120d8478e5b1d803636aeb9f1ae92c2ae91
-EBUILD nagios-plugins-2.2.1-r2.ebuild 3111 BLAKE2B 673f3e6e8e8de4d7520986d888a38b0f8a1b3b21d9fbf238cd7c3cb6e6fc6032b3c47404e7c64cb746e31420d2562766575a12b65730b219904a81981184c7d7 SHA512 0868f3bd07033f7e00726cacef8c45bddf885a12ad64be20d0b77d61256a40f836c36db81b7972468cd28ee4d0c4bafc38d5fbf8dcb0e084be7f34735a5e52d3
+EBUILD nagios-plugins-2.2.1-r2.ebuild 3110 BLAKE2B 5512dffd00d20b21b2add22ab17dedc2168025266ad3a33a0e3cd49d86203f493dc7d4e8aeb1f81438257ec4e2f005c21751723279bbcf7a2fa34dac22fc6358 SHA512 cf4f79dbc8ef0e28d3b93894e25e2853020ecb0079432372eb34e5770dec389d2ffc2bd2b9fdaef71617c2562e83f1417ce052a2e89d7e0d66b4bcfd92d7aea8
MISC metadata.xml 1430 BLAKE2B 63a889dc51085a41a5dec4b6c32e6262ff59fdb1413699736d6332a75406749551b1c82d62a2662f4d7935c46a4bc3b51e0ca7e3b070656163fb0b6fc69c742e SHA512 d6cbc6820de52e1ed471b97a6c592af72474db492204594314eebb656b8abe89a01667a7bbb621418fd393aeacb28e9a10c5749de7ace67dd15119f701019e72
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
index bbd21403f5b2..bf726cb7c1fb 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ 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"
+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
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
index 12b17328c203..b700a0586ad2 100644
--- a/net-analyzer/nessus-client/Manifest
+++ b/net-analyzer/nessus-client/Manifest
@@ -2,5 +2,5 @@ AUX nessus-client-1.0.2-make.patch 2647 BLAKE2B d7f7d3d9ead2562efe78e39cfde8bb6a
DIST NessusClient-1.0.2.tar.gz 2058324 BLAKE2B 8e2d27bc2c88d57bb57088d6061119144282db547d3f21bb242c9ba20e7f091fdbae3ee26f21ab4b8c33b8a3ff901c311e77ecb2d28aecf3d066152db2d2efcc SHA512 999e8ba11208351ffc37bad9fabc8c0b01e4abc2a638660818a1877cdb21a5d3b40d330b722debe9833e87db60e4f8aef53044f14fe5eeb8ffe57f3522bfa927
DIST nessus-client.png.bz2 10043 BLAKE2B 471dabb9effab168d6a92595a258679e961e8e1a64c29aa4b0ff0d013b67bf5b417d764390eddfff6bd9bdae0f385d1858890ec97dfbffa2f1d45b26e40c7dc3 SHA512 39e2b41e3b4fcfdace80085c917754fb0a4cfebcf1f684d97e36e5212e8e2e3539f10527909d7e4e350afdc73801ac1fb5bff2bb5c12be4770e2bb27487542af
EBUILD nessus-client-1.0.2-r1.ebuild 1245 BLAKE2B 0ce6ec60532f3c26a6dfc78fa7883be381a0d761c19789fa5a8646710df0a063430b6eae54c4d5c9e24b103654608b5dfdc7fad80f674ffe021481bd0fa1f35f SHA512 01e860aab8d49353588f62ff5a3927f13fba469d1c19fc0acccb9650dd859ffba5598ec70f295c29e469994c5fbf5cc34b749fbb54fca0ab855a55bc92858a44
-EBUILD nessus-client-1.0.2-r2.ebuild 1316 BLAKE2B fd08669ebb5e366b7bee3bce8746c08f17ac151d8e565f1968edd28f24e413495540505d5c8537de2d7db35a07f292357cdfd12784aa11a9faf0fa67aaa0d3c3 SHA512 1cd722bc85f1d514616ef98590a4d3b7f5c41f406894ce96222be1673028e00f66c534757c2e416eea411b084bf42fdc63012b702a68bc817aba2ef3f018b636
+EBUILD nessus-client-1.0.2-r2.ebuild 1315 BLAKE2B 30d5e5e4328dce04ad2b8a4169ff1667359c87d73e5c608660aef55826443363629480b30fd44241316db8b2d1110cef6c440fd00572da6cce015dfdee55e7f8 SHA512 eee1a449f0fec4da390be04ae75d5c3896849898f3485415313179b5be8fd0cc4383042d6cd2f7e49c9401483c34b40fec6a266eff631e5948c52db45299d297
MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
index c7485b9e7762..92cbf3844529 100644
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="libressl doc"
RDEPEND="!net-analyzer/nessus-core
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index cee2fc4fe4e6..5dcde134af24 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -8,4 +8,5 @@ AUX nsat-1.5-va_list.patch 470 BLAKE2B 2ac6936d216b497ecbd47cc167f9f142fd6bf20f8
DIST nsat-1.5.tgz 410603 BLAKE2B 083ac2879afae87d1282bb643d0988b2f858f9c934fe7a6e24407c0f5cf90ceba7be17aeeae8e7cb9d0f7a31cce171fed6382351ea8413b13d3e4343339f0c9c SHA512 1a5b8e88f7bcacdbe1144a719a2e446c0ea025ad4e5f8c79ccb939083308cd2c1b2c1f3d7ab3b791924d5855994cbc3fded95aa36df23c12fd76fc20341a87d0
EBUILD nsat-1.5-r3.ebuild 1448 BLAKE2B 3fb6b15d31da75be14233670718eca29182d194004f03eaa7df8548b210cae077c32431a51927269a4fda389d5674a0682d8ed694d39d1cfa94a5ac343d17f95 SHA512 e9fed8fba8257ccafe401a4f16cbc70b9b8cace66342d6cbaadd70d88084fa84dc8a4a54e0b5047a201e159668ab3badf99f38a011f7130368b789043010d9d4
EBUILD nsat-1.5-r4.ebuild 1548 BLAKE2B fc4e2e35ad7e75644b307e5e0b9ff78dc27ae6c65fcf2a132a5aef15075ca92579753792d0192fdfef51b2026743e6d3e866f2b6108c5a2a8d17458742ee6efb SHA512 6973436f22c62ffefdd76e198e3b436f28bd84dcf4ddab01c528f519d6d5268cbaca8da7531ef3cc95d908e683ed12287e076ee2a9adb8ba54158a6954f70a12
+EBUILD nsat-1.5-r5.ebuild 1506 BLAKE2B e431638c8fa6765aa06bd00910207c6994fe2c41a136aa2a1bf119a67c0a601c11457fa3b096a54ef63a2a7387a0a607a3307dd014b3f7246570794d63645359 SHA512 16b57ddf705ed6bb2e2cc9a8a0337de45c949c6e9c608478827150825340766b4046d977dd8a79f2d8da77dd24b8e8e8cfc46b4903db7fc079df15eb001bcc65
MISC metadata.xml 468 BLAKE2B abead434d23b600816574da4b21286111215e5a5683b14f4b24dff935bcc79c691e787688d78d3bf33e937b3260650dc0a75a8b231ff59c0a6ecbbd8983426a2 SHA512 54bdd25a484a9b3f2ec4642494f4f8e9433c33f013eadc149a77b0ffc3455579a3598ba323344107143b41ae81e1cef6195dcab5b38c6f093f804e468a650454
diff --git a/net-analyzer/nsat/nsat-1.5-r5.ebuild b/net-analyzer/nsat/nsat-1.5-r5.ebuild
new file mode 100644
index 000000000000..87d30b46c180
--- /dev/null
+++ b/net-analyzer/nsat/nsat-1.5-r5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
+HOMEPAGE="http://nsat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
+
+RDEPEND="
+ dev-libs/libmix
+ net-libs/libnsl:0=
+ net-libs/libpcap
+ net-libs/libtirpc
+ net-libs/rpcsvc-proto
+ X? (
+ dev-lang/tk:*
+ x11-libs/libX11
+ )
+"
+DEPEND="$RDEPEND"
+S="${WORKDIR}/${PN}"
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.patch
+ "${FILESDIR}"/${P}-lvalue-gcc4.patch
+ "${FILESDIR}"/${P}-strip.patch
+ "${FILESDIR}"/${P}-misc.patch
+ "${FILESDIR}"/${P}-va_list.patch
+ "${FILESDIR}"/${P}-libtirpc.patch
+ "${FILESDIR}"/${P}-amd64-compat.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+ nsat.conf || die
+ sed -i -e "s:/usr/local:/usr:g" tools/xnsat || die
+ sed -i \
+ -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+ -e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
+ src/lang.h || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC
+ econf $(use_with X x)
+}
+
+src_compile() {
+ emake MIXOBJ=-lmix++
+}
+
+src_install () {
+ dobin nsat smb-ns
+ use X && dobin tools/xnsat
+
+ insinto /usr/share/nsat
+ doins nsat.cgi
+
+ insinto /etc/nsat
+ doins nsat.conf
+
+ dodoc README doc/CHANGES
+ doman doc/nsat.8
+}
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index 52edac0f5376..6ddaeef76c7c 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,8 +1,5 @@
AUX prometheus-alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
AUX prometheus-alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
-DIST prometheus-alertmanager-0.13.0.tar.gz 2782163 BLAKE2B 4918f84a8a8312a3fa53f03b78bb8acc6118e69048ff3fadb2676721340fa120360a636fc11485999e948965569241658eb8ee01204453120adcce6bd1da40d4 SHA512 3f402f577e42bfc9dd9ef2dc1cb634d3654776f3b13d698170e3ae3c1612a45115e0d188d0768880ca968ec9157e05a2082647ca1de132f8be3c7eb7ad0dad42
DIST prometheus-alertmanager-0.14.0.tar.gz 2786623 BLAKE2B e9c773af81153b3062d27464c6b8d1edcafe66575b8d5a6309b162c6546d3dedf7ae5b1afcf4dafb3dfdb6bcf826aeb9119b27cfe596da365a6272ee71b30441 SHA512 e352d51d86b853ff679892df3c494da2c7b4afb918d807e6d63b76e959b586f43a4c773de18bdd9e6a5067d4034748bb304ebdee2f08983b00890c1ae393d0b8
-EBUILD prometheus-alertmanager-0.13.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
EBUILD prometheus-alertmanager-0.14.0-r1.ebuild 1311 BLAKE2B 347ffeaca216e1b1234b6005fe670696ec2d580738b8b0dc7236a28ba8821176d3eba3a37a0d7772f983be3632d7f709fa37f3d75603607c7bdf25a271955be2 SHA512 64a1ceb5cca20a51ad3ba9c5dee50d20c3774acabae01dcb3ace1a185b125eb44dfe1ba1ffc60876c09e5b14d59d421b9950f4e71d2f937c80bb398e65bf5a08
-EBUILD prometheus-alertmanager-0.14.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild
deleted file mode 100644
index bb54481780e1..000000000000
--- a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="fb713f6"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix alertmanager || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin alertmanager/alertmanager
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- insinto /etc/alertmanager/
- newins doc/examples/simple.yml config.yml.example
- popd || die
- keepdir /var/lib/alertmanager /var/log/alertmanager
- fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
deleted file mode 100644
index bb54481780e1..000000000000
--- a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="fb713f6"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix alertmanager || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin alertmanager/alertmanager
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- insinto /etc/alertmanager/
- newins doc/examples/simple.yml config.yml.example
- popd || die
- keepdir /var/lib/alertmanager /var/log/alertmanager
- fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
index aa1bc6485c67..f45f40488179 100644
--- a/net-analyzer/prometheus-blackbox_exporter/Manifest
+++ b/net-analyzer/prometheus-blackbox_exporter/Manifest
@@ -1,7 +1,5 @@
AUX prometheus-blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
AUX prometheus-blackbox_exporter.initd 614 BLAKE2B bc2a5d5b3a0383a35cd223c94169b57045f2dd2506753541dbf61b3003b042a5d43bb08237ec367e1d48104f0b30b7a50713e96e9b03c2fbb6e079c9858936eb SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb
-DIST prometheus-blackbox_exporter-0.11.0.tar.gz 2143849 BLAKE2B e9a35b4b5adca955c1ac5b2219dd892112f6b3bd2dfe825f6393daca9dee3cba943309be024cc56f3d682a8544a4f78949072de620a4e6b07da61a740a84d55f SHA512 9bc397b846cdaf8cc0054100adffb39bbe2e5cf6743a61565e90f2e4298d8a165a138c985431937083fd88ccac065e278d8c9eab8a83015bf58fddb6da8ea812
DIST prometheus-blackbox_exporter-0.12.0.tar.gz 2202465 BLAKE2B e3b082f8a491b531b0caf3331ecd391bf8734df0915ccbb7988ac1e67e57436bd45169aa403d5511fbb44eb176f89836ad8c04c491f5194f90f9f8a3b686a656 SHA512 2c98c0f4127bdd04ac54eb182c5468fd38121558f85aa8b4bec860f783f266b144df3153da0b028fdb84a4131a4e374a969bb09ce3a781ddf95f0a008c11bbb6
-EBUILD prometheus-blackbox_exporter-0.11.0-r1.ebuild 1439 BLAKE2B 46176482d2de58a7633d942a618609290685b7bc19241040cc89469d036b41319ddb6e3d2632af8ab7fa01a6fceb75319782c7c4f933e529ac9eb0baf7dc395a SHA512 6be9eb68a9d3b5158cf465dafb7b7ea7dc6e8f72976bb6b574314e55df06041126921bc7e95ef56a12508574fa6a4f2d0a6afa26bc5ba493dcd1b63a7c49a301
EBUILD prometheus-blackbox_exporter-0.12.0.ebuild 1439 BLAKE2B 56670b1c92cd9ba5d7d287830f984d9d6aae91a1dde0ec5c40f4b8756614ca61fe0306306382fd74bc5c3f9215d682f8be13bc1e6103e559e90d5f8df0741278 SHA512 1a4d929048c828fdd5736427c8714bec7a9ead9315cd7d4fab8cab7ad71bcd203f3ab6b74e5f27613d2da41501313dc0c7720fe85357e3e89378d5c2dcf6f64a
MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild
deleted file mode 100644
index a39ea0e22056..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit fcaps user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="200181b"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-FILECAPS=(
- cap_net_raw usr/bin/blackbox_exporter
-)
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${BLACBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin blackbox_exporter/blackbox_exporter
- dodoc {README,CONFIGURATION}.md blackbox.yml
- insinto /etc/blackbox_exporter
- newins example.yml blackbox.yml.example
- popd || die
- keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
- fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-snmp_exporter/Manifest b/net-analyzer/prometheus-snmp_exporter/Manifest
index 45f533079b9f..8ae719379f7e 100644
--- a/net-analyzer/prometheus-snmp_exporter/Manifest
+++ b/net-analyzer/prometheus-snmp_exporter/Manifest
@@ -1,7 +1,5 @@
AUX prometheus-snmp_exporter.confd 98 BLAKE2B e03f8ce27a768194caf0691b11bc11369d2da3da6f9dc3c659a5b179864a3d8812df63cc458ab969b024957e8bd0a9208b26331279fe328dea55cc08339ac1ab SHA512 027ff624a0e5faae571e36cf0fdf860e13956976878a7b3ca2afbf5e6387ecb02d391974cf7c44c33468d34a16cf00d10ee153f3b7507b9cc5a62126b70c5a39
AUX prometheus-snmp_exporter.initd 591 BLAKE2B e5c58dd7b054cfb817deaaa084b49935711dcb3aefdd3d074ef759fc7f6ccb634faf4009c0bdce5090d3b780e3d498e75b0ceb610d676e1dded98518bc7d6c31 SHA512 0e53ef6790dc60091c0ed3b9cb7f47fabf526db80f9f09e212880efff59e9c0b3abb19235fe9b82da15cfb8aacb1eab326902f51d4908af80348023ae59bd474
-DIST prometheus-snmp_exporter-0.8.0.tar.gz 3257344 BLAKE2B 32f0cf6c72b518fc62c420bf64ed04243bef8f9b70be2fba15472f63871e96bc113ddc7fe2e6265a29facf8c32c1d3f245bf6fc2dbce934876ebac0225069642 SHA512 0cae5fc107baedd8d498972aa7c6b3b48ff19f951c5366e5be5173009e956de8da06b84a46926d6f157287df0793e996686740c491f502da24172d5806b49339
DIST prometheus-snmp_exporter-0.9.0.tar.gz 3257207 BLAKE2B 3e7e91d7e66b32e3f84c9e53061f54ffc10116913b91598edfa011663daf2c67314661dbe6cd5b2c20b30968833bd64a48bdd5dd06694e76f1e787d59ad63933 SHA512 eb287f4519f2174a9ce80414c2b7a698bc50e1bcb2303a8190164002af088e0694e01233314cfe2bd89b2cd751f2fd6f8447eb641541701b7bd481373ce084b1
-EBUILD prometheus-snmp_exporter-0.8.0.ebuild 1283 BLAKE2B b3c24b51562921582f3966cd044a58cf5520f56ce510590da95eb8ae21e1b16e29e7f075621f3682ab1887670edffe67131c32c9486a7736874a5e606b36bb02 SHA512 1dbd6445b2e975578ff92cd2e3334d0ee7773c2ad58160ca3d6f5d2843f5668d46d715315481480705d5e0c55bee9dc1bf468bc009884b1c84ac0acb3715386b
EBUILD prometheus-snmp_exporter-0.9.0.ebuild 1273 BLAKE2B b8f42637b4be7eedd17dcd1423d6bec4e5c83ae4f8a939157c0eea6664110272297e296cc4fbf4554ea523cd951f7c61e6f66ce0208fe1b622ae62ce7b74016b SHA512 dd1a796d0cfdc59cb1993058e5c8bcbaa0bb5f15692ab4629b909f8c46f2500ed79c805baec0136f602cff61a0b495e896750d9567637caea516867ea26b6d92
MISC metadata.xml 334 BLAKE2B a805d1d3f519c6ac1ef9c7f2cb5a0947740e6fe9a37fc77490e2011a27dae8ff981b3e482a55c117553eaa60f0e3c8d017d867c4fe082c8ebdc4e4bdac22f750 SHA512 7fd3e4314022bf2ff86bd01f335d5c4402676970b9810575225aff3d40bd5bdc9ffc27b438c880dc0a665cf3873502b969dfb30644b3c106278fd353820d6599
diff --git a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.8.0.ebuild b/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.8.0.ebuild
deleted file mode 100644
index 1c6964ea08bd..000000000000
--- a/net-analyzer/prometheus-snmp_exporter/prometheus-snmp_exporter-0.8.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/snmp_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-SNMP_EXPORTER_COMMIT="17cefca"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for snmp metrics"
-HOMEPAGE="https://github.com/prometheus/snmp_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
- default
- sed -i -e "s/{{.Revision}}/${SNMP_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
- pushd src/${EGO_PN} || die
- mkdir -p bin || die
- GOPATH="${S}" promu build -v --prefix snmp_exporter || die
- popd || die
-}
-
-src_install() {
- pushd src/${EGO_PN} || die
- dobin snmp_exporter/snmp_exporter
- dodoc {README,CHANGELOG,CONTRIBUTING}.md
- insinto /etc/snmp_exporter
- newins snmp.yml snmp.yml.example
- popd || die
- keepdir /var/lib/snmp_exporter /var/log/snmp_exporter
- fowners ${PN}:${PN} /var/lib/snmp_exporter /var/log/snmp_exporter
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 95ceb22ca1d0..c94109ec819a 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,7 +1,7 @@
AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
-DIST prometheus-2.0.0.tar.gz 5603884 BLAKE2B 0e2c7ee267f4f817fe84105b89fa2951c07212ca75bf540c67afe900c1df62641919f2ad9d2ce24932a946a0c3db8da6847184c56578ef9626db1f55c1ea3080 SHA512 9d23e10b3eb12755781b9edc5c32a0cb1e99055a8a905517619d992a174a8621ebc1e82999ce2412e7fc3e2e0af8a0dfe1eded8bcd2701a5aaaffce79c7fbcc5
DIST prometheus-2.1.0.tar.gz 5669858 BLAKE2B 96b9d7b1eb13017806cb2745cb874468a419550c7372aa8abada9d1a4e7fe386785f05abe8fd5681745db4a0c17260d5fde704a3b3ac5807107da0a935177264 SHA512 8adbbfcf6cf5b0bdd4a96f51f6c179c828d75a231b35f9ef40db6c07bcb8ffa6a3eb969b55a52ac70528ad5c8fe486be866db6ae174006220e0cfaa1da624346
-EBUILD prometheus-2.0.0-r1.ebuild 2000 BLAKE2B 13fbd2811ab3feefcb1018cdce480b0e1b663e42d631db5c27a003544399fdf99a3df1dd0ede40c8e552a47ab5a0e4f577121c5112c8e7ed43acd8d9892c7f81 SHA512 d08dd4d8056ea966a9b50e4faa21bd00804b8f6402ac8557f3a12a90451a6bda62731638488aaefb15de1250e360e10bbcd72c22f91f7f7a88f0645e4b7a2b77
+DIST prometheus-2.2.0.tar.gz 5629498 BLAKE2B 6d48a58258e47fe35201581fa11070b1951b633768895ce810448d13d8184072b85160510d355b06a2d09bf0c9a5785c29f0ac062fe0472b29a4c94b74ccd7cc SHA512 680ae3cb653452f1506bc62cf909994bd142ee53c9f6520391786967cfd09bd96c774fbacc09e1c9c06ebf759899a45fd0040fe7eef53c1256df390a41dcc8bf
EBUILD prometheus-2.1.0.ebuild 2000 BLAKE2B 2cfc7d475c7d51dde9b0dfd914bd4a835d463c7228859a888a3dcf73f21bfcbeff721d35837cb2b73b019c22e2d887191f0d3cbb80583b8db65d10775e96c860 SHA512 68e73fa3684510f0da380a211db0bc09e396795ee4424217afc3179a1c57531e21873ac82109bba916ca8bdf1f3f0f16d030dc15c7f462d96b943f383ac9a5e8
+EBUILD prometheus-2.2.0.ebuild 2022 BLAKE2B 67fdb06755be1aea0e9743cf096b3cc14e6fdc3ebe48714fa6f4777a6c835b6c5f41b490311dfadc7e8211485c1072691e23f19fee44577ddb7d68c28ac5e1ea SHA512 72715c59d003451975c43a99c4c540be556a82dfbefa86ab33996aa4231f0d0aec014fd332562018330fb16dd9258cb2351b180f3cd75ad63f3e55f4690ab418
MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild b/net-analyzer/prometheus/prometheus-2.2.0.ebuild
index a51b71d9bb2e..7c4a1eb8c4e1 100644
--- a/net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild
+++ b/net-analyzer/prometheus/prometheus-2.2.0.ebuild
@@ -7,7 +7,7 @@ inherit user golang-build golang-vcs-snapshot
EGO_PN="github.com/prometheus/prometheus"
MY_PV=${PV/_rc/-rc.}
EGIT_COMMIT="v${MY_PV}"
-PROMETHEUS_COMMIT="0a74f98"
+PROMETHEUS_COMMIT="f63e7db"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
@@ -18,7 +18,9 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-DEPEND="dev-util/promu"
+DEPEND="
+ >=dev-lang/go-1.10
+ dev-util/promu"
PROMETHEUS_HOME="/var/lib/prometheus"
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index 502eb3081b0e..d8bd930ecff3 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,4 +1,3 @@
-AUX speedtest-cli-0.3.4-fix-unicode-py3.patch 1253 BLAKE2B ac3b81ddc8dacb457e57b86ec9d40238d578b584ed79160725e0c8b7f3464aadf1de15ce76275bf1546d9d6077f805634abcb54d4f7aee6e2c4490c4b9015c88 SHA512 d071aa76158334c5184766b8c6f0cee0dd789df433a633461cff834f91cc87cf717bf57449c8417ff793708e521ad2ad7f5db43808252393066b2181a378790d
DIST speedtest-cli-1.0.7.tar.gz 21077 BLAKE2B 8bbb9b73f21f9252763461230053bac5d890d19d3f80a81f616bb4535c5e386b70b43c6ee0688ca813fab21f8387fd93df65b1b0254613efbdec93b1807d3caa SHA512 c06c0e80ec00adebc04fb2bdab5b45ec84a32d9dbf2e4fbe7b0461f4b3b1fdcf29048b8c7a906c03dcea0771417317394243bdc6f1bc8fb763e13eafae31a42b
DIST speedtest-cli-2.0.0.tar.gz 23642 BLAKE2B 042b5c24d084400663548d3110dd28a4c4bad780d46f9f4182ab8d1a323a087970e0ebdff04dee2ecd1bed9b488dd72f4799992c762f631d3cad59aedc6452e5 SHA512 60bde263a06589c609a10e1a881a1b02f7c7426b95778d7729b1388e545713094501914c24ee08f0857c4f445354539b5508825ab1a51df284215ba681dd7888
EBUILD speedtest-cli-1.0.7.ebuild 662 BLAKE2B c4b2a3cc3fae1300e89ca981959b1468da02ad0e34887413a9d3dc4a344ff61d4f13c8f5e01684d324bfebaf53d2a2a3a09c46c02eb9f6156dd031cdbef18101 SHA512 35d739bc858c8c843c50c03e7889a3b9999c34d171fb8f4d0c5698ae464b83a7a9d977ab0b8dc9a99517a9a6ba610d6fa87f2f572c3487f07a72e45ac3ecf5e2
diff --git a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch b/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
deleted file mode 100644
index 2bd809f9bf67..000000000000
--- a/net-analyzer/speedtest-cli/files/speedtest-cli-0.3.4-fix-unicode-py3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/speedtest_cli.py b/speedtest_cli.py
-index d93d5c3..930e42b 100755
---- a/speedtest_cli.py
-+++ b/speedtest_cli.py
-@@ -108,6 +108,8 @@ except ImportError:
- def write(data):
- if not isinstance(data, basestring):
- data = str(data)
-+ if isinstance(data, unicode):
-+ data = data.encode('utf-8', 'ignore')
- fp.write(data)
-
- want_unicode = False
-@@ -635,7 +637,7 @@ def speedtest():
- line = ('%(id)4s) %(sponsor)s (%(name)s, %(country)s) '
- '[%(d)0.2f km]' % server)
- serverList.append(line)
-- print_('\n'.join(serverList).encode('utf-8', 'ignore'))
-+ print_('\n'.join(serverList))
- sys.exit(0)
- else:
- servers = closestServers(config['client'])
-@@ -703,8 +705,8 @@ def speedtest():
- best = getBestServer(servers)
-
- if not args.simple:
-- print_(('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
-- '%(latency)s ms' % best).encode('utf-8', 'ignore'))
-+ print_('Hosted by %(sponsor)s (%(name)s) [%(d)0.2f km]: '
-+ '%(latency)s ms' % best)
- else:
- print_('Ping: %(latency)s ms' % best)
-
---
-2.7.1
-