From 967d2c77f1b9c0df9f0eb53b27f268b380c64677 Mon Sep 17 00:00:00 2001 From: Nathan Date: Fri, 13 May 2022 14:45:10 -0500 Subject: [PATCH] [trunk] -> [community-testing] 'haproxy-2.5.7-1' add --- trunk/PKGBUILD | 6 +- ...LAGS-and-LDFLAGS-when-building-admin.patch | 39 ++++++++++ x86_64/community-testing/PKGBUILD | 77 +++++++++++++++++++ x86_64/community-testing/haproxy.cfg | 48 ++++++++++++ x86_64/community-testing/haproxy.install | 8 ++ x86_64/community-testing/haproxy.sysusers | 1 + 6 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch create mode 100644 x86_64/community-testing/PKGBUILD create mode 100644 x86_64/community-testing/haproxy.cfg create mode 100644 x86_64/community-testing/haproxy.install create mode 100644 x86_64/community-testing/haproxy.sysusers diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD index 7162946..c7ec2cb 100644 --- a/trunk/PKGBUILD +++ b/trunk/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Bartłomiej Piotrowski pkgname=haproxy -pkgver=2.5.6 -pkgrel=2 +pkgver=2.5.7 +pkgrel=1 pkgdesc='Reliable, high performance TCP/HTTP load balancer' url='https://www.haproxy.org/' @@ -23,7 +23,7 @@ source=(https://www.haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz haproxy.sysusers 0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch) -sha256sums=('be4c71753f01af748531139bff3ade5450a328e7a5468c45367e021e91ec6228' +sha256sums=('e29f6334c6bdb521f63ddf335e2621bd2164503b99cf1f495b6f56ff9f3c164e' 'f6babef513b99a3fa0e50f2b144c73c980f1b78b119874ffa2580af1e651e7a9' 'b02b4088205039f0979aef0ef3e22957f493dd54eabefaee7011f2d795303b3e' '8cdbb8be7a712f7b2c7f4823a96d2d2926d96b57632e9669069354d7f2df9fd2') diff --git a/x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch b/x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch new file mode 100644 index 0000000..1422c6b --- /dev/null +++ b/x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch @@ -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] *~ diff --git a/x86_64/community-testing/PKGBUILD b/x86_64/community-testing/PKGBUILD new file mode 100644 index 0000000..c7ec2cb --- /dev/null +++ b/x86_64/community-testing/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: Johannes Löthberg +# Contributor: Bartłomiej Piotrowski + +pkgname=haproxy +pkgver=2.5.7 +pkgrel=1 + +pkgdesc='Reliable, high performance TCP/HTTP load balancer' +url='https://www.haproxy.org/' +arch=('x86_64') +license=('GPL') + +depends=('openssl' 'pcre' '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=('e29f6334c6bdb521f63ddf335e2621bd2164503b99cf1f495b6f56ff9f3c164e' + '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_PCRE=1 USE_PCRE_JIT=1 \ + USE_PROMEX=1 \ + USE_ZLIB=1 + + make \ + SBINDIR=/usr/bin \ + OPTIMIZE= \ + CFLAGS="$CFLAGS" \ + LDFLAGS="$LDFLAGS" \ + admin/{halog/halog,iprange/ip{,6}range} +} + +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 + cp -r examples "$pkgdir"/usr/share/haproxy/examples +} diff --git a/x86_64/community-testing/haproxy.cfg b/x86_64/community-testing/haproxy.cfg new file mode 100644 index 0000000..6d9f706 --- /dev/null +++ b/x86_64/community-testing/haproxy.cfg @@ -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 diff --git a/x86_64/community-testing/haproxy.install b/x86_64/community-testing/haproxy.install new file mode 100644 index 0000000..3e6e2c1 --- /dev/null +++ b/x86_64/community-testing/haproxy.install @@ -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 +} diff --git a/x86_64/community-testing/haproxy.sysusers b/x86_64/community-testing/haproxy.sysusers new file mode 100644 index 0000000..44b13ff --- /dev/null +++ b/x86_64/community-testing/haproxy.sysusers @@ -0,0 +1 @@ +u haproxy - - -