diff options
Diffstat (limited to 'net-analyzer/mtr')
| -rw-r--r-- | net-analyzer/mtr/Manifest | 4 | ||||
| -rw-r--r-- | net-analyzer/mtr/files/mtr-0.95-fortify-source-3.patch | 34 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-0.95-r1.ebuild | 68 | ||||
| -rw-r--r-- | net-analyzer/mtr/mtr-9999.ebuild | 8 |
4 files changed, 109 insertions, 5 deletions
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest index 1ad3e9f4717b..ce69e63a37f9 100644 --- a/net-analyzer/mtr/Manifest +++ b/net-analyzer/mtr/Manifest @@ -1,5 +1,7 @@ AUX mtr-0.88-tinfo.patch 494 BLAKE2B 5eba829ab106aa74799780da890b39a37f69a0cb2cf644a739d1a4e6484507bc42427995069d03ddcad811a99baae9211db907b82a3efb328edec075eee92b57 SHA512 165bcdd1aa04e7786e2e8eeab4e85d5c592198b7b9a39f2c13a229870fba47d36fc92b136277d7d4e0a241ef96c714954a78f9e1091ab71255cd5b8d88bf2fd8 +AUX mtr-0.95-fortify-source-3.patch 1440 BLAKE2B 4690e843d35cdb3dffb1d2c51bb2535b5761ab078372992716e19bd6b9f3a3dd67ab5d9f3579114545da5904988c5f5e412f218dbbaf1da820dc7aca2198efae SHA512 6e2515a6c12676d14441435b2bcddcdcd8d57d058fd881a1941be8699124d1d72e59255e8707f797e9b03ef2e31e69a1d4ded71f98c3e60366d1b808428b4592 DIST mtr-0.95.tar.gz 144541 BLAKE2B 3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b SHA512 a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217d875529d443c3760cd6fd7bd04d1e9abe33ef12635826c66a98bd776c1690 +EBUILD mtr-0.95-r1.ebuild 1594 BLAKE2B 399e98014ed3dcd98dc0797dd095eefc7a12d2fff6586c9a99b1aef27bb8a0b5502eded598a17517dbc5b06ddef820563ac0c963e1a202898f040ff8f61001ac SHA512 cd9d7a94032d66f563056d36c382784314fe6461fa489b5405efb15c2d293fc5177e6e72e1f231fb7a1e9b108b0c18baef8b68737b595cb8a88b466017870be6 EBUILD mtr-0.95.ebuild 1552 BLAKE2B 2332a9d6e582d72b7545220001b6be3dc9fab9588c8a30727db57d3a778ec9778051c2c6963c28259658574498a84ba737b13eb073fbebba4a2414fd62da6079 SHA512 303c980eabbae6686cd6343db52060453d82f3a2505865772441f8d47f6fe75c6bd8fcf291744a906aed3755be7b6582990379c5d28d8c2c92df3f56fe2effa8 -EBUILD mtr-9999.ebuild 1559 BLAKE2B 17528e9063c3a7c0bc73520d4f6af606e516f471eebaa7a95bff27f9cc63db154e9b4d16e4270233b704273965e0b5f8a87182ac2e45c42f0de3f40f93685831 SHA512 db4d54dc01bfb2f9390303ee9bd2e1ba1b1db82c3e30f71749e0dfa59a4574178cda85a2248b905f1e1bb85b335d83da6f997bfccd3bfb848eb99046cd98b544 +EBUILD mtr-9999.ebuild 1551 BLAKE2B 1e04cb86382f29dbfa9d9ab9b1361986a73ed6e94e998be53e2aba1f829b0a7a9625b39975a90274a4ee4006dfb9964d891ed0280a26fda3a61d56b052a077dd SHA512 ae3235d52a2c2743b121c595c9032208db4cda64187a24b6b5b2242362775314e9ad2b994b439abc67145194adfb51a700e491324848bd6d003cc76d92509877 MISC metadata.xml 637 BLAKE2B c3b654a66fc6d6c7cea1169d0432a7753e81de0071ae3e1515ed6e52055e578881cbc71f3e995dc364ce7ce983bf65d9d2d6784c18b93cf34743007f7cf94b3f SHA512 89e58ee410dc0e5aa7729c03f2fde6ad3ff4d34170a8fa0217757a7c834b5fee1f948a2042afc2e47043fcc198136e9353ef914c3924e5d3d4f0e2d52e4398e2 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/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 42b6aeb30b04..af05bfe6419c 100644 --- a/net-analyzer/mtr/mtr-9999.ebuild +++ b/net-analyzer/mtr/mtr-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools bash-completion-r1 fcaps @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then 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" + 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" @@ -28,7 +28,7 @@ RDEPEND=" x11-libs/gtk+:3 ) jansson? ( dev-libs/jansson:= ) - ncurses? ( sys-libs/ncurses:0= ) + ncurses? ( sys-libs/ncurses:= ) " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" |