From 5ee2f0d50f9a9214d9a12276c155e6bbd41e213c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Jan 2020 15:56:23 -0500 Subject: [PATCH] import haproxy-1.8.23-2.el8 --- .gitignore | 2 +- .haproxy.metadata | 2 +- SOURCES/haproxy.service | 1 + SPECS/haproxy.spec | 13 +++++++++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ec3a304..b3c4ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/haproxy-1.8.15.tar.gz +SOURCES/haproxy-1.8.23.tar.gz diff --git a/.haproxy.metadata b/.haproxy.metadata index 8bda435..3d2a7e7 100644 --- a/.haproxy.metadata +++ b/.haproxy.metadata @@ -1 +1 @@ -ed7dfe5c7fc39fbb3b54e981eb709fd8bcd87042 SOURCES/haproxy-1.8.15.tar.gz +c1b6c1d4d5de55bcad874a0a7a02a94db5638b1f SOURCES/haproxy-1.8.23.tar.gz diff --git a/SOURCES/haproxy.service b/SOURCES/haproxy.service index b32d00c..2b3a35e 100644 --- a/SOURCES/haproxy.service +++ b/SOURCES/haproxy.service @@ -8,6 +8,7 @@ ExecStartPre=/usr/sbin/haproxy -f $CONFIG -c -q ExecStart=/usr/sbin/haproxy -Ws -f $CONFIG -p $PIDFILE ExecReload=/usr/sbin/haproxy -f $CONFIG -c -q ExecReload=/bin/kill -USR2 $MAINPID +SuccessExitStatus=143 KillMode=mixed Type=notify diff --git a/SPECS/haproxy.spec b/SPECS/haproxy.spec index 490d006..a54dc6f 100644 --- a/SPECS/haproxy.spec +++ b/SPECS/haproxy.spec @@ -7,8 +7,8 @@ %global _hardened_build 1 Name: haproxy -Version: 1.8.15 -Release: 5%{?dist} +Version: 1.8.23 +Release: 2%{?dist} Summary: HAProxy reverse proxy for high availability environments Group: System Environment/Daemons @@ -138,6 +138,15 @@ exit 0 %{_mandir}/man1/* %changelog +* Fri Dec 13 2019 Ryan O'Hara - 1.8.23-2 +- Consider exist status 143 as success (#1778844) + +* Mon Dec 02 2019 Ryan O'Hara - 1.8.23-1 +- Update to 1.8.23 (#1774745) + +* Fri Jul 19 2019 Ryan O'Hara - 1.8.15-6 +- Add gating tests (#1682106) + * Wed Jan 09 2019 Ryan O'Hara - 1.8.15-5 - Resolve CVE-2018-20615 (#1664533)