commit: 8ad808468bbd119d0b000b0bf0f35f67f67e0c25 Author: Vladislav Mikhailikov <vmikhailikov <AT> gmail <DOT> com> AuthorDate: Thu Jun 26 17:20:43 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 5 05:56:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad80846
net-analyzer/iptraf-ng: add 1.2.2 Drop long-obsolete and DEPEND-only (!) blocker. Signed-off-by: Vladislav Mikhailikov <vmikhailikov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42763 Signed-off-by: Sam James <sam <AT> gentoo.org> net-analyzer/iptraf-ng/Manifest | 1 + .../files/iptraf-ng-1.2.2-buffer_overflow.patch | 15 +++++++++++++++ .../{iptraf-ng-9999.ebuild => iptraf-ng-1.2.2.ebuild} | 16 +++++++++------- net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild | 5 ++--- 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index 148254cc234d..aaecbd9e85f7 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -1 +1,2 @@ DIST iptraf-ng-1.2.1.tar.gz 325177 BLAKE2B 9b8df7fa24711b401464d492993b9c27424ec7ab6230218d1b792a66e5fb60c99b5cdb92ac1b5a6da578c4b10da79333f248f14d10e74057118aadf50263a4ed SHA512 44d36fc92cdbf379f62cb63638663c3ee610225b9c28d60ee55e62e358f398a6b0db281129327b3472e45fb553ee3dd605af09c129f2233f8839ae3dbd799384 +DIST iptraf-ng-1.2.2.tar.gz 325800 BLAKE2B c2ad1821080fcebaef3500aaefcf9a8679c46c09a6851b9cef40fcc6d3b7607c65954ac884e1db4ddf702c62de68bb58ca9cf338c0642bc0ef9e944ca400e4c4 SHA512 275a345ffd3ab9578c4d159c3a8667326224b4a58b2e7787c4db518b81973d87c04b4b6c5275a721858d01a9b44a0200f8defc06c6f88655aa38d4fa6146ea1d diff --git a/net-analyzer/iptraf-ng/files/iptraf-ng-1.2.2-buffer_overflow.patch b/net-analyzer/iptraf-ng/files/iptraf-ng-1.2.2-buffer_overflow.patch new file mode 100644 index 000000000000..9c2262db870a --- /dev/null +++ b/net-analyzer/iptraf-ng/files/iptraf-ng-1.2.2-buffer_overflow.patch @@ -0,0 +1,15 @@ +Fix this issue: + +src/tcptable.c:484:140: warning: ‘%s’ directive output may be truncated writing up to 63 bytes into a region of size between 0 and 225 [-Wformat-truncation=] + +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -22,7 +22,7 @@ + #include "hostmon.h" + #include "sockaddr.h" + +-#define MSGSTRING_MAX 320 ++#define MSGSTRING_MAX 640 + + unsigned int bmaxy = 0; + unsigned int imaxy = 0; diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.2.ebuild similarity index 75% copy from net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild copy to net-analyzer/iptraf-ng/iptraf-ng-1.2.2.ebuild index 486e56efca50..2f7509cfbf10 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.2.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 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 flag-o-matic 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" +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="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" IUSE="doc" RDEPEND=" @@ -20,10 +19,13 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/os-headers - !net-analyzer/iptraf " RESTRICT="test" +PATCHES=( + "${FILESDIR}/${PN}-1.2.2-buffer_overflow.patch" +) + src_prepare() { sed -i \ -e '/^CC =/d' \ diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild index 486e56efca50..d15aa1492515 100644 --- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild +++ b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic git-r3 toolchain-funcs DESCRIPTION="A console-based network monitoring utility" @@ -20,7 +20,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} virtual/os-headers - !net-analyzer/iptraf " RESTRICT="test"
