[arch-commits] Commit in haproxy/repos/community-staging-x86_64 (10 files)
Christian Hesse
eworm at archlinux.org
Fri Jul 17 12:41:22 UTC 2020
Date: Friday, July 17, 2020 @ 12:41:21
Author: eworm
Revision: 664277
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 664276, haproxy/trunk/0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch)
haproxy/repos/community-staging-x86_64/PKGBUILD
(from rev 664276, haproxy/trunk/PKGBUILD)
haproxy/repos/community-staging-x86_64/haproxy.cfg
(from rev 664276, haproxy/trunk/haproxy.cfg)
haproxy/repos/community-staging-x86_64/haproxy.install
(from rev 664276, haproxy/trunk/haproxy.install)
haproxy/repos/community-staging-x86_64/haproxy.sysusers
(from rev 664276, 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 +++----
PKGBUILD | 151 +++++++-------
haproxy.cfg | 98 ++++-----
haproxy.install | 16 -
haproxy.sysusers | 2
5 files changed, 173 insertions(+), 172 deletions(-)
Deleted: 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch
===================================================================
--- 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch 2020-07-17 12:41:18 UTC (rev 664276)
+++ 0001-Use-CFLAGS-and-LDFLAGS-when-building-contrib.patch 2020-07-17 12:41:21 UTC (rev 664277)
@@ -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 664276, 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-17 12:41:21 UTC (rev 664277)
@@ -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 *~
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-07-17 12:41:18 UTC (rev 664276)
+++ PKGBUILD 2020-07-17 12:41:21 UTC (rev 664277)
@@ -1,75 +0,0 @@
-# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-pkgname=haproxy
-pkgver=2.2.0
-pkgrel=1
-
-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.
-
-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=('3c1a87160eea40e067f1e2813bfe692280a10c455beb17a8ee7fae11e4223274'
- '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 664276, haproxy/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-07-17 12:41:21 UTC (rev 664277)
@@ -0,0 +1,76 @@
+# Maintainer: Johannes Löthberg <johannes at kyriasis.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+pkgname=haproxy
+pkgver=2.2.0
+pkgrel=3
+
+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=('3c1a87160eea40e067f1e2813bfe692280a10c455beb17a8ee7fae11e4223274'
+ '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
+}
Deleted: haproxy.cfg
===================================================================
--- haproxy.cfg 2020-07-17 12:41:18 UTC (rev 664276)
+++ haproxy.cfg 2020-07-17 12:41:21 UTC (rev 664277)
@@ -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 664276, haproxy/trunk/haproxy.cfg)
===================================================================
--- haproxy.cfg (rev 0)
+++ haproxy.cfg 2020-07-17 12:41:21 UTC (rev 664277)
@@ -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-17 12:41:18 UTC (rev 664276)
+++ haproxy.install 2020-07-17 12:41:21 UTC (rev 664277)
@@ -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 664276, haproxy/trunk/haproxy.install)
===================================================================
--- haproxy.install (rev 0)
+++ haproxy.install 2020-07-17 12:41:21 UTC (rev 664277)
@@ -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-17 12:41:18 UTC (rev 664276)
+++ haproxy.sysusers 2020-07-17 12:41:21 UTC (rev 664277)
@@ -1 +0,0 @@
-u haproxy - - -
Copied: haproxy/repos/community-staging-x86_64/haproxy.sysusers (from rev 664276, haproxy/trunk/haproxy.sysusers)
===================================================================
--- haproxy.sysusers (rev 0)
+++ haproxy.sysusers 2020-07-17 12:41:21 UTC (rev 664277)
@@ -0,0 +1 @@
+u haproxy - - -
More information about the arch-commits
mailing list