Date: Sunday, September 4, 2022 @ 19:55:27 Author: eworm Revision: 1292890
archrelease: copy trunk to testing-x86_64 Added: haproxy/repos/testing-x86_64/ haproxy/repos/testing-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch (from rev 1292889, haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch) haproxy/repos/testing-x86_64/PKGBUILD (from rev 1292889, haproxy/trunk/PKGBUILD) haproxy/repos/testing-x86_64/haproxy.cfg (from rev 1292889, haproxy/trunk/haproxy.cfg) haproxy/repos/testing-x86_64/haproxy.install (from rev 1292889, haproxy/trunk/haproxy.install) haproxy/repos/testing-x86_64/haproxy.sysusers (from rev 1292889, haproxy/trunk/haproxy.sysusers) -------------------------------------------------------+ 0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch | 39 +++++++ PKGBUILD | 83 ++++++++++++++++ haproxy.cfg | 48 +++++++++ haproxy.install | 8 + haproxy.sysusers | 1 5 files changed, 179 insertions(+) Copied: haproxy/repos/testing-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch (from rev 1292889, haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch) =================================================================== --- testing-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch (rev 0) +++ testing-x86_64/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch 2022-09-04 19:55:27 UTC (rev 1292890) @@ -0,0 +1,39 @@ +diff --git a/admin/iprange/Makefile b/admin/iprange/Makefile +index 13598d8..eb89fb9 100644 +--- a/admin/iprange/Makefile ++++ b/admin/iprange/Makefile +@@ -7,7 +7,7 @@ OBJS = iprange ip6range + all: $(OBJS) + + %: %.c +- $(CC) $(LDFLAGS) $(OPTIMIZE) -o $@ $^ ++ $(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + clean: + rm -f $(OBJS) *.o *.a *~ +diff --git a/dev/poll/Makefile b/dev/poll/Makefile +index fdee514..9be926c 100644 +--- a/dev/poll/Makefile ++++ b/dev/poll/Makefile +@@ -5,7 +5,7 @@ INCLUDE = + OBJS = poll + + poll: poll.c +- $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ ++ $(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) $(DEFINE) $(INCLUDE) -o $@ $^ + + clean: + rm -f $(OBJS) *.[oas] *~ +diff --git a/dev/tcploop/Makefile b/dev/tcploop/Makefile +index 42a6259..e8a6ff7 100644 +--- a/dev/tcploop/Makefile ++++ b/dev/tcploop/Makefile +@@ -5,7 +5,7 @@ INCLUDE = + OBJS = tcploop + + tcploop: tcploop.c +- $(CC) $(OPTIMIZE) $(DEFINE) $(INCLUDE) -o $@ $^ ++ $(CC) $(OPTIMIZE) $(CFLAGS) $(LDFLAGS) $(DEFINE) $(INCLUDE) -o $@ $^ + + clean: + rm -f $(OBJS) *.[oas] *~ Copied: haproxy/repos/testing-x86_64/PKGBUILD (from rev 1292889, haproxy/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2022-09-04 19:55:27 UTC (rev 1292890) @@ -0,0 +1,83 @@ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=haproxy +pkgver=2.6.5 +pkgrel=2 + +pkgdesc='Reliable, high performance TCP/HTTP load balancer' +url='https://www.haproxy.org/' +arch=('x86_64') +license=('GPL') + +depends=('openssl' 'pcre2' 'zlib' 'libxcrypt' 'libcrypt.so' 'lua' 'systemd-libs') +makedepends=('systemd') + +options=('debug') +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-admin.patch) + +sha256sums=('ce9e19ebfcdd43e51af8a6090f1df8d512d972ddf742fa648a643bbb19056605' + 'f6babef513b99a3fa0e50f2b144c73c980f1b78b119874ffa2580af1e651e7a9' + 'b02b4088205039f0979aef0ef3e22957f493dd54eabefaee7011f2d795303b3e' + '8cdbb8be7a712f7b2c7f4823a96d2d2926d96b57632e9669069354d7f2df9fd2') + +prepare() { + cd haproxy-$pkgver + + patch -p1 <"$srcdir"/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch +} + +build() { + cd haproxy-$pkgver + + export CFLAGS="$CFLAGS -fwrapv" + + make \ + CFLAGS="$CFLAGS" \ + LDFLAGS="$LDFLAGS" \ + CPU=generic \ + TARGET=linux-glibc \ + USE_GETADDRINFO=1 \ + USE_LUA=1 \ + USE_OPENSSL=1 \ + USE_PCRE2=1 USE_PCRE2_JIT=1 \ + USE_PROMEX=1 \ + USE_SYSTEMD=1 \ + USE_ZLIB=1 + + make \ + SBINDIR=/usr/bin \ + OPTIMIZE= \ + CFLAGS="$CFLAGS" \ + LDFLAGS="$LDFLAGS" \ + admin/{halog/halog,iprange/ip{,6}range} + make \ + SBINDIR=/usr/bin \ + -C admin/systemd/ +} + +package() { + cd haproxy-$pkgver + make \ + PREFIX="$pkgdir"/usr \ + SBINDIR="$pkgdir"/usr/bin \ + DOCDIR="$pkgdir"/usr/share/$pkgname \ + install + + for admin in admin/{halog/halog,iprange/ip{,6}range}; do + install -D -m0755 $admin "$pkgdir"/usr/bin/$(basename $admin) + done + + install -D -m0644 ../haproxy.sysusers "$pkgdir"/usr/lib/sysusers.d/haproxy.conf + install -D -m0644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg + install -D -m0644 admin/systemd/haproxy.service \ + "$pkgdir"/usr/lib/systemd/system/haproxy.service + cp -r examples "$pkgdir"/usr/share/haproxy/examples +} Copied: haproxy/repos/testing-x86_64/haproxy.cfg (from rev 1292889, haproxy/trunk/haproxy.cfg) =================================================================== --- testing-x86_64/haproxy.cfg (rev 0) +++ testing-x86_64/haproxy.cfg 2022-09-04 19:55:27 UTC (rev 1292890) @@ -0,0 +1,48 @@ +#--------------------------------------------------------------------- +# Example configuration. See the full configuration manual online. +# +# http://www.haproxy.org/download/2.5/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 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/testing-x86_64/haproxy.install (from rev 1292889, haproxy/trunk/haproxy.install) =================================================================== --- testing-x86_64/haproxy.install (rev 0) +++ testing-x86_64/haproxy.install 2022-09-04 19:55:27 UTC (rev 1292890) @@ -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 +} Copied: haproxy/repos/testing-x86_64/haproxy.sysusers (from rev 1292889, haproxy/trunk/haproxy.sysusers) =================================================================== --- testing-x86_64/haproxy.sysusers (rev 0) +++ testing-x86_64/haproxy.sysusers 2022-09-04 19:55:27 UTC (rev 1292890) @@ -0,0 +1 @@ +u haproxy - - -