From 974100031dfd3122add5e2014f5567aa3c0fcdf8 Mon Sep 17 00:00:00 2001
From: Christian Lachner <gladiac@gmail.com>
Date: Fri, 2 Oct 2020 09:06:26 +0200
Subject: [PATCH] haproxy: Update HAProxy to v2.2.4

- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>
---
 net/haproxy/Makefile              | 4 ++--
 net/haproxy/get-latest-patches.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index 607caf813..bc1e8cb6f 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.2/src
-PKG_HASH:=7209db363d4dbecb21133f37b01048df666aebc14ff543525dbea79be202064e
+PKG_HASH:=87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
 		Christian Lachner <gladiac@gmail.com>
diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh
index d94a83d81..28ef393e2 100755
--- a/net/haproxy/get-latest-patches.sh
+++ b/net/haproxy/get-latest-patches.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CLONEURL=https://git.haproxy.org/git/haproxy-2.2.git
-BASE_TAG=v2.2.3
+BASE_TAG=v2.2.4
 TMP_REPODIR=tmprepo
 PATCHESDIR=patches
 
@@ -14,7 +14,7 @@ find ${PATCHESDIR} -type f -name "*.patch" -exec rm -f "{}" \;
 
 i=0
 for cid in $(git -C "${TMP_REPODIR}" rev-list ${BASE_TAG}..HEAD | tac); do
-	filename="$(printf "%03d" $i)-$(git -C "${TMP_REPODIR}" log --format=%s -n 1 $cid | sed -e"s/[()']//g" -e's/[^_a-zA-Z0-9+-]\+/-/g' -e's/-$//').patch"
+	filename="$(printf "%03d" $i)-$(git -C "${TMP_REPODIR}" log --format=%s -n 1 "$cid" | sed -e"s/[()']//g" -e's/[^_a-zA-Z0-9+-]\+/-/g' -e's/-$//').patch"
 	printf "Creating %s\n" "${filename}"
 	git -C "${TMP_REPODIR}" show "$cid" > "${PATCHESDIR}/$filename"
 	git add "${PATCHESDIR}/$filename"