Update haproxy

[tianon]

Changes:

• docker-library/haproxy@9081978: Merge pull request Update to 2.0.16 haproxy#126 from infosiftr/2.0.16
• docker-library/haproxy@c408159: Update to 2.0.16
• docker-library/haproxy@6e4facd: Update to 2.3-dev1

[github-actions]

Diff for c1f949c:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index f0a3432..c327387 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -31,14 +31,14 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: e538b03ce98ce2c9bb9e6e0db26d87ad45a137d0
 Directory: 1.9/alpine
 
-Tags: 2.0.15, 2.0
+Tags: 2.0.16, 2.0
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f85b33d7a5fd97fd7852fe18d602009ab093289c
+GitCommit: c4081598aacb56651940e84a04c8e03c403aec3c
 Directory: 2.0
 
-Tags: 2.0.15-alpine, 2.0-alpine
+Tags: 2.0.16-alpine, 2.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: e538b03ce98ce2c9bb9e6e0db26d87ad45a137d0
+GitCommit: c4081598aacb56651940e84a04c8e03c403aec3c
 Directory: 2.0/alpine
 
 Tags: 2.1.7, 2.1
@@ -61,12 +61,12 @@ Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
 GitCommit: b9e54c2c29daa41f5045c7e95c887abe1933ea03
 Directory: 2.2/alpine
 
-Tags: 2.3-dev0, 2.3-dev
+Tags: 2.3-dev1, 2.3-dev
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: abcf89e58d99e59c1ce7c456ae5c218cdcc35052
+GitCommit: 6e4facdc3a4cb4c4f1265e68c17d7c6edb2a9d1e
 Directory: 2.3-rc
 
-Tags: 2.3-dev0-alpine, 2.3-dev-alpine
+Tags: 2.3-dev1-alpine, 2.3-dev-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: abcf89e58d99e59c1ce7c456ae5c218cdcc35052
+GitCommit: 6e4facdc3a4cb4c4f1265e68c17d7c6edb2a9d1e
 Directory: 2.3-rc/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index eb65b07..438f001 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,8 +14,8 @@ haproxy:1.9.15
 haproxy:1.9.15-alpine
 haproxy:2.0
 haproxy:2.0-alpine
-haproxy:2.0.15
-haproxy:2.0.15-alpine
+haproxy:2.0.16
+haproxy:2.0.16-alpine
 haproxy:2.1
 haproxy:2.1-alpine
 haproxy:2.1.7
@@ -25,8 +25,8 @@ haproxy:2.2-alpine
 haproxy:2.2.0
 haproxy:2.2.0-alpine
 haproxy:2.3-dev
-haproxy:2.3-dev0
-haproxy:2.3-dev0-alpine
+haproxy:2.3-dev1
+haproxy:2.3-dev1-alpine
 haproxy:2.3-dev-alpine
 haproxy:alpine
 haproxy:latest
diff --git a/haproxy_2.0-alpine/Dockerfile b/haproxy_2.0-alpine/Dockerfile
index 6b7db3c..78e5223 100644
--- a/haproxy_2.0-alpine/Dockerfile
+++ b/haproxy_2.0-alpine/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM alpine:3.12
 
-ENV HAPROXY_VERSION 2.0.15
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.15.tar.gz
-ENV HAPROXY_SHA256 6e21c6b92d4035ee006ef18e25f396d7e71552a6d3a1e075fa9fe59d89eaaeee
+ENV HAPROXY_VERSION 2.0.16
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.16.tar.gz
+ENV HAPROXY_SHA256 8eda217f3bf82f7ad6353bfd0c2005c4ac2da6cdca0398cf98de0016cdb97385
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
@@ -26,6 +26,10 @@ RUN set -x \
 	&& mkdir -p /usr/src/haproxy \
 	&& tar -xzf haproxy.tar.gz -C /usr/src/haproxy --strip-components=1 \
 	&& rm haproxy.tar.gz \
+# https://github.com/haproxy/haproxy/issues/760 ("ebtree/ebtree.c:43:2: error: unknown type name 'ssize_t'; did you mean 'size_t'?")
+	&& ! grep -qF 'unistd.h' /usr/src/haproxy/ebtree/ebtree.c \
+	&& awk '$1 == "#include" && !inc { print "#include <unistd.h>"; inc = 1 } { print }' /usr/src/haproxy/ebtree/ebtree.c > ebtree.c \
+	&& mv ebtree.c /usr/src/haproxy/ebtree/ebtree.c \
 	\
 	&& makeOpts=' \
 		TARGET=linux-glibc \
diff --git a/haproxy_2.0/Dockerfile b/haproxy_2.0/Dockerfile
index 366394c..108fa87 100644
--- a/haproxy_2.0/Dockerfile
+++ b/haproxy_2.0/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM debian:buster-slim
 
-ENV HAPROXY_VERSION 2.0.15
-ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.15.tar.gz
-ENV HAPROXY_SHA256 6e21c6b92d4035ee006ef18e25f396d7e71552a6d3a1e075fa9fe59d89eaaeee
+ENV HAPROXY_VERSION 2.0.16
+ENV HAPROXY_URL https://www.haproxy.org/download/2.0/src/haproxy-2.0.16.tar.gz
+ENV HAPROXY_SHA256 8eda217f3bf82f7ad6353bfd0c2005c4ac2da6cdca0398cf98de0016cdb97385
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
diff --git a/haproxy_2.3-dev-alpine/Dockerfile b/haproxy_2.3-dev-alpine/Dockerfile
index f731163..b51fa85 100644
--- a/haproxy_2.3-dev-alpine/Dockerfile
+++ b/haproxy_2.3-dev-alpine/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM alpine:3.12
 
-ENV HAPROXY_VERSION 2.3-dev0
-ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev0.tar.gz
-ENV HAPROXY_SHA256 8a04d9600bccd053fb16976fc24a54f20020dc030ee6db1693cfc2eaec434681
+ENV HAPROXY_VERSION 2.3-dev1
+ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev1.tar.gz
+ENV HAPROXY_SHA256 5922d04a9d3e785de23fb636b06511f537d3395b69c8cc98ef0a6ecb82593878
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \
diff --git a/haproxy_2.3-dev/Dockerfile b/haproxy_2.3-dev/Dockerfile
index 003a042..96e739e 100644
--- a/haproxy_2.3-dev/Dockerfile
+++ b/haproxy_2.3-dev/Dockerfile
@@ -1,9 +1,9 @@
 # vim:set ft=dockerfile:
 FROM debian:buster-slim
 
-ENV HAPROXY_VERSION 2.3-dev0
-ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev0.tar.gz
-ENV HAPROXY_SHA256 8a04d9600bccd053fb16976fc24a54f20020dc030ee6db1693cfc2eaec434681
+ENV HAPROXY_VERSION 2.3-dev1
+ENV HAPROXY_URL https://www.haproxy.org/download/2.3/src/devel/haproxy-2.3-dev1.tar.gz
+ENV HAPROXY_SHA256 5922d04a9d3e785de23fb636b06511f537d3395b69c8cc98ef0a6ecb82593878
 
 # see https://sources.debian.net/src/haproxy/jessie/debian/rules/ for some helpful navigation of the possible "make" arguments
 RUN set -x \