update iptstate to 2.2.7

This commit is contained in:
xihaochen 2022-03-21 10:35:22 +08:00
parent 8ed020952c
commit be97a7e106
5 changed files with 8 additions and 49 deletions

View File

@ -1,18 +0,0 @@
commit e8f591165f8ff077a183ff02147beb4129519f7d
Author: Thomas Woerner <twoerner@redhat.com>
Date: Wed Sep 28 13:08:49 2016 +0200
Drop debug output for tmpint in getopt_long while loop
diff --git a/iptstate.cc b/iptstate.cc
index b03e566..5c9ddb1 100644
--- a/iptstate.cc
+++ b/iptstate.cc
@@ -2179,7 +2179,6 @@ int main(int argc, char *argv[])
// Command Line Arguments
while ((tmpint = getopt_long(argc, argv, "Cd:D:hlmcoLfpR:r1b:s:S:tv",
long_options, &option_index)) != EOF) {
- printf("loop: %d\n", tmpint);
switch (tmpint) {
case 0:
/* Apparently this test is needed?! Seems lame! */

View File

@ -1,27 +0,0 @@
commit e78a4bc9a921f597224af07def876ba18b8733c5
Author: Thomas Woerner <twoerner@redhat.com>
Date: Tue Oct 25 12:40:45 2016 +0200
Fix segmentation fault if used with the options -1 -C
Curses is not used with the "-1" single option, but c_warn is used if
counters are not enabled in the kernel and "-C" option is given.
Fixes: RHBZ#599181
diff --git a/iptstate.cc b/iptstate.cc
index 5874605..b4b6108 100644
--- a/iptstate.cc
+++ b/iptstate.cc
@@ -2407,7 +2407,10 @@ int main(int argc, char *argv[])
prompt = "Counters requested, but not enabled in the";
prompt += " kernel!";
flags.counters = 0;
- c_warn(mainwin, prompt, flags);
+ if (flags.single)
+ cerr << prompt << endl;
+ else
+ c_warn(mainwin, prompt, flags);
}
// Sort our table

Binary file not shown.

BIN
iptstate-2.2.7.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,13 +1,11 @@
Name: iptstate
Summary: A top-like display of IP Tables state table entries
Version: 2.2.6
Release: 9
Version: 2.2.7
Release: 1
License: zlib
URL: http://www.phildev.net/iptstate/
Source: https://github.com/jaymzh/iptstate/releases/download/v%{version}/%{name}-%{version}.tar.bz2
Patch0: iptstate-2.1-man8.patch
Patch1: iptstate-2.2.6-no_debug.patch
Patch2: iptstate-2.2.6-rhbz599181.patch
Requires: iptables
BuildRequires: gcc-c++ ncurses-devel libnetfilter_conntrack-devel
@ -35,6 +33,12 @@ make install PREFIX=%{buildroot}%{_prefix} INSTALL="install -p"
%doc README.md Changelog
%changelog
* Mon Mar 21 2022 xihaochen <xihaochen@huawei.com> - 2.2.7-1
- Type:bugfix
- Id:NA
- SUG:NA
- DESC:update iptstate to 2.2.7
* Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.2.6-9
- Type:bugfix
- Id:NA