From 4eb797c88e0d6b729bd981223639029141794ac8 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara <rohara@redhat.com>
Date: Tue, 1 Jun 2021 13:03:22 -0500
Subject: [PATCH] Update to 2.4.0 Resolves: #1966688

---
 haproxy.spec | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/haproxy.spec b/haproxy.spec
index 0ff1528..1d39a9a 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -7,14 +7,14 @@
 %global _hardened_build 1
 
 Name:           haproxy
-Version:        2.3.4
-Release:        3%{?dist}
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 License:        GPLv2+
 
 URL:            http://www.haproxy.org/
-Source0:        %{url}/download/2.2/src/haproxy-%{version}.tar.gz
+Source0:        %{url}/download/2.4/src/haproxy-%{version}.tar.gz
 Source1:        %{name}.service
 Source2:        %{name}.cfg
 Source3:        %{name}.logrotate
@@ -24,13 +24,12 @@ Source5:        halog.1
 BuildRequires:  gcc
 BuildRequires:  lua-devel
 BuildRequires:  pcre2-devel
-BuildRequires:  zlib-devel
 BuildRequires:  openssl-devel
 BuildRequires:  systemd-devel
 BuildRequires:  systemd
-BuildRequires: make
+BuildRequires:  make
 
-Requires(pre):      shadow-utils
+Requires(pre):  shadow-utils
 %{?systemd_requires}
 
 %description
@@ -56,15 +55,11 @@ regparm_opts=
 regparm_opts="USE_REGPARM=1"
 %endif
 
-%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_ZLIB=1 USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE2=1 USE_SLZ=1 USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 USE_PROMEX=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}"
 
-pushd contrib/halog
-%{__make} ${halog} OPTIMIZE="%{optflags} %{build_ldflags}"
-popd
-
-pushd contrib/iprange
-%{__make} iprange OPTIMIZE="%{optflags} %{build_ldflags}"
-popd
+%{__make} admin/halog/halog OPTIMIZE="%{optflags} %{build_ldflags}"
+%{__make} admin/iprange/iprange OPTIMIZE="%{optflags} %{build_ldflags}"
+%{__make} admin/iprange/ip6range OPTIMIZE="%{optflags} %{build_ldflags}"
 
 %install
 %{__make} install-bin DESTDIR=%{buildroot} PREFIX=%{_prefix} TARGET="linux2628"
@@ -78,9 +73,9 @@ popd
 %{__install} -d -m 0755 %{buildroot}%{haproxy_homedir}
 %{__install} -d -m 0755 %{buildroot}%{haproxy_datadir}
 %{__install} -d -m 0755 %{buildroot}%{_bindir}
-%{__install} -p -m 0755 ./contrib/halog/halog %{buildroot}%{_bindir}/halog
-%{__install} -p -m 0755 ./contrib/iprange/iprange %{buildroot}%{_bindir}/iprange
-%{__install} -p -m 0644 ./examples/errorfiles/* %{buildroot}%{haproxy_datadir}
+%{__install} -p -m 0755 ./admin/halog/halog %{buildroot}%{_bindir}/halog
+%{__install} -p -m 0755 ./admin/iprange/iprange %{buildroot}%{_bindir}/iprange
+%{__install} -p -m 0755 ./admin/iprange/ip6range %{buildroot}%{_bindir}/ip6range
 
 for httpfile in $(find ./examples/errorfiles/ -type f) 
 do
@@ -130,9 +125,13 @@ exit 0
 %{_sbindir}/%{name}
 %{_bindir}/halog
 %{_bindir}/iprange
+%{_bindir}/ip6range
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jun 01 2021 Ryan O'Hara <rohara@redhat.com> - 2.4.0-1
+- Update to 2.4.0 (#1966688)
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.4-3
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937