diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2020-04-02 16:04:19 +0200 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2020-04-02 19:52:06 +0000 |
| commit | 44acde30a7c08ba832c26de941be15cac2195143 (patch) | |
| tree | 8f3b77311274e9d2134b7365b3fc090b8f3915e7 /main/haproxy/APKBUILD | |
| parent | 0054912af32488aecb4ed1256c09bd1ad999d8bc (diff) | |
main/haprox: security upgrade to 2.1.4
Diffstat (limited to 'main/haproxy/APKBUILD')
| -rw-r--r-- | main/haproxy/APKBUILD | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/main/haproxy/APKBUILD b/main/haproxy/APKBUILD index 369ceff9b0a..2e217d7894b 100644 --- a/main/haproxy/APKBUILD +++ b/main/haproxy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jeff Bilyk <jbilyk@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=haproxy -pkgver=2.1.3 +pkgver=2.1.4 _pkgmajorver=${pkgver%.*} pkgrel=0 pkgdesc="A TCP/HTTP reverse proxy for high availability environments" @@ -9,18 +9,19 @@ url="https://www.haproxy.org/" arch="all" license="GPL-2.0-or-later LGPL-2.1-or-later" _luaver="5.3" -options="!check" # FIXME: no idea how to run tests -makedepends="pcre-dev openssl-dev linux-headers lua${_luaver}-dev zlib-dev" +options="!check" # FIXME: depends on vtest +makedepends="pcre-dev openssl-dev linux-headers lua$_luaver-dev zlib-dev" install="haproxy.pre-install haproxy.pre-upgrade" subpackages="$pkgname-doc $pkgname-openrc" -source="https://www.haproxy.org/download/${_pkgmajorver}/src/$pkgname-$pkgver.tar.gz +source="https://www.haproxy.org/download/$_pkgmajorver/src/haproxy-$pkgver.tar.gz haproxy.initd haproxy.cfg" -builddir="$srcdir/$pkgname-$pkgver" +# secfixes: +# 2.1.4-r0: +# - CVE-2020-11100 build() { - cd "$builddir" case "$CARCH" in mips|mipsel*) _carchflags="ADDLIB=-latomic";; esac make \ $_carchflags \ @@ -30,13 +31,16 @@ build() { USE_ZLIB=1 \ USE_LUA=1 \ USE_NS=1 \ - LUA_LIB=/usr/lib/lua${_luaver} \ - LUA_INC=/usr/include/lua${_luaver} \ + LUA_LIB=/usr/lib/lua$_luaver \ + LUA_INC=/usr/include/lua$_luaver \ CFLAGS="$CFLAGS" } +check() { + make reg-tests +} + package() { - cd "$builddir" make install \ DESTDIR="$pkgdir" PREFIX=/usr DOCDIR=/usr/share/doc/haproxy install -d \ @@ -49,6 +53,6 @@ package() { "$pkgdir"/etc/haproxy/haproxy.cfg } -sha512sums="4728c1177b2bba69465cbc56b1ed73a1b2d36891ba2d94d29bb49714ad98ccfac4b52947735aded211f0cd8070002f5406ddd77cabd2f8230b00438189dd7a60 haproxy-2.1.3.tar.gz +sha512sums="fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98 haproxy-2.1.4.tar.gz 3ab277bf77fe864ec6c927118dcd70bdec0eb3c54535812d1c3c0995fa66a3ea91a73c342edeb8944caeb097d2dd1a7761099182df44af5e3ef42de6e2176d26 haproxy.initd 26bc8f8ac504fcbaec113ecbb9bb59b9da47dc8834779ebbb2870a8cadf2ee7561b3a811f01e619358a98c6c7768e8fdd90ab447098c05b82e788c8212c4c41f haproxy.cfg" |