diff --git a/iptstate-2.2.6-no_debug.patch b/iptstate-2.2.6-no_debug.patch deleted file mode 100644 index 24ad628..0000000 --- a/iptstate-2.2.6-no_debug.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit e8f591165f8ff077a183ff02147beb4129519f7d -Author: Thomas Woerner -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! */ diff --git a/iptstate-2.2.6-rhbz599181.patch b/iptstate-2.2.6-rhbz599181.patch deleted file mode 100644 index b756179..0000000 --- a/iptstate-2.2.6-rhbz599181.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit e78a4bc9a921f597224af07def876ba18b8733c5 -Author: Thomas Woerner -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 diff --git a/iptstate-2.2.6.tar.bz2 b/iptstate-2.2.6.tar.bz2 deleted file mode 100644 index 2bbd35f..0000000 Binary files a/iptstate-2.2.6.tar.bz2 and /dev/null differ diff --git a/iptstate-2.2.7.tar.bz2 b/iptstate-2.2.7.tar.bz2 new file mode 100644 index 0000000..947bc52 Binary files /dev/null and b/iptstate-2.2.7.tar.bz2 differ diff --git a/iptstate.spec b/iptstate.spec index c0fe265..58eb7eb 100644 --- a/iptstate.spec +++ b/iptstate.spec @@ -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 - 2.2.7-1 +- Type:bugfix +- Id:NA +- SUG:NA +- DESC:update iptstate to 2.2.7 + * Sat Oct 19 2019 openEuler Buildteam - 2.2.6-9 - Type:bugfix - Id:NA