- New upstream version 2.2.6

- Located at github
  - Fixes (RHBZ#1294913 and RHBZ#1375395)
- Additional upstream patch (no_debug) to drop some debugging remains
- Additional proposed patch to fix segmentation fault with -1 -C (RHBZ#599181)

iptstate-2.2.6-no_debug.patch

@@ -0,0 +1,18 @@
+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! */

iptstate-2.2.6-rhbz599181.patch

@@ -0,0 +1,27 @@
+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

iptstate.spec

@@ -1,9 +1,11 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
-Version: 2.2.5
-Release: 8%{?dist}
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Version: 2.2.6
+Release: 1%{?dist}
+Source: https://github.com/jaymzh/iptstate/releases/download/v%{version}/iptstate-%{version}.tar.bz2
 Patch0: iptstate-2.1-man8.patch
+Patch1: iptstate-2.2.6-no_debug.patch
+Patch2: iptstate-2.2.6-rhbz599181.patch
 Group: System Environment/Base
 URL: http://www.phildev.net/iptstate/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -36,6 +38,8 @@ display the state table once.
 %prep
 %setup -q
 %patch0 -p1 -b .man8
+%patch1 -p1 -b .no_debug
+%patch2 -p1 -b .rhbz599181
 
 %build
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
@@ -49,11 +53,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
-%doc LICENSE README
+%doc LICENSE README.md
 %{_sbindir}/iptstate
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Tue Oct 25 2016 Thomas Woerner <twoerner@redhat.com> 2.2.6-1
+- New upstream version 2.2.6
+  - Located at github
+  - Fixes (RHBZ#1294913 and RHBZ#1375395)
+- Additional upstream patch (no_debug) to drop some debugging remains
+- Additional proposed patch to fix segmentation fault with -1 -C (RHBZ#599181)
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild