Bump haproxy version to 2.4.22 for CVE-2023-25725 (microsoft#4905)

* haproxy: Add nopatch for CVE-2023-25725

Bump version to 2.4.22 which contains the fix.

Reference:
Upstream: haproxy/haproxy@a8598a2
Release Note: https://git.haproxy.org/?p=haproxy-2.4.git;a=log;h=refs/tags/v2.4.22

* haproxy: Update cgmanifest

* haproxy: Correct changelog

* haproxy: Delete nopatch file as not needed

SPECS/haproxy/haproxy.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "haproxy-2.4.13.tar.gz": "4788fe975fe7e521746f826c25e80bc95cd15983e2bafa33e43bff23a3fe5ba1"
+  "haproxy-2.4.22.tar.gz": "0895340b36b704a1dbb25fea3bbaee5ff606399d6943486ebd7f256fee846d3a"
  }
 }

SPECS/haproxy/haproxy.spec

@@ -1,19 +1,19 @@
 Summary:        A fast, reliable HA, load balancing, and proxy solution.
 Name:           haproxy
-Version:        2.4.13
+Version:        2.4.22
 Release:        1%{?dist}
 License:        GPLv2+
-URL:            http://www.haproxy.org
-Group:          Applications/System
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
+Group:          Applications/System
+URL:            https://www.haproxy.org
 Source0:        http://www.haproxy.org/download/2.4/src/%{name}-%{version}.tar.gz
+BuildRequires:  lua-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pcre-devel
-BuildRequires:  lua-devel
 BuildRequires:  pkg-config
-BuildRequires:  zlib-devel
 BuildRequires:  systemd-devel
+BuildRequires:  zlib-devel
 Requires:       systemd
 
 %description
@@ -23,6 +23,7 @@ for very high traffic web-sites.
 
 %package        doc
 Summary:        Documentation for haproxy
+
 %description    doc
 It contains the documentation and manpages for haproxy package.
 Requires:       %{name} = %{version}-%{release}
@@ -42,7 +43,7 @@ sed -i "s/192.168.1.22/127.0.0.0/g" examples/transparent_proxy.cfg
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
 make DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/haproxy TARGET=linux2628 install
 install -vDm755 admin/systemd/haproxy.service \
-       %{buildroot}/usr/lib/systemd/system/haproxy.service
+       %{buildroot}%{_libdir}/systemd/system/haproxy.service
 install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/haproxy/haproxy.cfg
 
 %files
@@ -58,42 +59,61 @@ install -vDm644 examples/transparent_proxy.cfg  %{buildroot}/%{_sysconfdir}/hapr
 %{_mandir}/*
 
 %changelog
-*   Thu Feb 24 2022 Minghe Ren <[email protected]> 2.4.13-1
--   Update to 2.4.13
--   License verified
--   Add nopatch for CVE-2022-0711
-*   Thu Jun 04 2020 Ruying Chen <[email protected]> 2.1.5-1
--   Update to 2.1.5
-*   Tue May 19 2020 Nicolas Ontiveros <[email protected]> 1.9.6-5
--   Fix CVE-2019-14241.
--   Fix CVE-2020-11100.
-*   Sat May 09 2020 Nick Samson <[email protected]> 1.9.6-4
--   Added %%license line automatically
-*   Tue Apr 21 2020 Nicolas Ontiveros <[email protected]> 1.9.6-3
--   Fix CVE-2019-19330.
--   Remove sha1 macro.
-*   Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.9.6-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
-*   Tue Apr 2 2019 Priyesh Padmavilasom <[email protected]> 1.9.6-1
--   Update to 1.9.6
-*   Thu Feb 28 2019 Priyesh Padmavilasom <[email protected]> 1.8.14-2
--   Patch for CVE_2018_20102
--   Patch for CVE_2018_20103
-*   Tue Dec 04 2018 Ajay Kaher <[email protected]> 1.8.14-1
--   Update to version 1.8.14
-*   Thu Oct 25 2018 Srivatsa S. Bhat (VMware) <[email protected]> 1.8.13-2
--   Build with USE_SYSTEMD=1 to fix service startup.
-*   Wed Sep 12 2018 Anish Swaminathan <[email protected]> 1.8.13-1
--   Update to version 1.8.13
-*   Tue Apr 04 2017 Dheeraj Shetty <[email protected]> 1.6.12-1
--   Updated to version 1.6.12
-*   Sun Nov 27 2016 Vinay Kulkarni <[email protected]> 1.6.10-1
--   Upgrade to 1.6.10 to address CVE-2016-5360
-*   Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.6.3-3
--   GA - Bump release of all rpms
-*   Fri May 20 2016 Xiaolin Li <[email protected]> 1.6.3-2
--   Add haproxy-systemd-wrapper to package, add a default configuration file.
-*   Mon Feb 22 2016 Xiaolin Li <[email protected]> 1.6.3-1
--   Updated to version 1.6.3
-*   Thu Oct 01 2015 Vinay Kulkarni <[email protected]> 1.5.14-1
--   Add haproxy v1.5 package.
+* Wed Feb 22 2023 Sumedh Sharma <[email protected]> - 2.4.22-1
+- Update to 2.4.22 to fix CVE-2023-25725
+
+* Thu Feb 24 2022 Minghe Ren <[email protected]> - 2.4.13-1
+- Update to 2.4.13
+- License verified
+- Add nopatch for CVE-2022-0711
+
+* Thu Jun 04 2020 Ruying Chen <[email protected]> - 2.1.5-1
+- Update to 2.1.5
+
+* Tue May 19 2020 Nicolas Ontiveros <[email protected]> - 1.9.6-5
+- Fix CVE-2019-14241.
+- Fix CVE-2020-11100.
+
+* Sat May 09 2020 Nick Samson <[email protected]> - 1.9.6-4
+- Added %%license line automatically
+
+* Tue Apr 21 2020 Nicolas Ontiveros <[email protected]> - 1.9.6-3
+- Fix CVE-2019-19330.
+- Remove sha1 macro.
+
+* Tue Sep 03 2019 Mateusz Malisz <[email protected]> - 1.9.6-2
+- Initial CBL-Mariner import from Photon (license: Apache2).
+
+* Tue Apr 2 2019 Priyesh Padmavilasom <[email protected]> - 1.9.6-1
+- Update to 1.9.6
+
+* Thu Feb 28 2019 Priyesh Padmavilasom <[email protected]> - 1.8.14-2
+- Patch for CVE_2018_20102
+- Patch for CVE_2018_20103
+
+* Tue Dec 04 2018 Ajay Kaher <[email protected]> - 1.8.14-1
+- Update to version 1.8.14
+
+* Thu Oct 25 2018 Srivatsa S. Bhat (VMware) <[email protected]> - 1.8.13-2
+- Build with USE_SYSTEMD=1 to fix service startup.
+
+* Wed Sep 12 2018 Anish Swaminathan <[email protected]> - 1.8.13-1
+- Update to version 1.8.13
+
+* Tue Apr 04 2017 Dheeraj Shetty <[email protected]> - 1.6.12-1
+- Updated to version 1.6.12
+
+* Sun Nov 27 2016 Vinay Kulkarni <[email protected]> - 1.6.10-1
+- Upgrade to 1.6.10 to address CVE-2016-5360
+
+* Tue May 24 2016 Priyesh Padmavilasom <[email protected]> - 1.6.3-3
+- GA - Bump release of all rpms
+
+* Fri May 20 2016 Xiaolin Li <[email protected]> - 1.6.3-2
+- Add haproxy-systemd-wrapper to package, add a default configuration file.
+
+* Mon Feb 22 2016 Xiaolin Li <[email protected]> - 1.6.3-1
+- Updated to version 1.6.3
+
+* Thu Oct 01 2015 Vinay Kulkarni <[email protected]> - 1.5.14-1
+- Add haproxy v1.5 package.

cgmanifest.json

@@ -4890,8 +4890,8 @@
         "type": "other",
         "other": {
           "name": "haproxy",
-          "version": "2.4.13",
-          "downloadUrl": "http://www.haproxy.org/download/2.4/src/haproxy-2.4.13.tar.gz"
+          "version": "2.4.22",
+          "downloadUrl": "http://www.haproxy.org/download/2.4/src/haproxy-2.4.22.tar.gz"
         }
       }
     },