emo
/
haproxy
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Compare commits

base: emo:7ddc4e4ea908cb29684369923b455499180daee8
Branches Tags
emo:master
...
compare: emo:4693dd47706a3c0a6d3cfd4831e2fb9ca106a796
Branches Tags
emo:master

10 Commits
7ddc4e4ea9 ... 4693dd4770

Author SHA1 Message Date
pepe 4693dd4770 :( 2023-03-09 07:15:16 +00:00
Tristan 10405fcbc2
Update 2.8-dev to 737d10f 2023-03-07 15:20:01 +00:00
Tristan f7ba13a0a5
Upgrade 2.8-dev to ec93721 2023-03-04 15:20:05 +00:00
Tristan c285e57415
Upgrade 2.8-dev to 5faf577 2023-02-18 02:50:52 +00:00
Tristan 372c572025
Upgrade 2.8-dev to c80560b 2023-02-14 16:15:07 +00:00
Tristan 309ccc47af
Upgrade 2.7-stable to 1065b10 2023-02-14 16:14:35 +00:00
Tristan f27bb6ca43
Upgrade 2.8-dev to 25e36bf 2023-02-13 16:37:43 +00:00
Tristan 8913422660
Upgrade 2.7-stable to 687176f 2023-02-13 16:37:26 +00:00
Tristan ab6b7d4df5
Upgrade 2.8-dev to eb3f26d 2023-02-09 13:48:44 +00:00
Tristan b4738e731f
Upgrade 2.7-stable to bb4bacf 2023-02-09 13:09:24 +00:00
3 changed files with 11 additions and 14 deletions
Show Stats Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -33,15 +33,15 @@ variables: &default-variables
.haproxy_stable: &haproxy-stable
HAPROXY_GITREPO: "https://git.haproxy.org/?p=haproxy-2.7.git"
HAPROXY_VERSION: 2.7.2
# https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=739996c80a847cd9572d3a4e4e418a7a38ddc2ff
HAPROXY_GITREF: "739996c80a847cd9572d3a4e4e418a7a38ddc2ff"
HAPROXY_VERSION: 2.7-stable
# https://git.haproxy.org/?p=haproxy-2.7.git;a=commit;h=bb4bacf32db7564e668ccc3aacc6bed8688894ba
HAPROXY_GITREF: "1065b10007f4622f2af70fb114594a63af9c8c76"
.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=b4d119f0c75ce7c5a977ece18dc975e14f9b460c
HAPROXY_GITREF: "d85227fca20a5c793857c1632283ef4a2120285a"
# https://git.haproxy.org/?p=haproxy.git;a=commit;h=737d10fac150ba936e422407916655a8630657a5
HAPROXY_GITREF: "737d10fac150ba936e422407916655a8630657a5"
.build-job: &build-job
image: registry.gitlab.com/mangadex-pub/debuilder/buster:main

6
deps/quictls/Makefile vendored
View File

@ -1,6 +1,6 @@
OPENSSL_VERSION = 1.1.1t
BUILD_VERSION_REPOSHA = $(shell git rev-parse --short HEAD)
QUICTLS_BUILD_VERSION = quic-mangadex-$(BUILD_VERSION_REPOSHA)
QUICTLS_BUILD_VERSION = quic-$(BUILD_VERSION_REPOSHA)
QUICTLS_TAG = OpenSSL_$(subst .,_,$(OPENSSL_VERSION))-quic1
QUICTLS_SOURCES = https://codeload.github.com/quictls/openssl/tar.gz/$(QUICTLS_TAG)
@ -22,7 +22,7 @@ $(QUICTLS_BUILDIR): $(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)" VERSION=$(OPENSSL_VERSION)+quic-$(BUILD_VERSION_REPOSHA)
"$(QUICTLS_BUILDIR)/apps/openssl" version
$(MAKE) buildinfo_$(shell uname -s)
@ -42,7 +42,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)"

9
haproxy/Makefile
View File

@ -1,6 +1,6 @@
HAPROXY_GITREPO = https://git.haproxy.org/?p=haproxy-2.7.git
HAPROXY_VERSION = 2.7.2
HAPROXY_GITREF = 739996c80a847cd9572d3a4e4e418a7a38ddc2ff
HAPROXY_VERSION = 2.7-stable
HAPROXY_GITREF = 1065b10007f4622f2af70fb114594a63af9c8c76
HAPROXY_SHORTSHA = $(shell echo "$(HAPROXY_GITREF)" | grep -Eo '^.{7}' || echo "$(HAPROXY_GITREF)")
HAPROXY_VERSION_MINOR = $(shell echo "$(HAPROXY_VERSION)" | cut -d'.' -f1-2)
@ -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) \
@ -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)"