[AUTO-CHERRYPICK] Update conntrack-tools and dependency - branch main (#9398)

Co-authored-by: Christopher Co <35273088+christopherco@users.noreply.github.com>

Author: CBL-Mariner-Bot

SPECS/conntrack-tools/conntrack-tools.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "conntrack-tools-1.4.5.tar.bz2": "36c6d99c7684851d4d72e75bd07ff3f0ff1baaf4b6f069eb7244990cd1a9a462",
+  "conntrack-tools-1.4.8.tar.xz": "067677f4c5f6564819e78ed3a9d4a8980935ea9273f3abb22a420ea30ab5ded6",
   "conntrackd.conf": "dc7fa36293263d0674508cba4499c90d20df15eabea7a7d901f2050094ede38b",
   "conntrackd.service": "c18f00e7b76df6dce5b7b46e1bb35e6c34f5d1fe329892c1f0327c2712282778"
  }

SPECS/conntrack-tools/conntrack-tools.spec

@@ -1,19 +1,19 @@
 Summary:        Manipulate netfilter connection tracking table and run High Availability
 Name:           conntrack-tools
-Version:        1.4.5
-Release:        8%{?dist}
+Version:        1.4.8
+Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 URL:            https://conntrack-tools.netfilter.org/
-Source0:        https://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2
+Source0:        https://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.xz
 Source1:        conntrackd.service
 Source2:        conntrackd.conf
 BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  gcc
 BuildRequires:  libmnl-devel >= 1.0.3
-BuildRequires:  libnetfilter_conntrack-devel >= 1.0.7
+BuildRequires:  libnetfilter_conntrack-devel >= 1.0.9
 BuildRequires:  libnetfilter_cthelper-devel >= 1.0.0
 BuildRequires:  libnetfilter_cttimeout-devel >= 1.0.0
 BuildRequires:  libnetfilter_queue-devel >= 1.0.2
@@ -96,6 +96,11 @@ echo "disable conntrackd.service" > %{buildroot}%{_libdir}/systemd/system-preset
 %systemd_postun conntrackd.service
 
 %changelog
+* Wed Jun 12 2024 corvus-callidus <108946721+corvus-callidus@users.noreply.github.com> - 1.4.8-1
+- Update to version 1.4.8
+- Updating source from tar.bz2 to tar.xz
+- Build requires libnetfilter_conntrack >= 1.0.9
+
 * Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 1.4.5-8
 - Recompile with stack-protection fixed gcc version (CVE-2023-4039)
 

SPECS/libnetfilter_conntrack/libnetfilter_conntrack.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "libnetfilter_conntrack-1.0.8.tar.bz2": "0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf"
+  "libnetfilter_conntrack-1.0.9.tar.bz2": "67bd9df49fe34e8b82144f6dfb93b320f384a8ea59727e92ff8d18b5f4b579a8"
  }
 }

SPECS/libnetfilter_conntrack/libnetfilter_conntrack.spec

@@ -1,6 +1,6 @@
 Summary:        Netfilter conntrack userspace library
 Name:           libnetfilter_conntrack
-Version:        1.0.8
+Version:        1.0.9
 Release:        1%{?dist}
 License:        GPLv2+
 Vendor:         Microsoft Corporation
@@ -51,6 +51,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 12 2024 corvus-callidus <108946721+corvus-callidus@users.noreply.github.com> - 1.0.9-1
+- Update to version 1.0.9
+
 * Tue Jan 11 2022 Henry Li <lihl@microsoft.com> - 1.0.8-1
 - Upgrade to version 1.0.8
 - Verified License

cgmanifest.json

@@ -2027,8 +2027,8 @@
         "type": "other",
         "other": {
           "name": "conntrack-tools",
-          "version": "1.4.5",
-          "downloadUrl": "https://netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.5.tar.bz2"
+          "version": "1.4.8",
+          "downloadUrl": "https://netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.8.tar.xz"
         }
       }
     },
@@ -10241,8 +10241,8 @@
         "type": "other",
         "other": {
           "name": "libnetfilter_conntrack",
-          "version": "1.0.8",
-          "downloadUrl": "http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2"
+          "version": "1.0.9",
+          "downloadUrl": "http://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2"
         }
       }
     },