diff options
| author | Nathan Angelacos <nangel@alpinelinux.org> | 2015-02-12 20:12:05 +0000 |
|---|---|---|
| committer | Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> | 2015-02-12 21:23:48 +0100 |
| commit | 4efa724e9e9deb9e9d7578475084729f708422db (patch) | |
| tree | 5d0af0cc1710967975b5ca97abb0773c33601b92 /main/haproxy | |
| parent | 66a49352fb7f5606831129cacabb03eae90b0103 (diff) | |
| download | aports-4efa724e9e9deb9e9d7578475084729f708422db.tar.bz2 aports-4efa724e9e9deb9e9d7578475084729f708422db.tar.xz | |
main/haproxy: version bump to 1.5.11
Note: haproxy now requires openssl as it supports SNI
Diffstat (limited to 'main/haproxy')
| -rw-r--r-- | main/haproxy/APKBUILD | 27 | ||||
| -rw-r--r-- | main/haproxy/haproxy.cfg | 2 | ||||
| -rw-r--r--[l---------] | main/haproxy/haproxy.pre-install | 13 | ||||
| -rw-r--r-- | main/haproxy/haproxy.pre-upgrade | 2 |
4 files changed, 27 insertions, 17 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 77c0341048..35964e47be 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD @@ -1,28 +1,27 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=haproxy -pkgver=1.4.25 +pkgver=1.5.11 pkgrel=0 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" url="http://haproxy.1wt.eu" arch="all" -license="GPL2+" +license="GPL" depends="" -makedepends="pcre-dev" +makedepends="pcre-dev openssl-dev linux-headers" install="haproxy.pre-install haproxy.pre-upgrade" subpackages="$pkgname-doc" -source="http://haproxy.1wt.eu/download/${pkgver%.*}/src/$pkgname-$pkgver.tar.gz +source="http://haproxy.1wt.eu/download/1.5/src/$pkgname-$pkgver.tar.gz haproxy.initd haproxy.cfg" -_builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" - make TARGET=linux2628 USE_PCRE=1 CFLAGS="$CFLAGS" || return 1 + cd "$srcdir/$pkgname-$pkgver" + make TARGET=linux2628 USE_PCRE=1 USE_OPENSSL=1 CFLAGS="$CFLAGS" || return 1 } package() { - cd "$_builddir" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy \ install || return 1 install -d "$pkgdir"/var/lib/haproxy @@ -30,12 +29,12 @@ package() { install -m644 -D "$srcdir"/haproxy.cfg "$pkgdir"/etc/haproxy/haproxy.cfg } -md5sums="74b5ec1f0f9b4d148c8083bcfb512ccd haproxy-1.4.25.tar.gz +md5sums="5500a79d0d2b238d4a1e9749bd0c2cb2 haproxy-1.5.11.tar.gz 81319456a35408bf47443e9c314d2e94 haproxy.initd -1f337186b0e1ba5ee82760cb437fb810 haproxy.cfg" -sha256sums="84408ec1e37bf308c6b45ae3c7e66f2a9d2f762cb689ab6d322c67bba691db62 haproxy-1.4.25.tar.gz +463f00b30bfb002750d5c5549382365f haproxy.cfg" +sha256sums="8b5aa462988405f09c8a6169294b202d7f524a5450a02dd92e7c216680f793bf haproxy-1.5.11.tar.gz d0b91b3566768c40cfeb3b304d66728111d9b97d5c149d88589371c1bc4c6ba0 haproxy.initd -f4bd999341356641fa8520e8ffc4dc6f2c39d93b00d50590745406e9482ecfed haproxy.cfg" -sha512sums="c3424151309be5eea761ff02b29a0e54bd34f5fcb4087e8b99fb2f4cde17bbc3caf07b6cb41ae5a2606325f8a950a06c4683ceb04c05fd6ebf0177326030bca9 haproxy-1.4.25.tar.gz +7e3c03acb9a41e21e21059da609e694e6dd952d9a37297bd39cad37680af213f haproxy.cfg" +sha512sums="10ac569fb06efe158e9ba9e9651f110d86f362d4e9fd032d50ff403b0382825764223dccdac1b5f6ee13e4f6ca63cf92c6d0f4408c1313ac9db07214646a9738 haproxy-1.5.11.tar.gz cb13279374006b1a6302f865f82defbaa6256aed424fb12da53a9459a1a96c6f9470b8156985a177a13bda4a74e7b0cd448666564f6a59cdeb589537580f4b64 haproxy.initd -f11f70b2e45279090783cf1959e26dff7f2d055c052680aea89c2a4c93acdd0f5e39dea7673d811c9209510f26ec413114ec54811cc2a8bdc82dff8a6282e327 haproxy.cfg" +89d1366352af9cc7cb338779341d460606e2e3cfe9e4f7d5169af46680accb07035fab9a4bbb87dfbe383bb146e8e4d1e95a29e3d36ff64e97603a317a0b1b78 haproxy.cfg" diff --git a/main/haproxy/haproxy.cfg b/main/haproxy/haproxy.cfg index 324ad5e229..6f635e821d 100644 --- a/main/haproxy/haproxy.cfg +++ b/main/haproxy/haproxy.cfg @@ -2,7 +2,7 @@ # Example configuration for a possible web application. See the # full configuration options online. # -# http://haproxy.1wt.eu/download/1.4/doc/configuration.txt +# http://haproxy.1wt.eu/download/1.5/doc/configuration.txt # #--------------------------------------------------------------------- diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install index a5f553dcf0..33e0164aff 120000..100644 --- a/main/haproxy/haproxy.pre-install +++ b/main/haproxy/haproxy.pre-install @@ -1 +1,12 @@ -haproxy.pre-upgrade
\ No newline at end of file +#!/bin/sh + +addgroup haproxy 2>/dev/null +adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ + -G haproxy haproxy 2>/dev/null + +# move config to new location +if [ -e /etc/haproxy.cfg ] && ! [ -e /etc/haproxy/haproxy.cfg ]; then + mkdir -p /etc/haproxy + mv /etc/haproxy.cfg /etc/haproxy/haproxy.cfg +fi + diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade index bb1249fc31..33e0164aff 100644 --- a/main/haproxy/haproxy.pre-upgrade +++ b/main/haproxy/haproxy.pre-upgrade @@ -1,7 +1,7 @@ #!/bin/sh addgroup haproxy 2>/dev/null -adduser -S -H -h /var/lib/haproxy -s /sbin/nologin -D \ +adduser -S -H -h /var/lib/haproxy -s /bin/false -D \ -G haproxy haproxy 2>/dev/null # move config to new location |