:)

.gitlab-ci.yml

@@ -34,14 +34,14 @@ variables: &default-variables
 .haproxy_stable: &haproxy-stable
   HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.7.git"
   HAPROXY_VERSION: 2.7-stable
-  # https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=bb4bacf32db7564e668ccc3aacc6bed8688894ba
-  HAPROXY_GITREF: "1065b10007f4622f2af70fb114594a63af9c8c76"
+  # https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=d28541d1fa946adb74510c969bd50b06c27bbad7
+  HAPROXY_GITREF: "d28541d1fa946adb74510c969bd50b06c27bbad7"
 
 .haproxy_dev: &haproxy-dev
   HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy.git"
   HAPROXY_VERSION: 2.8-dev
-  # https://git.haproxy.org/?p=haproxy.git;a=commit;h=737d10fac150ba936e422407916655a8630657a5
-  HAPROXY_GITREF: "737d10fac150ba936e422407916655a8630657a5"
+  # https://git.haproxy.org/?p=haproxy.git;a=commit;h=fc0ad29c292eb07496d29fd4375ba010e876bbf2
+  HAPROXY_GITREF: "fc0ad29c292eb07496d29fd4375ba010e876bbf2"
 
 .build-job: &build-job
   image: registry.gitlab.com/mangadex-pub/debuilder/buster:main

deps/lua/Makefile

@@ -9,7 +9,7 @@ LUA_ARCHIVE = lua-dist.tar.gz
 all: build $(LUA_DESTDIR) $(LUA_ARCHIVE)
 
 $(LUA_TARBALL):
-	curl -fsSL -o "$(LUA_TARBALL)" "$(LUA_SOURCES)"
+	xbps-fetch -o "$(LUA_TARBALL)" "$(LUA_SOURCES)"
 
 $(LUA_BUILDIR): $(LUA_TARBALL)
 	@if ! [ -d "$(LUA_BUILDIR)" ]; then mkdir -v "$(LUA_BUILDIR)"; fi

deps/pcre2/Makefile

@@ -9,7 +9,7 @@ PCRE2_ARCHIVE = pcre2-dist.tar.gz
 all: build $(PCRE2_DESTDIR) $(PCRE2_ARCHIVE)
 
 $(PCRE2_TARBALL):
-	curl -fsSL -o "$(PCRE2_TARBALL)" "$(PCRE2_SOURCES)"
+	xbps-fetch -o "$(PCRE2_TARBALL)" "$(PCRE2_SOURCES)"
 
 $(PCRE2_BUILDIR): $(PCRE2_TARBALL)
 	@if ! [ -d "$(PCRE2_BUILDIR)" ]; then mkdir -v "$(PCRE2_BUILDIR)"; fi

deps/quictls/Makefile

@@ -1,6 +1,5 @@
 OPENSSL_VERSION = 1.1.1t
 BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
-QUICTLS_BUILD_VERSION = quic-mangadex-$(BUILD_VERSION_REPOSHA)
 QUICTLS_TAG = OpenSSL_$(subst .,_,$(OPENSSL_VERSION))-quic1
 
 QUICTLS_SOURCES = https://codeload.github.com/quictls/openssl/tar.gz/$(QUICTLS_TAG)
@@ -13,16 +12,15 @@ QUICTLS_ARCHIVE = quictls-dist.tar.gz
 all: build $(QUICTLS_DESTDIR) $(QUICTLS_ARCHIVE)
 
 $(QUICTLS_TARBALL):
-	curl -sfS -o "$(QUICTLS_TARBALL)" "$(QUICTLS_SOURCES)"
+	xbps-fetch -o "$(QUICTLS_TARBALL)" "$(QUICTLS_SOURCES)"
 
 $(QUICTLS_BUILDIR): $(QUICTLS_TARBALL)
 	@if ! [ -d "$(QUICTLS_BUILDIR)" ]; then mkdir -v "$(QUICTLS_BUILDIR)"; fi
 	tar -C $(QUICTLS_BUILDIR) --strip-components=1 -xf "$(QUICTLS_TARBALL)"
 
 build: $(QUICTLS_BUILDIR)
-	cd "$(QUICTLS_BUILDIR)" &&  sed -i 's/^# define OPENSSL_VERSION_TEXT.*$\/# define OPENSSL_VERSION_TEXT "OpenSSL $(OPENSSL_VERSION)+$(QUICTLS_BUILD_VERSION) $(shell date -u +'%e %b %Y')"/g' "include/openssl/opensslv.h"
 	cd "$(QUICTLS_BUILDIR)" && CC=cc ./config --prefix="/opt/quictls" --openssldir="/opt/quictls" --libdir="lib" no-shared
