From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- net-analyzer/iptraf-ng/Manifest | 7 +-- .../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 ---------------------- net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild | 60 +++++++++++++++++++ 6 files changed, 62 insertions(+), 167 deletions(-) delete mode 100644 net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-printf-format.patch delete mode 100644 net-analyzer/iptraf-ng/files/iptraf-ng-1.1.4-sprintf-format.patch delete mode 100644 net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild delete mode 100644 net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r3.ebuild create mode 100644 net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild (limited to 'net-analyzer/iptraf-ng') diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest index 2878ef58a12b..c09b24ebe400 100644 --- a/net-analyzer/iptraf-ng/Manifest +++ b/net-analyzer/iptraf-ng/Manifest @@ -1,12 +1,9 @@ -AUX iptraf-ng-1.1.4-printf-format.patch 284 BLAKE2B 2357923966e14dde6497d86c63c9ce10884e88830fc3589ded97d43d7f22ce59bec7630c8f2d4aa0e11f0dba5a8720c5179f551d9913f510d0c9a68c3b9813b2 SHA512 d4b566bfa724209c920b688e3b51c722d05c6e63929d5338ee8dcfa978e0e0ff4ee8dd5e2d5f8a70afe317e2c379171fd28c7d7446a7b24b1efe17f525a5dad1 -AUX iptraf-ng-1.1.4-sprintf-format.patch 551 BLAKE2B 93a83234723924f80fa267b7bd29100d5f1108e44544fac5d484aabce6f3b15ea44431b5c28628c4a4f4327a287a49c95e744b758ada01ebe80a26312dfe0e00 SHA512 d3c49119f1ea5a3664e85b06e949bf574da3a000dcc9a3dcee92ae3d19e6a55a32031dacc4b759e3c63d85100129bb70ad58cbda7e45386da4b1660224198029 AUX iptraf-ng-1.1.4-tcplog_flowrate_msg.patch 330 BLAKE2B edf2d08df81fb65c1f05bffd28bec622e008baa532353e90c5f275f10333dbbe1b67d9e2b801bbb424ea56628808b0f0a6f06fda6ee682deed42c71c9387a3ab SHA512 4b0c318ad245a82bb44243e23322f3d71ef4af9b4c86c95911e4da1e8145418ac7b9ee76c7d33bdf05c1189ec782443382de773e228c76f179fab87d5e897ec6 -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 EBUILD iptraf-ng-1.1.4-r1.ebuild 1325 BLAKE2B d27a62d5195b922cb586cf4fa65b6e5af4f4deb81ac4b854c0eebead7b6cda8a2e9a21fc94e184f6a2e02aec33a28964aebaca1620fa4f17b5a56d9d0a276a1b SHA512 62c3d031eeb0629adec93ef8347f8ae252633092a0ed372806304979e450ac7ed3513873d598795a98c564b6d847e698f3c0e7808adc3f253791f21b49e6ccf7 -EBUILD iptraf-ng-1.1.4-r2.ebuild 1427 BLAKE2B 27461cb4a2b174032d5037ad83e9d11543a2a5dc6f92c58387af31b200a7f9e020e4df208bc4bdecfa44d10c0073a570b02ac35adbcdf75f5dfbbaaf1a436f4d SHA512 c2c05f847e354cd072c08966b7b8028de98646c0c2e6827220dd2514ddae6a471535c47f5ba5033c3e37f61b1524038dd542a746436a21c5bf1b1c47bacb84db -EBUILD iptraf-ng-1.1.4-r3.ebuild 1448 BLAKE2B d293142f201e9d8176c60e3f7df01018cf2da03a37a064c4a99d1cdd68d1972ed6ba6a3f688565e52ce142b531b4bed5d3c4071955d670d48cc96b143cc7c4da SHA512 c7831c5963e73ac4ff68dec2e870f5a1f9948ff97af688bd41aafff079b1b215e2d7e3d28acf85d5984b06cc622cfccba48f179b98ad3291e6d269c0c867c0cc EBUILD iptraf-ng-1.2.0-r1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5 +EBUILD iptraf-ng-1.2.1.ebuild 1222 BLAKE2B bb684c951569993138a987ef80cbd561d3054f33eec02dfb3144a2fc57b0f69d2091074e53f2ca2d44823ef6b51b0106ab207050234a4267bb5f035a79376c69 SHA512 69c3a436210c8d9cef2acdc7e7b6c9d361c98a8cdef4218b8f8013bf00387397b67e7c8587ad11fcbabb45ccfa28864b67ba4ae9a6aa2485e69cc73230216be5 EBUILD iptraf-ng-9999.ebuild 1150 BLAKE2B 5b02da16a8fbff3bb5ef09536a69094088a7e4a1793f83272169cd9c91d8884647d643154cad17b267c1433a7e98735d7267e76e703a2bad0f49e2bba8c6bb24 SHA512 a8b3ff516d68e0dfa95c763f478dfcc66f556d93a814ee97362e54cafbb0465600459939a8d8cba58b7ffe35fd6de65b4455521867c7219ff8d0618bc9bbaf51 MISC metadata.xml 376 BLAKE2B e5dd4ba7396c36e80ee1eed3eda4444bdd914e4701dd5acb0780b51a2e0e37020982bf624e1e8ecb81b5ba9af20f199885b52c03329d8238e43ca16c468a1900 SHA512 440bbe472188ac3acd7f0dcdddf8390e690a8f81cda49d6be5bed8a46cdf1fb10416f4313d426c408bd9f88501312af812badc765a24e76927b5ecfc64e7c225 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 6bad736e2e44..000000000000 --- 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 96f252895cb2..000000000000 --- 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 0295b3c12613..000000000000 --- 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 960fddbae484..000000000000 --- 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 -} diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild new file mode 100644 index 000000000000..bda05a1a02a4 --- /dev/null +++ b/net-analyzer/iptraf-ng/iptraf-ng-1.2.1.ebuild @@ -0,0 +1,60 @@ +# 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}.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 +" +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' \ + 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 ${PN} + + doman src/*.8 + dodoc AUTHORS CHANGES* FAQ README* + + if use doc; then + docinto html + dodoc -r Documentation/* + fi + + keepdir /var/{lib,log}/iptraf-ng #376157 +} -- cgit v1.2.3