* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iptraf-ng/files/, net-analyzer/iptraf-ng/
@ 2020-07-22 6:07 Jeroen Roovers
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2020-07-22 6:07 UTC (permalink / raw
To: gentoo-commits
commit: d6b3ca7aae1784953a0d7f4fe01f7f8c6fb6b004
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 22 05:25:16 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jul 22 06:07:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6b3ca7a
net-analyzer/iptraf-ng: Old
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-analyzer/iptraf-ng/Manifest | 1 -
.../files/iptraf-ng-1.1.4-printf-format.patch | 11 ----
.../files/iptraf-ng-1.1.4-sprintf-format.patch | 20 -------
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild | 64 ---------------------
net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild | 67 ----------------------
5 files changed, 163 deletions(-)
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index 19d3bf8d75a..31a22d69eb8 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,4 +1,3 @@
-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.0.tar.gz 324969 BLAKE2B 45a67fc64b5ab518339e55adfc158c8cf10eacded15941545d8d7cee19c954aae2619c39a11b1eeaa79f5a381b5dcf2e6a6e0b8fdd7e78e75f41ab10b71e6a0a SHA512 6dc3b5deb7c6fb3776ce696492975db43c13fa2d1d956712e7738ef34ac1bfc5f5d63a5211ba8e9fabf391e8bc5560c08c5d5e219b0cfe067e3499b2c02e6f3d
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 6bad736e2e4..00000000000
--- 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 96f252895cb..00000000000
--- 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/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
deleted file mode 100644
index 0295b3c1261..00000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,64 +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 ~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.1.4-r3.ebuild
deleted file mode 100644
index 960fddbae48..00000000000
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild
+++ /dev/null
@@ -1,67 +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="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"
-
-LICENSE="GPL-2 doc? ( FDL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="
- >=sys-libs/ncurses-5.7-r7:0=
-"
-DEPEND="
- ${RDEPEND}
- 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() {
- 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
-
- default
-}
-
-src_configure() {
- # The configure script does not do very much we do not already control
- append-cppflags '-DLOCKDIR=\"/run/lock/iptraf-ng\"'
- tc-export CC
-}
-
-src_install() {
- dosbin {iptraf,rvnamed}-ng
-
- doman src/*.8
- dodoc AUTHORS CHANGES FAQ README* RELEASE-NOTES
-
- if use doc; then
- docinto html
- dodoc -r Documentation/*
- fi
-
- keepdir /var/{lib,log}/iptraf-ng #376157
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iptraf-ng/files/, net-analyzer/iptraf-ng/
@ 2025-10-05 5:57 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-10-05 5:57 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-10-05 5:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-22 6:07 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iptraf-ng/files/, net-analyzer/iptraf-ng/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2025-10-05 5:57 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox