From c12101334f08a6b3b30516bfe4b18a26a25f0e44 Mon Sep 17 00:00:00 2001
From: hootigger <guogaohu8@163.com>
Date: Sun, 4 Oct 2020 02:11:37 +0800
Subject: [PATCH] haproxy: update to v2.2.4

---
 net/haproxy/Makefile              | 15 +++------------
 net/haproxy/get-latest-patches.sh |  6 +++---
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/net/haproxy/Makefile b/net/haproxy/Makefile
index ca86759b..bc1e8cb6 100644
--- a/net/haproxy/Makefile
+++ b/net/haproxy/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=2.1.7
+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.1/src
-PKG_HASH:=392e6cf18e75fe7e166102e8c4512942890a0b5ae738f6064faab4687f60a339
+PKG_SOURCE_URL:=https://www.haproxy.org/download/2.2/src
+PKG_HASH:=87a4d9d4ff8dc3094cb61bbed4a8eed2c40b5ac47b9604daebaf036d7b541be2
 
 PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de>, \
 		Christian Lachner <gladiac@gmail.com>
@@ -79,11 +79,6 @@ $(call Package/haproxy/Default/description)
 endef
 
 ENABLE_LUA:=y
-ENABLE_REGPARM:=n
-
-ifeq ($(CONFIG_TARGET_x86),y)
-	ENABLE_REGPARM:=y
-endif
 
 ifeq ($(CONFIG_USE_UCLIBC),y)
 	ADDON+=USE_LIBCRYPT=
@@ -94,10 +89,6 @@ ifeq ($(BUILD_VARIANT),ssl)
 	ADDON+=ADDLIB="-lcrypto -lm"
 endif
 
-ifeq ($(ENABLE_REGPARM),y)
-	ADDON+=USE_REGPARM=1
-endif
-
 define Build/Compile
 	$(MAKE) TARGET=linux-glibc -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
diff --git a/net/haproxy/get-latest-patches.sh b/net/haproxy/get-latest-patches.sh
index b1139c68..28ef393e 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.1.git
-BASE_TAG=v2.1.7
+CLONEURL=https://git.haproxy.org/git/haproxy-2.2.git
+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"