From 6cec36bc0fe0d745f1d3b23ed7e3ba48ddb427d3 Mon Sep 17 00:00:00 2001
From: Tristan <tristan@mangadex.org>
Date: Wed, 22 Jun 2022 16:45:46 +0200
Subject: [PATCH] Upgrade stable to v2.6.1 and dev to 2.7 current master

---
 .gitlab-ci.yml   | 16 +++++++++-------
 haproxy/Makefile |  7 ++++---
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3582ceb..5fb46cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,13 +9,15 @@ variables: &default-variables
   GIT_DEPTH: "1"
 
 .haproxy_stable: &haproxy-stable
-  HAPROXY_VERSION: 2.6.0
-  HAPROXY_GITREF: v2.6.0
+  HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.6.git"
+  HAPROXY_VERSION: 2.6.1
+  HAPROXY_GITREF: 4b5779ef800cc7982f1b65ff318e4b04fe59cd18
 
 .haproxy_dev: &haproxy-dev
+  HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git"
   HAPROXY_VERSION: 2.7-dev
-  # https://git.haproxy.org/?p=haproxy.git;a=commit;h=040955fb39f8df183adda6fa19761a1ede36f624
-  HAPROXY_GITREF: 040955fb39f8df183adda6fa19761a1ede36f624
+  # https://git.haproxy.org/?p=haproxy.git;a=commit;h=1bad7db4a146e91cc2e9db72a92935ce9df5d24a
+  HAPROXY_GITREF: 1bad7db4a146e91cc2e9db72a92935ce9df5d24a
 
 .build-job: &build-job
   image: registry.gitlab.com/mangadex-pub/debuilder/buster:main
@@ -80,7 +82,7 @@ vtest:
     - mkdir deps/lua/dist     && tar -C deps/lua/dist     -xf deps/lua/lua-dist.tar.gz
     - mkdir deps/pcre2/dist   && tar -C deps/pcre2/dist   -xf deps/pcre2/pcre2-dist.tar.gz
     - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
-    - make -C haproxy HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF
+    - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF"
   needs: *needs-dependencies
   artifacts:
     expire_in: 7 days
@@ -94,7 +96,7 @@ vtest:
     - mkdir deps/lua/dist     && tar -C deps/lua/dist     -xf deps/lua/lua-dist.tar.gz
     - mkdir deps/pcre2/dist   && tar -C deps/pcre2/dist   -xf deps/pcre2/pcre2-dist.tar.gz
     - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
-    - make -C haproxy HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF build test
+    - make -C haproxy HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF" build test
   needs:
     - *needs-dependencies
     - job: vtest
@@ -109,7 +111,7 @@ vtest:
     - mkdir deps/pcre2/dist   && tar -C deps/pcre2/dist   -xf deps/pcre2/pcre2-dist.tar.gz
     - mkdir deps/quictls/dist && tar -C deps/quictls/dist -xf deps/quictls/quictls-dist.tar.gz
     - export BUILD_MESSAGE="$CI_COMMIT_MESSAGE"
-    - make -C haproxy dist-deb HAPROXY_VERSION=$HAPROXY_VERSION HAPROXY_GITREF=$HAPROXY_GITREF
+    - make -C haproxy dist-deb HAPROXY_GITREPO="$HAPROXY_GITREPO" HAPROXY_VERSION="$HAPROXY_VERSION" HAPROXY_GITREF="$HAPROXY_GITREF"
     - |
       set -euo pipefail
 
diff --git a/haproxy/Makefile b/haproxy/Makefile
index 74fa4b7..fdae934 100644
--- a/haproxy/Makefile
+++ b/haproxy/Makefile
@@ -1,9 +1,10 @@
-HAPROXY_VERSION = 2.6.0
-HAPROXY_GITREF = a1efc048bf8a5e14466dbe7317e73117e8d66176
+HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.6.git
+HAPROXY_VERSION = 2.6.1
+HAPROXY_GITREF = 4b5779ef800cc7982f1b65ff318e4b04fe59cd18
 HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)")
 HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)
 
-HAPROXY_SOURCES = https://git.haproxy.org/?p=haproxy.git;a=snapshot;h=$(HAPROXY_GITREF);sf=tgz
+HAPROXY_SOURCES = $(HAPROXY_GITREPO);a=snapshot;h=$(HAPROXY_GITREF);sf=tgz
 HAPROXY_TARBALL = haproxy-$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).tar.gz
 HAPROXY_DEBORIG = haproxy_$(HAPROXY_VERSION)-$(HAPROXY_SHORTSHA).orig.tar.gz
 HAPROXY_BUILDIR = src