Date: Thursday, July 30, 2020 @ 12:27:00 Author: eworm Revision: 665911
archrelease: copy trunk to community-staging-x86_64 Added: haproxy/repos/community-staging-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch (from rev 665910, haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch) haproxy/repos/community-staging-x86_64/0002-lua-Add-support-for-the-Lua-5.4.patch (from rev 665910, haproxy/trunk/0002-lua-Add-support-for-the-Lua-5.4.patch) haproxy/repos/community-staging-x86_64/PKGBUILD (from rev 665910, haproxy/trunk/PKGBUILD) haproxy/repos/community-staging-x86_64/haproxy.cfg (from rev 665910, haproxy/trunk/haproxy.cfg) haproxy/repos/community-staging-x86_64/haproxy.install (from rev 665910, haproxy/trunk/haproxy.install) haproxy/repos/community-staging-x86_64/haproxy.sysusers (from rev 665910, haproxy/trunk/haproxy.sysusers) Deleted: haproxy/repos/community-staging-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch haproxy/repos/community-staging-x86_64/PKGBUILD haproxy/repos/community-staging-x86_64/haproxy.cfg haproxy/repos/community-staging-x86_64/haproxy.install haproxy/repos/community-staging-x86_64/haproxy.sysusers ---------------------------------------------------------+ 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch | 78 +++---- 0002-lua-Add-support-for-the-Lua-5.4.patch | 69 ++++++ PKGBUILD | 151 ++++++-------- haproxy.cfg | 98 ++++----- haproxy.install | 16 - haproxy.sysusers | 2 6 files changed, 241 insertions(+), 173 deletions(-) Deleted: 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch =================================================================== --- 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch 2020-07-30 12:26:44 UTC (rev 665910) +++ 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch 2020-07-30 12:27:00 UTC (rev 665911) @@ -1,39 +0,0 @@ -diff --git a/contrib/halog/Makefile b/contrib/halog/Makefile -index bf67c1f..e98a3fa 100644 ---- a/contrib/halog/Makefile -+++ b/contrib/halog/Makefile -@@ -16,7 +16,7 @@ DEFINE = - OBJS = halog - - halog: halog.c fgets2.c -- $(CC) $(OPTIMIZE) $(DEFINE) -o $@ $(INCLUDE) $(SRC)/ebtree.c $(SRC)/eb32tree.c $(SRC)/eb64tree.c $(SRC)/ebmbtree.c $(SRC)/ebsttree.c $(SRC)/ebistree.c $(SRC)/ebimtree.c $^ -+ $(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) $(DEFINE) -o $@ $(INCLUDE) $(SRC)/ebtree.c $(SRC)/eb32tree.c $(SRC)/eb64tree.c $(SRC)/ebmbtree.c $(SRC)/ebsttree.c $(SRC)/ebistree.c $(SRC)/ebimtree.c $^ - - clean: - rm -f $(OBJS) *.[oas] -diff --git a/contrib/ip6range/Makefile b/contrib/ip6range/Makefile -index 55849b6..1276b97 100644 ---- a/contrib/ip6range/Makefile -+++ b/contrib/ip6range/Makefile -@@ -7,7 +7,7 @@ OBJS = ip6range - all: $(OBJS) - - %: %.c -- $(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ - - clean: - rm -f $(OBJS) *.o *.a *~ -diff --git a/contrib/iprange/Makefile b/contrib/iprange/Makefile -index b3c72ed..e92baf3 100644 ---- a/contrib/iprange/Makefile -+++ b/contrib/iprange/Makefile -@@ -7,7 +7,7 @@ OBJS = iprange - all: $(OBJS) - - %: %.c -- $(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ - - clean: - rm -f $(OBJS) *.o *.a *~ Copied: haproxy/repos/community-staging-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch (from rev 665910, haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch) =================================================================== --- 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch (rev 0) +++ 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1,39 @@ +diff --git a/contrib/halog/Makefile b/contrib/halog/Makefile +index bf67c1f..e98a3fa 100644 +--- a/contrib/halog/Makefile ++++ b/contrib/halog/Makefile +@@ -16,7 +16,7 @@ DEFINE = + OBJS = halog + + halog: halog.c fgets2.c +- $(CC) $(OPTIMIZE) $(DEFINE) -o $@ $(INCLUDE) $(SRC)/ebtree.c $(SRC)/eb32tree.c $(SRC)/eb64tree.c $(SRC)/ebmbtree.c $(SRC)/ebsttree.c $(SRC)/ebistree.c $(SRC)/ebimtree.c $^ ++ $(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) $(DEFINE) -o $@ $(INCLUDE) $(SRC)/ebtree.c $(SRC)/eb32tree.c $(SRC)/eb64tree.c $(SRC)/ebmbtree.c $(SRC)/ebsttree.c $(SRC)/ebistree.c $(SRC)/ebimtree.c $^ + + clean: + rm -f $(OBJS) *.[oas] +diff --git a/contrib/ip6range/Makefile b/contrib/ip6range/Makefile +index 55849b6..1276b97 100644 +--- a/contrib/ip6range/Makefile ++++ b/contrib/ip6range/Makefile +@@ -7,7 +7,7 @@ OBJS = ip6range + all: $(OBJS) + + %: %.c +- $(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ + + clean: + rm -f $(OBJS) *.o *.a *~ +diff --git a/contrib/iprange/Makefile b/contrib/iprange/Makefile +index b3c72ed..e92baf3 100644 +--- a/contrib/iprange/Makefile ++++ b/contrib/iprange/Makefile +@@ -7,7 +7,7 @@ OBJS = iprange + all: $(OBJS) + + %: %.c +- $(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ + + clean: + rm -f $(OBJS) *.o *.a *~ Copied: haproxy/repos/community-staging-x86_64/0002-lua-Add-support-for-the-Lua-5.4.patch (from rev 665910, haproxy/trunk/0002-lua-Add-support-for-the-Lua-5.4.patch) =================================================================== --- 0002-lua-Add-support-for-the-Lua-5.4.patch (rev 0) +++ 0002-lua-Add-support-for-the-Lua-5.4.patch 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1,69 @@ +From dc2e6f544fee393543cdeaae7bbb4fe57d49b409 Mon Sep 17 00:00:00 2001 +From: Christopher Faulet <cfau...@haproxy.com> +Date: Tue, 28 Jul 2020 10:33:25 +0200 +Subject: MEDIUM: lua: Add support for the Lua 5.4 + +On Lua 5.4, some API changes make HAProxy compilation to fail. Among other +things, the lua_resume() function has changed and now takes an extra argument in +Lua 5.4 and the error LUA_ERRGCMM was removed. Thus the LUA_VERSION_NUM macro is +now tested to know the lua version is used and adapt the code accordingly. + +Here are listed the incompatibilities with the previous Lua versions : + + http://www.lua.org/manual/5.4/manual.html#8 + +This patch comes from the HAproxy's fedora RPM, committed by Tom Callaway : + + https://src.fedoraproject.org/rpms/haproxy/blob/db970613/f/haproxy-2.2.0-lua-5.4.patch + +This patch should fix the issue #730. It must be backported to 2.2 and probably +as far as 2.0. + +(cherry picked from commit 08ed98fd7963968de49593304fdd9234812845a4) +Signed-off-by: Christopher Faulet <cfau...@haproxy.com> +--- + src/hlua.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/hlua.c b/src/hlua.c +index af0aeda06..b2134fe6e 100644 +--- a/src/hlua.c ++++ b/src/hlua.c +@@ -1069,6 +1069,9 @@ void hlua_hook(lua_State *L, lua_Debug *ar) + */ + static enum hlua_exec hlua_ctx_resume(struct hlua *lua, int yield_allowed) + { ++#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 ++ int nres; ++#endif + int ret; + const char *msg; + const char *trace; +@@ -1100,7 +1103,11 @@ resume_execution: + lua->wake_time = TICK_ETERNITY; + + /* Call the function. */ ++#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 ++ ret = lua_resume(lua->T, gL.T, lua->nargs, &nres); ++#else + ret = lua_resume(lua->T, gL.T, lua->nargs); ++#endif + switch (ret) { + + case LUA_OK: +@@ -7845,10 +7852,12 @@ static int hlua_load(char **args, int section_type, struct proxy *curpx, + memprintf(err, "Lua message handler error: %s\n", lua_tostring(gL.T, -1)); + lua_pop(gL.T, 1); + return -1; ++#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 503 + case LUA_ERRGCMM: + memprintf(err, "Lua garbage collector error: %s\n", lua_tostring(gL.T, -1)); + lua_pop(gL.T, 1); + return -1; ++#endif + default: + memprintf(err, "Lua unknown error: %s\n", lua_tostring(gL.T, -1)); + lua_pop(gL.T, 1); +-- +cgit v1.2.3 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-07-30 12:26:44 UTC (rev 665910) +++ PKGBUILD 2020-07-30 12:27:00 UTC (rev 665911) @@ -1,76 +0,0 @@ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -pkgname=haproxy -pkgver=2.2.1 -pkgrel=2 - -pkgdesc='Reliable, high performance TCP/HTTP load balancer' -url='https://www.haproxy.org/' -arch=('x86_64') -license=('GPL') - -# TODO: switch to lua 5.4 when possible -# Function lua_resume() earned a new argument, requires haproxy to be updated. -# https://github.com/haproxy/haproxy/issues/730 - -depends=('openssl' 'pcre' 'zlib' 'lua53' 'systemd-libs') -makedepends=('systemd') - -backup=('etc/haproxy/haproxy.cfg') - -install=haproxy.install - -source=(https://www.haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz - haproxy.cfg - haproxy.sysusers - 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch) - -sha256sums=('536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124' - 'e88edeb2fe23508565e46ff485c93cfb7c2e9c64f231538452ec7ecd7ec37a42' - 'b02b4088205039f0979aef0ef3e22957f493dd54eabefaee7011f2d795303b3e' - '81c03ef5d69f4f2ef2c7caa6722c82cda4a53b65f788a46e668ec2faa3abd8f5') - -prepare() { - cd haproxy-$pkgver - - patch -p1 <"$srcdir"/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch -} - -build() { - cd haproxy-$pkgver - - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ - CPU=generic \ - TARGET=linux-glibc \ - USE_GETADDRINFO=1 \ - USE_OPENSSL=1 \ - USE_PCRE=1 USE_PCRE_JIT=1 \ - USE_ZLIB=1 \ - USE_LUA=1 \ - USE_SYSTEMD=1 \ - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" - - for contrib in halog iprange ip6range systemd; do - make -C contrib/$contrib SBINDIR=/usr/bin OPTIMIZE= CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - done -} - -package() { - cd haproxy-$pkgver - make \ - PREFIX="$pkgdir"/usr \ - SBINDIR="$pkgdir"/usr/bin \ - DOCDIR="$pkgdir"/usr/share/$pkgname \ - install - - for contrib in halog iprange ip6range; do - install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib - done - - install -Dm644 ../haproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/haproxy.conf - install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg - install -Dm644 contrib/systemd/haproxy.service \ - "$pkgdir"/usr/lib/systemd/system/haproxy.service - cp -r examples "$pkgdir"/usr/share/haproxy/examples -} Copied: haproxy/repos/community-staging-x86_64/PKGBUILD (from rev 665910, haproxy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1,75 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=haproxy +pkgver=2.2.1 +pkgrel=3 + +pkgdesc='Reliable, high performance TCP/HTTP load balancer' +url='https://www.haproxy.org/' +arch=('x86_64') +license=('GPL') + +depends=('openssl' 'pcre' 'zlib' 'lua' 'systemd-libs') +makedepends=('systemd') + +backup=('etc/haproxy/haproxy.cfg') + +install=haproxy.install + +source=(https://www.haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz + haproxy.cfg + haproxy.sysusers + 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch + 0002-lua-Add-support-for-the-Lua-5.4.patch) + +sha256sums=('536552af1316807c01de727ad3dac84b3a2f5285db32e9bfdfe234e47ff9d124' + 'e88edeb2fe23508565e46ff485c93cfb7c2e9c64f231538452ec7ecd7ec37a42' + 'b02b4088205039f0979aef0ef3e22957f493dd54eabefaee7011f2d795303b3e' + '81c03ef5d69f4f2ef2c7caa6722c82cda4a53b65f788a46e668ec2faa3abd8f5' + '0efa758f64352dd2ced88227a6447cec25ec564c4d3be1cc954d760e61ef064a') + +prepare() { + cd haproxy-$pkgver + + patch -p1 <"$srcdir"/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch + patch -p1 <"$srcdir"/0002-lua-Add-support-for-the-Lua-5.4.patch +} + +build() { + cd haproxy-$pkgver + + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + CPU=generic \ + TARGET=linux-glibc \ + USE_GETADDRINFO=1 \ + USE_OPENSSL=1 \ + USE_PCRE=1 USE_PCRE_JIT=1 \ + USE_ZLIB=1 \ + USE_LUA=1 \ + USE_SYSTEMD=1 \ + EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" + + for contrib in halog iprange ip6range systemd; do + make -C contrib/$contrib SBINDIR=/usr/bin OPTIMIZE= CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" + done +} + +package() { + cd haproxy-$pkgver + make \ + PREFIX="$pkgdir"/usr \ + SBINDIR="$pkgdir"/usr/bin \ + DOCDIR="$pkgdir"/usr/share/$pkgname \ + install + + for contrib in halog iprange ip6range; do + install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib + done + + install -Dm644 ../haproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/haproxy.conf + install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg + install -Dm644 contrib/systemd/haproxy.service \ + "$pkgdir"/usr/lib/systemd/system/haproxy.service + cp -r examples "$pkgdir"/usr/share/haproxy/examples +} Deleted: haproxy.cfg =================================================================== --- haproxy.cfg 2020-07-30 12:26:44 UTC (rev 665910) +++ haproxy.cfg 2020-07-30 12:27:00 UTC (rev 665911) @@ -1,49 +0,0 @@ -#--------------------------------------------------------------------- -# Example configuration. See the full configuration manual online. -# -# http://www.haproxy.org/download/1.7/doc/configuration.txt -# -#--------------------------------------------------------------------- - -global - maxconn 20000 - log 127.0.0.1 local0 - user haproxy - chroot /usr/share/haproxy - pidfile /run/haproxy.pid - daemon - -frontend main - bind :5000 - mode http - log global - option httplog - option dontlognull - option http_proxy - option forwardfor except 127.0.0.0/8 - maxconn 8000 - timeout client 30s - - acl url_static path_beg -i /static /images /javascript /stylesheets - acl url_static path_end -i .jpg .gif .png .css .js - - use_backend static if url_static - default_backend app - -backend static - mode http - balance roundrobin - timeout connect 5s - timeout server 5s - server static 127.0.0.1:4331 check - -backend app - mode http - balance roundrobin - timeout connect 5s - timeout server 30s - timeout queue 30s - server app1 127.0.0.1:5001 check - server app2 127.0.0.1:5002 check - server app3 127.0.0.1:5003 check - server app4 127.0.0.1:5004 check Copied: haproxy/repos/community-staging-x86_64/haproxy.cfg (from rev 665910, haproxy/trunk/haproxy.cfg) =================================================================== --- haproxy.cfg (rev 0) +++ haproxy.cfg 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1,49 @@ +#--------------------------------------------------------------------- +# Example configuration. See the full configuration manual online. +# +# http://www.haproxy.org/download/1.7/doc/configuration.txt +# +#--------------------------------------------------------------------- + +global + maxconn 20000 + log 127.0.0.1 local0 + user haproxy + chroot /usr/share/haproxy + pidfile /run/haproxy.pid + daemon + +frontend main + bind :5000 + mode http + log global + option httplog + option dontlognull + option http_proxy + option forwardfor except 127.0.0.0/8 + maxconn 8000 + timeout client 30s + + acl url_static path_beg -i /static /images /javascript /stylesheets + acl url_static path_end -i .jpg .gif .png .css .js + + use_backend static if url_static + default_backend app + +backend static + mode http + balance roundrobin + timeout connect 5s + timeout server 5s + server static 127.0.0.1:4331 check + +backend app + mode http + balance roundrobin + timeout connect 5s + timeout server 30s + timeout queue 30s + server app1 127.0.0.1:5001 check + server app2 127.0.0.1:5002 check + server app3 127.0.0.1:5003 check + server app4 127.0.0.1:5004 check Deleted: haproxy.install =================================================================== --- haproxy.install 2020-07-30 12:26:44 UTC (rev 665910) +++ haproxy.install 2020-07-30 12:27:00 UTC (rev 665911) @@ -1,8 +0,0 @@ -post_install() { - printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work." - printf ' %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot." -} - -post_upgrade() { - post_install $1 -} Copied: haproxy/repos/community-staging-x86_64/haproxy.install (from rev 665910, haproxy/trunk/haproxy.install) =================================================================== --- haproxy.install (rev 0) +++ haproxy.install 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1,8 @@ +post_install() { + printf '==> %s\n' "The example config chroots HAProxy, meaning that logging to journald won't work." + printf ' %s\n' "Either disable chrooting, use rsyslog, or bind /run/systemd/journal/dev-log into the chroot." +} + +post_upgrade() { + post_install $1 +} Deleted: haproxy.sysusers =================================================================== --- haproxy.sysusers 2020-07-30 12:26:44 UTC (rev 665910) +++ haproxy.sysusers 2020-07-30 12:27:00 UTC (rev 665911) @@ -1 +0,0 @@ -u haproxy - - - Copied: haproxy/repos/community-staging-x86_64/haproxy.sysusers (from rev 665910, haproxy/trunk/haproxy.sysusers) =================================================================== --- haproxy.sysusers (rev 0) +++ haproxy.sysusers 2020-07-30 12:27:00 UTC (rev 665911) @@ -0,0 +1 @@ +u haproxy - - -