update versions of mtr and iptstate pkgs (#3221)

* update versions of mtr and iptstate pkgs

* update README file name to README.md.

* License verified

SPECS-EXTENDED/iptstate/iptstate-2.2.6-no_debug.patch

@@ -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! */

SPECS-EXTENDED/iptstate/iptstate-2.2.6-rhbz599181.patch

@@ -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

SPECS-EXTENDED/iptstate/iptstate.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "iptstate-2.2.6.tar.bz2": "bef8eb67a4533e53079f397b71e91dd34da23f8cbd65cb2d5b67cb907b00c068"
+  "iptstate-2.2.7.tar.bz2": "896df0602885456a2631f795d634fc21311e505f8c910348e6312860f2097955"
  }
 }

SPECS-EXTENDED/iptstate/iptstate.spec

@@ -1,11 +1,9 @@
 Name: iptstate
 Summary: A top-like display of IP Tables state table entries
-Version: 2.2.6
-Release: 11%{?dist}
+Version: 2.2.7
+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
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL: http://www.phildev.net/iptstate/
@@ -39,8 +37,6 @@ 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 $RPM_LD_FLAGS"
@@ -55,6 +51,10 @@ make install PREFIX=%{buildroot}%{_prefix} INSTALL="install -p"
 %{_mandir}/man8/iptstate.*
 
 %changelog
+* Thu Jun 23 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 2.2.7-1
+- Upgrade version to 2.2.7 to fix build break.
+- License verified.
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.2.6-11
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 

SPECS-EXTENDED/mtr/mtr.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "mtr-0.92.tar.gz": "568a52911a8933496e60c88ac6fea12379469d7943feb9223f4337903e4bc164",
+  "mtr-0.95.tar.gz": "12490fb660ba5fb34df8c06a0f62b4f9cbd11a584fc3f6eceda0a99124e8596f",
   "mtr-gtk-pkexec-wrapper.sh": "91056edeecd5081414719ae6c78a74d2dff6e6262e02cf5e0e663cf4025352f5",
   "net-xmtr.desktop": "a2620ff1d6e6e3c4c8716d6e0b77437e0e7117dea37d71452802dfc2993e957c",
   "org.fedoraproject.mtr.policy": "bbfaea2b2800555bfce9e36c0103693654b16b62fd718812d44aaf908f142efc"

SPECS-EXTENDED/mtr/mtr.spec

@@ -2,8 +2,8 @@
 
 Summary: Network diagnostic tool combining 'traceroute' and 'ping'
 Name: mtr
-Version: 0.92
-Release: 8%{?dist}
+Version: 0.95
+Release: 1%{?dist}
 License: GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -32,7 +32,7 @@ command line, e.g. for SSH sessions; and a GTK+ interface for X (provided
 in the mtr-gtk package).
 
 %prep
-%setup -q
+%autosetup
 
 %build
 export CFLAGS="%{optflags} -fPIE"
@@ -52,7 +52,7 @@ install -D -p -m 0755 mtr %{buildroot}%{_sbindir}/mtr
 %files
 %{!?_licensedir:%global license %%doc}
 %license COPYING
-%doc AUTHORS FORMATS NEWS README SECURITY
+%doc AUTHORS FORMATS NEWS README.md SECURITY
 %{_sbindir}/%{name}
 %caps(cap_net_raw=pe) %{_sbindir}/%{name}-packet
 %{_mandir}/man8/*
@@ -61,6 +61,10 @@ install -D -p -m 0755 mtr %{buildroot}%{_sbindir}/mtr
 %{_datadir}/bash-completion/completions/%{name}
 
 %changelog
+* Thu Jun 23 2022 Mandeep Plaha <mandeepplaha@microsoft.com> - 0.95-1
+- Upgrade version to 0.95 to fix build break
+- License verified
+
 * Fri Oct 29 2021 Muhammad Falak <mwani@microsft.com> - 0.92-8
 - Remove epoch
 

cgmanifest.json

@@ -6601,8 +6601,8 @@
         "type": "other",
         "other": {
           "name": "iptstate",
-          "version": "2.2.6",
-          "downloadUrl": "https://github.com/jaymzh/iptstate/releases/download/v2.2.6/iptstate-2.2.6.tar.bz2"
+          "version": "2.2.7",
+          "downloadUrl": "https://github.com/jaymzh/iptstate/releases/download/v2.2.7/iptstate-2.2.7.tar.bz2"
         }
       }
     },
@@ -11933,8 +11933,8 @@
         "type": "other",
         "other": {
           "name": "mtr",
-          "version": "0.92",
-          "downloadUrl": "https://github.com/traviscross/mtr/archive/v0.92/mtr-0.92.tar.gz"
+          "version": "0.95",
+          "downloadUrl": "https://github.com/traviscross/mtr/archive/v0.95/mtr-0.95.tar.gz"
         }
       }
     },