-	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)" VERSION=$(OPENSSL_VERSION)+quic-mangadex-$(BUILD_VERSION_REPOSHA)
+	$(MAKE) -C "$(QUICTLS_BUILDIR)" -j "$(shell nproc)"
 	"$(QUICTLS_BUILDIR)/apps/openssl" version
 	$(MAKE) buildinfo_$(shell uname -s)
 
@@ -42,7 +40,7 @@ $(QUICTLS_DESTDIR): build
 	$(QUICTLS_DESTDIR_ABS)/opt/quictls/bin/openssl version
 
 $(QUICTLS_ARCHIVE): $(QUICTLS_DESTDIR)
-	tar -C "$(QUICTLS_DESTDIR)" -cjf "$(QUICTLS_ARCHIVE)" "opt"
+	tar -C "$(QUICTLS_DESTDIR)" --owner=root:0 --group=root:0 -czf "$(QUICTLS_ARCHIVE)" "opt"
 
 clean:
 	rm -fv "$(QUICTLS_TARBALL)"

deps/vtest/Makefile

@@ -7,7 +7,7 @@ VTEST_DESTDIR = dist
 all: build $(VTEST_DESTDIR) $(VTEST_DESTDIR)
 
 $(VTEST_TARBALL):
-	curl -sfS -o "$(VTEST_TARBALL)" "$(VTEST_SOURCES)"
+	xbps-fetch -o "$(VTEST_TARBALL)" "$(VTEST_SOURCES)"
 
 $(VTEST_BUILDIR): $(VTEST_TARBALL)
 	@if ! [ -d "$(VTEST_BUILDIR)" ]; then mkdir -v "$(VTEST_BUILDIR)"; fi

haproxy/Makefile

@@ -27,11 +27,9 @@ DEBUG_CFLAGS = -ggdb3 -gdwarf-4
 
 MAKEARGS = DEBUG="-DDEBUG_MEMORY_POOLS -DDEBUG_STRICT" \
            DEBUG_CFLAGS="$(DEBUG_CFLAGS)"\
-           DEFINE="-DMAX_SESS_STKCTR=5" \
            IGNOREGIT=true \
            ADDLIB="-Wl,-rpath,/opt/quictls/lib" \
            TARGET="linux-glibc" \
-           EXTRAVERSION="+mangadex-$(BUILD_VERSION_REPOSHA)" \
            VERDATE="$(shell date -u -I'minutes')" \
            USE_LIBCRYPT=1 \
            USE_LUA=1 \
@@ -54,7 +52,6 @@ MAKEARGS_LINUX = $(MAKEARGS) \
            		 USE_PCRE2_JIT=1 \
            		 USE_STATIC_PCRE2=1 \
 				 USE_NS=1 \
-				 USE_SYSTEMD=1 \
 				 TARGET=linux-glibc
 
 MAKEARGS_DARWIN = $(MAKEARGS) \
@@ -68,7 +65,7 @@ dist-bin: build $(HAPROXY_DESTDIR) $(HAPROXY_ARCHIVE)
 dist-deb: build-deb
 
 $(HAPROXY_TARBALL):
-	curl -sfS -o "$(HAPROXY_TARBALL)" "$(HAPROXY_SOURCES)"
+	xbps-fetch -o "$(HAPROXY_TARBALL)" "$(HAPROXY_SOURCES)"
 
 $(HAPROXY_BUILDIR): $(HAPROXY_TARBALL)
 	@if ! [ -d "$(HAPROXY_BUILDIR)" ]; then mkdir -v "$(HAPROXY_BUILDIR)"; fi
@@ -105,7 +102,7 @@ $(HAPROXY_DESTDIR):
 	$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv
 
 $(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR)
-	tar -C "$(HAPROXY_DESTDIR)" -cjf "$(HAPROXY_ARCHIVE)" "usr"
+	tar -C "$(HAPROXY_DESTDIR)" --owner=root:0 --group=root:0 -czf "$(HAPROXY_ARCHIVE)" "usr"
 
 $(HAPROXY_DEBORIG): $(HAPROXY_TARBALL)
 	cp -fv "$(HAPROXY_TARBALL)" "$(HAPROXY_DEBORIG)"