Compare commits
2 Commits
3fc1646a01
...
7744e12739
Author | SHA1 | Date |
---|---|---|
|
7744e12739 | |
|
0c224c69b4 |
|
@ -1,16 +1,17 @@
|
|||
BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 filecaps? ( sys-libs/libcap )
|
||||
BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
|
||||
DEFINED_PHASES=configure postinst prepare
|
||||
DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= )
|
||||
DEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) ncurses? ( sys-libs/ncurses:= )
|
||||
DESCRIPTION=My TraceRoute, an Excellent network diagnostic tool
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
HOMEPAGE=https://www.bitwizard.nl/mtr/
|
||||
IDEPEND=filecaps? ( sys-libs/libcap )
|
||||
INHERIT=autotools bash-completion-r1 fcaps
|
||||
IUSE=gtk +ipinfo +ipv6 jansson ncurses +filecaps
|
||||
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
|
||||
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson ) ncurses? ( sys-libs/ncurses:0= ) filecaps? ( sys-libs/libcap )
|
||||
RDEPEND=gtk? ( dev-libs/glib:2 x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) ncurses? ( sys-libs/ncurses:= )
|
||||
RESTRICT=test
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/traviscross/mtr/archive/v0.94.tar.gz -> mtr-0.94.tar.gz
|
||||
SRC_URI=https://github.com/traviscross/mtr/archive/v0.95.tar.gz -> mtr-0.95.tar.gz
|
||||
_eclasses_=gnuconfig b6b3e92f8b8c996400074b5f61a59256 toolchain-funcs 0c8a0b0d318eb5d5180d114bd3f6592b multilib c19072c3cd7ac5cb21de013f7e9832e0 libtool 9d3a9a889a6fa62ae794f817c156491b autotools 6ae9a4347149b19a112caa1182d03bde bash-completion-r1 f5e7a020fd9c741740756aac61bf75ff fcaps c0a086b957a1b183a8d136eabf02f191
|
||||
_md5_=1f171b4ecea8a0b016fb3f42dcd1b572
|
||||
_md5_=7d80c669cb77151bba0cfb1c0552869a
|
|
@ -156,7 +156,7 @@ net-analyzer/AS-Stats 9999: A simple tool to generate per-AS traffic graphs from
|
|||
net-analyzer/blaeu 1.1.8 1.1.9: Blaeu, creating measurements on RIPE Atlas probes
|
||||
net-analyzer/check_ssl_cert 2.68.0: A shell script to check an SSL/TLS connection
|
||||
net-analyzer/dublin-traceroute 0.4.2: NAT-aware multipath tracerouting tool
|
||||
net-analyzer/mtr 0.94-r1 0.95: My TraceRoute, an Excellent network diagnostic tool
|
||||
net-analyzer/mtr 0.95 0.95-r1: My TraceRoute, an Excellent network diagnostic tool
|
||||
net-analyzer/munin-pdns_recursor 1.03: A munin plugin to graph some usage and performance stats
|
||||
net-analyzer/munin-plugins-contrib-openntpd 9999: openntpd plugin for munin
|
||||
net-analyzer/munin-plugins-contrib-ping 9999: Ping plugin for munin
|
||||
|
|
|
@ -1,2 +1 @@
|
|||
DIST mtr-0.94.tar.gz 143616 BLAKE2B e9b4619a85a515d729f0987d5882fb91e4bfa3be82476efbfdb832d0b13ed334be1c1a1bcf8ab4ca820002e79ca4a24d0b50f2739d9284b7dec0b8852a1a91e0 SHA512 0e58bd79562ff80f9308135562ab22aa1f1eea686aefd3aef07bac05e661e34b60fde7c66c96bf4f0919f546376fbd6106ecd8fa92328c24f6f903097496bf11
|
||||
DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690
|
||||
|
|
|
@ -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;
|
||||
|
|
@ -1,39 +1,46 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit autotools bash-completion-r1 fcaps
|
||||
|
||||
DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
|
||||
HOMEPAGE="https://www.bitwizard.nl/mtr/"
|
||||
SRC_URI="https://github.com/traviscross/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="gtk +ipinfo +ipv6 jansson ncurses"
|
||||
# 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:0= )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
"
|
||||
BDEPEND="
|
||||
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"
|
||||
"${FILESDIR}/${P}-ipv4-sockets.patch"
|
||||
"${FILESDIR}"/${PN}-0.88-tinfo.patch
|
||||
"${FILESDIR}"/${P}-fortify-source-3.patch
|
||||
"${FILESDIR}"/${PN}-0.94-ipv4-sockets.patch
|
||||
)
|
||||
RESTRICT="test"
|
||||
|
||||
src_prepare() {
|
||||
default
|
Loading…
Reference in New Issue