From d2ee940a215600eacbcb9f8425edfbffa43d06a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 2 Apr 2020 15:55:05 +0200
Subject: [PATCH] haproxy: update to 2.1.4 (fix CVE-2020-11100)

---
 srcpkgs/haproxy/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 7d3b7b13cad..da7c983f65c 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -1,18 +1,18 @@
 # Template file for 'haproxy'
 pkgname=haproxy
-version=2.1.3
+version=2.1.4
 revision=1
 build_style=gnu-makefile
 make_build_args="TARGET=linux-glibc USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1
  USE_OPENSSL=1 USE_LIBCRYPT=1 USE_GETADDRINFO=1 USE_LUA=1"
 make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
-makedepends="libressl-devel lua-devel pcre-devel"
+makedepends="libatomic-devel libressl-devel lua-devel pcre-devel"
 short_desc="Reliable, high performance TCP/HTTP load balancer"
 maintainer="Eivind Uggedal <eivind@uggedal.com>"
 license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.haproxy.org"
 distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
-checksum=bb678e550374d0d9d9312885fb9d270b501dae9e3b336f0a4379c667dae00b59
+checksum=51030ff696d7067162b4d24d354044293aecfbb36d7acc2f840c8d928bfe91cd
 
 haproxy_homedir="/var/lib/${pkgname}"
 make_dirs="$haproxy_homedir 0750 ${pkgname} ${pkgname}"
@@ -23,12 +23,6 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) CFLAGS="-D__LINUX_NETFILTER_H";;
 esac
 
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+=" libatomic-devel"
-	ADDLIB="-latomic"
-fi
-
-
 do_build() {
 	make ${makejobs} CC="$CC" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" EXTRA= \
 		ADDLIB="${ADDLIB}" ${make_build_args}