Date: Tuesday, May 10, 2016 @ 19:27:53 Author: demize Revision: 174586
archrelease: copy trunk to community-i686, community-x86_64 Added: haproxy/repos/community-i686/PKGBUILD (from rev 174585, haproxy/trunk/PKGBUILD) haproxy/repos/community-i686/haproxy.cfg (from rev 174585, haproxy/trunk/haproxy.cfg) haproxy/repos/community-i686/haproxy.install (from rev 174585, haproxy/trunk/haproxy.install) haproxy/repos/community-x86_64/PKGBUILD (from rev 174585, haproxy/trunk/PKGBUILD) haproxy/repos/community-x86_64/haproxy.cfg (from rev 174585, haproxy/trunk/haproxy.cfg) haproxy/repos/community-x86_64/haproxy.install (from rev 174585, haproxy/trunk/haproxy.install) Deleted: haproxy/repos/community-i686/PKGBUILD haproxy/repos/community-i686/haproxy.cfg haproxy/repos/community-i686/haproxy.install haproxy/repos/community-x86_64/PKGBUILD haproxy/repos/community-x86_64/haproxy.cfg haproxy/repos/community-x86_64/haproxy.install ----------------------------------+ /PKGBUILD | 138 +++++++++++++++++++++++++++++++++++++ /haproxy.cfg | 98 ++++++++++++++++++++++++++ /haproxy.install | 8 ++ community-i686/PKGBUILD | 63 ---------------- community-i686/haproxy.cfg | 49 ------------- community-i686/haproxy.install | 4 - community-x86_64/PKGBUILD | 63 ---------------- community-x86_64/haproxy.cfg | 49 ------------- community-x86_64/haproxy.install | 4 - 9 files changed, 244 insertions(+), 232 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-05-10 17:27:42 UTC (rev 174585) +++ community-i686/PKGBUILD 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -pkgname=haproxy -pkgver=1.6.4 -pkgrel=2 -pkgdesc='Reliable, high performance TCP/HTTP load balancer' -arch=('i686' 'x86_64') -url='http://haproxy.org/' -license=('GPL') -depends=('openssl' 'pcre' 'zlib' 'lua') -backup=('etc/haproxy/haproxy.cfg') -install=haproxy.install -source=(http://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz - haproxy.cfg) -md5sums=('ee107312ef58432859ee12bf048025ab' - '02241a8ca257d12f7eb131e2d7da3f3b') - -prepare() { - cd haproxy-$pkgver - sed -i 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c -} - -build() { - cd haproxy-$pkgver - make CPU=generic TARGET=linux2628 \ - USE_GETADDRINFO=1 \ - USE_OPENSSL=1 \ - USE_PCRE=1 USE_PCRE_JIT=1 \ - USE_ZLIB=1 \ - USE_LUA=1 - - for contrib in halog iprange systemd; do - make -C contrib/$contrib SBINDIR=/usr/bin - done -} - -package() { - cd haproxy-$pkgver - make \ - EXTRA=haproxy-systemd-wrapper \ - PREFIX="$pkgdir"/usr \ - SBINDIR="$pkgdir"/usr/bin \ - DOCDIR="$pkgdir"/usr/share/$pkgname \ - install - - for contrib in halog iprange; do - install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib - done - - install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg - install -Dm644 contrib/systemd/haproxy.service \ - "$pkgdir"/usr/lib/systemd/system/haproxy.service - - install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles - install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/ - install -m644 examples/errorfiles/*.http \ - "$pkgdir"/usr/share/haproxy/examples/errorfiles/ - - install -Dm644 examples/haproxy.vim \ - "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim -} Copied: haproxy/repos/community-i686/PKGBUILD (from rev 174585, haproxy/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=haproxy +pkgver=1.6.5 +pkgrel=1 + +pkgdesc='Reliable, high performance TCP/HTTP load balancer' +url='http://haproxy.org/' +arch=('i686' 'x86_64') +license=('GPL') + +depends=('openssl' 'pcre' 'zlib' 'lua') + +backup=('etc/haproxy/haproxy.cfg') + +install=haproxy.install + +source=(http://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz + haproxy.cfg) + +md5sums=('5290f278c04e682e42ab71fed26fc082' + '02241a8ca257d12f7eb131e2d7da3f3b') + +prepare() { + cd haproxy-$pkgver + sed -i 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c +} + +build() { + cd haproxy-$pkgver + make CPU=generic TARGET=linux2628 \ + USE_GETADDRINFO=1 \ + USE_OPENSSL=1 \ + USE_PCRE=1 USE_PCRE_JIT=1 \ + USE_ZLIB=1 \ + USE_LUA=1 + + for contrib in halog iprange systemd; do + make -C contrib/$contrib SBINDIR=/usr/bin + done +} + +package() { + cd haproxy-$pkgver + make \ + EXTRA=haproxy-systemd-wrapper \ + PREFIX="$pkgdir"/usr \ + SBINDIR="$pkgdir"/usr/bin \ + DOCDIR="$pkgdir"/usr/share/$pkgname \ + install + + for contrib in halog iprange; do + install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib + done + + install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg + install -Dm644 contrib/systemd/haproxy.service \ + "$pkgdir"/usr/lib/systemd/system/haproxy.service + + install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles + install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/ + install -m644 examples/errorfiles/*.http \ + "$pkgdir"/usr/share/haproxy/examples/errorfiles/ + + install -Dm644 examples/haproxy.vim \ + "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim +} Deleted: community-i686/haproxy.cfg =================================================================== --- community-i686/haproxy.cfg 2016-05-10 17:27:42 UTC (rev 174585) +++ community-i686/haproxy.cfg 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,49 +0,0 @@ -#--------------------------------------------------------------------- -# Example configuration. See the full configuration manual online. -# -# http://www.haproxy.org/download/1.6/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-i686/haproxy.cfg (from rev 174585, haproxy/trunk/haproxy.cfg) =================================================================== --- community-i686/haproxy.cfg (rev 0) +++ community-i686/haproxy.cfg 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,49 @@ +#--------------------------------------------------------------------- +# Example configuration. See the full configuration manual online. +# +# http://www.haproxy.org/download/1.6/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: community-i686/haproxy.install =================================================================== --- community-i686/haproxy.install 2016-05-10 17:27:42 UTC (rev 174585) +++ community-i686/haproxy.install 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,4 +0,0 @@ -post_install() { - getent passwd haproxy >/dev/null || useradd -r -M -d / \ - -s /usr/bin/nologin haproxy >/dev/null -} Copied: haproxy/repos/community-i686/haproxy.install (from rev 174585, haproxy/trunk/haproxy.install) =================================================================== --- community-i686/haproxy.install (rev 0) +++ community-i686/haproxy.install 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,4 @@ +post_install() { + getent passwd haproxy >/dev/null || useradd -r -M -d / \ + -s /usr/bin/nologin haproxy >/dev/null +} Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-05-10 17:27:42 UTC (rev 174585) +++ community-x86_64/PKGBUILD 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,63 +0,0 @@ -# $Id$ -# Maintainer: Johannes Löthberg <johan...@kyriasis.com> -# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> - -pkgname=haproxy -pkgver=1.6.4 -pkgrel=2 -pkgdesc='Reliable, high performance TCP/HTTP load balancer' -arch=('i686' 'x86_64') -url='http://haproxy.org/' -license=('GPL') -depends=('openssl' 'pcre' 'zlib' 'lua') -backup=('etc/haproxy/haproxy.cfg') -install=haproxy.install -source=(http://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz - haproxy.cfg) -md5sums=('ee107312ef58432859ee12bf048025ab' - '02241a8ca257d12f7eb131e2d7da3f3b') - -prepare() { - cd haproxy-$pkgver - sed -i 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c -} - -build() { - cd haproxy-$pkgver - make CPU=generic TARGET=linux2628 \ - USE_GETADDRINFO=1 \ - USE_OPENSSL=1 \ - USE_PCRE=1 USE_PCRE_JIT=1 \ - USE_ZLIB=1 \ - USE_LUA=1 - - for contrib in halog iprange systemd; do - make -C contrib/$contrib SBINDIR=/usr/bin - done -} - -package() { - cd haproxy-$pkgver - make \ - EXTRA=haproxy-systemd-wrapper \ - PREFIX="$pkgdir"/usr \ - SBINDIR="$pkgdir"/usr/bin \ - DOCDIR="$pkgdir"/usr/share/$pkgname \ - install - - for contrib in halog iprange; do - install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib - done - - install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg - install -Dm644 contrib/systemd/haproxy.service \ - "$pkgdir"/usr/lib/systemd/system/haproxy.service - - install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles - install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/ - install -m644 examples/errorfiles/*.http \ - "$pkgdir"/usr/share/haproxy/examples/errorfiles/ - - install -Dm644 examples/haproxy.vim \ - "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim -} Copied: haproxy/repos/community-x86_64/PKGBUILD (from rev 174585, haproxy/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,69 @@ +# $Id$ +# Maintainer: Johannes Löthberg <johan...@kyriasis.com> +# Contributor: Bartłomiej Piotrowski <bpiotrow...@archlinux.org> + +pkgname=haproxy +pkgver=1.6.5 +pkgrel=1 + +pkgdesc='Reliable, high performance TCP/HTTP load balancer' +url='http://haproxy.org/' +arch=('i686' 'x86_64') +license=('GPL') + +depends=('openssl' 'pcre' 'zlib' 'lua') + +backup=('etc/haproxy/haproxy.cfg') + +install=haproxy.install + +source=(http://haproxy.org/download/${pkgver%.*}/src/haproxy-$pkgver.tar.gz + haproxy.cfg) + +md5sums=('5290f278c04e682e42ab71fed26fc082' + '02241a8ca257d12f7eb131e2d7da3f3b') + +prepare() { + cd haproxy-$pkgver + sed -i 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c +} + +build() { + cd haproxy-$pkgver + make CPU=generic TARGET=linux2628 \ + USE_GETADDRINFO=1 \ + USE_OPENSSL=1 \ + USE_PCRE=1 USE_PCRE_JIT=1 \ + USE_ZLIB=1 \ + USE_LUA=1 + + for contrib in halog iprange systemd; do + make -C contrib/$contrib SBINDIR=/usr/bin + done +} + +package() { + cd haproxy-$pkgver + make \ + EXTRA=haproxy-systemd-wrapper \ + PREFIX="$pkgdir"/usr \ + SBINDIR="$pkgdir"/usr/bin \ + DOCDIR="$pkgdir"/usr/share/$pkgname \ + install + + for contrib in halog iprange; do + install -Dm755 contrib/$contrib/$contrib "$pkgdir"/usr/bin/$contrib + done + + install -Dm644 ../haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg + install -Dm644 contrib/systemd/haproxy.service \ + "$pkgdir"/usr/lib/systemd/system/haproxy.service + + install -d "$pkgdir"/usr/share/haproxy/examples/errorfiles + install -m644 examples/*.cfg "$pkgdir"/usr/share/haproxy/examples/ + install -m644 examples/errorfiles/*.http \ + "$pkgdir"/usr/share/haproxy/examples/errorfiles/ + + install -Dm644 examples/haproxy.vim \ + "$pkgdir"/usr/share/vim/vimfiles/syntax/haproxy.vim +} Deleted: community-x86_64/haproxy.cfg =================================================================== --- community-x86_64/haproxy.cfg 2016-05-10 17:27:42 UTC (rev 174585) +++ community-x86_64/haproxy.cfg 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,49 +0,0 @@ -#--------------------------------------------------------------------- -# Example configuration. See the full configuration manual online. -# -# http://www.haproxy.org/download/1.6/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-x86_64/haproxy.cfg (from rev 174585, haproxy/trunk/haproxy.cfg) =================================================================== --- community-x86_64/haproxy.cfg (rev 0) +++ community-x86_64/haproxy.cfg 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,49 @@ +#--------------------------------------------------------------------- +# Example configuration. See the full configuration manual online. +# +# http://www.haproxy.org/download/1.6/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: community-x86_64/haproxy.install =================================================================== --- community-x86_64/haproxy.install 2016-05-10 17:27:42 UTC (rev 174585) +++ community-x86_64/haproxy.install 2016-05-10 17:27:53 UTC (rev 174586) @@ -1,4 +0,0 @@ -post_install() { - getent passwd haproxy >/dev/null || useradd -r -M -d / \ - -s /usr/bin/nologin haproxy >/dev/null -} Copied: haproxy/repos/community-x86_64/haproxy.install (from rev 174585, haproxy/trunk/haproxy.install) =================================================================== --- community-x86_64/haproxy.install (rev 0) +++ community-x86_64/haproxy.install 2016-05-10 17:27:53 UTC (rev 174586) @@ -0,0 +1,4 @@ +post_install() { + getent passwd haproxy >/dev/null || useradd -r -M -d / \ + -s /usr/bin/nologin haproxy >/dev/null +}