Browse Source

[community-testing] -> [community] 'haproxy-2.5.6-2' move

master
artoo 2 months ago
parent
commit
09afc325f3
  1. 39
      x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch
  2. 77
      x86_64/community-testing/PKGBUILD
  3. 48
      x86_64/community-testing/haproxy.cfg
  4. 8
      x86_64/community-testing/haproxy.install
  5. 1
      x86_64/community-testing/haproxy.sysusers
  6. 12
      x86_64/community/PKGBUILD
  7. 3
      x86_64/community/haproxy.cfg

39
x86_64/community-testing/0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch

@ -1,39 +0,0 @@
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] *~

77
x86_64/community-testing/PKGBUILD

@ -1,77 +0,0 @@
# Maintainer: Johannes Löthberg <johannes@kyriasis.com>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=haproxy
pkgver=2.5.6
pkgrel=2
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=('be4c71753f01af748531139bff3ade5450a328e7a5468c45367e021e91ec6228'
'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
}

48
x86_64/community-testing/haproxy.cfg

@ -1,48 +0,0 @@
#---------------------------------------------------------------------
# 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

8
x86_64/community-testing/haproxy.install

@ -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
}

1
x86_64/community-testing/haproxy.sysusers

@ -1 +0,0 @@
u haproxy - - -

12
x86_64/community/PKGBUILD

@ -2,16 +2,18 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=haproxy
pkgver=2.5.5
pkgrel=1
pkgver=2.5.6
pkgrel=2
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')
depends=('openssl' 'pcre' 'zlib' 'libxcrypt' 'libcrypt.so' 'lua' 'systemd-libs')
makedepends=('systemd')
options=('debug')
backup=('etc/haproxy/haproxy.cfg')
install=haproxy.install
@ -21,8 +23,8 @@ source=(https://www.haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz
haproxy.sysusers
0001-Use-CFLAGS-and-LDFLAGS-when-building-admin.patch)
sha256sums=('063c4845cdb2d76f292ef44d9c0117a853d8d10ae5d9615b406b14a4d74fe4b9'
'e88edeb2fe23508565e46ff485c93cfb7c2e9c64f231538452ec7ecd7ec37a42'
sha256sums=('be4c71753f01af748531139bff3ade5450a328e7a5468c45367e021e91ec6228'
'f6babef513b99a3fa0e50f2b144c73c980f1b78b119874ffa2580af1e651e7a9'
'b02b4088205039f0979aef0ef3e22957f493dd54eabefaee7011f2d795303b3e'
'8cdbb8be7a712f7b2c7f4823a96d2d2926d96b57632e9669069354d7f2df9fd2')

3
x86_64/community/haproxy.cfg

@ -1,7 +1,7 @@
#---------------------------------------------------------------------
# Example configuration. See the full configuration manual online.
#
# http://www.haproxy.org/download/1.7/doc/configuration.txt
# http://www.haproxy.org/download/2.5/doc/configuration.txt
#
#---------------------------------------------------------------------
@ -19,7 +19,6 @@ frontend main
log global
option httplog
option dontlognull
option http_proxy
option forwardfor except 127.0.0.0/8
maxconn 8000
timeout client 30s

Loading…
Cancel
Save