From 8cd07f9d33dac8436831b0a1f2f1a862061a237a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= <tim@bastelstu.be>
Date: Mon, 22 Mar 2021 12:12:06 +0100
Subject: [PATCH 1/2] Update to 1.7.13

---
 1.7/Dockerfile        | 6 +++---
 1.7/alpine/Dockerfile | 6 +++---
 versions.json         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/1.7/Dockerfile b/1.7/Dockerfile
index 6ac23f80..5644f496 100644
--- a/1.7/Dockerfile
+++ b/1.7/Dockerfile
@@ -17,9 +17,9 @@ RUN set -eux; \
 		--uid 99 \
 		haproxy
 
-ENV HAPROXY_VERSION 1.7.12
-ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.12.tar.gz
-ENV HAPROXY_SHA256 4118178b553a107b227f3f84774c7a50ae0b3ac2be39211c3db511ed4efe48ce
+ENV HAPROXY_VERSION 1.7.13
+ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.13.tar.gz
+ENV HAPROXY_SHA256 53ae3ae722236a56cc8b584bf1f8ef422fc40e9ce032d244e256c486c1713600
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \
diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile
index 33d03ac7..350f9118 100644
--- a/1.7/alpine/Dockerfile
+++ b/1.7/alpine/Dockerfile
@@ -18,9 +18,9 @@ RUN set -eux; \
 		--uid 99 \
 		haproxy
 
-ENV HAPROXY_VERSION 1.7.12
-ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.12.tar.gz
-ENV HAPROXY_SHA256 4118178b553a107b227f3f84774c7a50ae0b3ac2be39211c3db511ed4efe48ce
+ENV HAPROXY_VERSION 1.7.13
+ENV HAPROXY_URL https://www.haproxy.org/download/1.7/src/haproxy-1.7.13.tar.gz
+ENV HAPROXY_SHA256 53ae3ae722236a56cc8b584bf1f8ef422fc40e9ce032d244e256c486c1713600
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -eux; \
diff --git a/versions.json b/versions.json
index 9b7a8b81..b199a7b3 100644
--- a/versions.json
+++ b/versions.json
@@ -2,9 +2,9 @@
   "1.7": {
     "alpine": "3.12",
     "debian": "buster-slim",
-    "sha256": "4118178b553a107b227f3f84774c7a50ae0b3ac2be39211c3db511ed4efe48ce",
-    "url": "https://www.haproxy.org/download/1.7/src/haproxy-1.7.12.tar.gz",
-    "version": "1.7.12"
+    "sha256": "53ae3ae722236a56cc8b584bf1f8ef422fc40e9ce032d244e256c486c1713600",
+    "url": "https://www.haproxy.org/download/1.7/src/haproxy-1.7.13.tar.gz",
+    "version": "1.7.13"
   },
   "1.8": {
     "alpine": "3.13",

From 42989bf9ab08e05e7333261ce62fff00d0dcb08a Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Fri, 26 Mar 2021 09:26:43 -0700
Subject: [PATCH 2/2] (Re-)Apply the backported ebtree patch from upstream

---
 1.7/alpine/Dockerfile |  8 ++++++++
 Dockerfile.template   | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/1.7/alpine/Dockerfile b/1.7/alpine/Dockerfile
index 350f9118..7e23cc13 100644
--- a/1.7/alpine/Dockerfile
+++ b/1.7/alpine/Dockerfile
@@ -45,6 +45,14 @@ RUN set -eux; \
 	tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
 	rm haproxy.tar.gz; \
 	\
+# https://github.com/haproxy/haproxy/issues/760#issuecomment-804282562
+	apk add --no-cache --virtual .build-deps-patch patch; \
+# https://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=3280d0ab43e03ae5e94da205630fa576d7633627
+	wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-1.7.git;a=patch;h=3280d0ab43e03ae5e94da205630fa576d7633627'; \
+	echo '8c8176604a9638d57fc4385154d8d2622d4ae52422ea53a5b91fac49459cfd2d *ebtree.patch' | sha256sum -c -; \
+	patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy; \
+	apk del --no-network .build-deps-patch; \
+	\
 	makeOpts=' \
 		CFLAGS+="-Wno-address-of-packed-member" \
 		TARGET=linux2628 \
diff --git a/Dockerfile.template b/Dockerfile.template
index 2a2e6c06..26067c50 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -70,6 +70,16 @@ RUN set -eux; \
 	tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1; \
 	rm haproxy.tar.gz; \
 	\
+{{ if env.version == "1.7" and env.variant == "alpine" then ( -}}
+# https://github.com/haproxy/haproxy/issues/760#issuecomment-804282562
+	apk add --no-cache --virtual .build-deps-patch patch; \
+# https://git.haproxy.org/?p=haproxy-1.7.git;a=commit;h=3280d0ab43e03ae5e94da205630fa576d7633627
+	wget -O ebtree.patch 'https://git.haproxy.org/?p=haproxy-1.7.git;a=patch;h=3280d0ab43e03ae5e94da205630fa576d7633627'; \
+	echo '8c8176604a9638d57fc4385154d8d2622d4ae52422ea53a5b91fac49459cfd2d *ebtree.patch' | sha256sum -c -; \
+	patch -p1 --input="$PWD/ebtree.patch" --directory=/usr/src/haproxy; \
+	apk del --no-network .build-deps-patch; \
+	\
+{{ ) else "" end -}}
 {{
 	def haproxy_target:
 		if env.version | startswith("1.") then