net-proxy/haproxy: Version bump. Fixes CVE-2019-14241

Package-Manager: Portage-2.3.68, Repoman-2.3.12
Signed-off-by: Christian Ruppert <idl0r@gentoo.org>

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index a0493120fd8cf53d1c83fd1ebb3710a98faa04f0..72118a32cabfec1a5fe202dfb1851ac33df7a6f6 100644 (file)
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,5 +9,5 @@ DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263
 DIST haproxy-1.9.6.tar.gz 2363063 BLAKE2B b3ccf1b7f9d82144b42f2ee5db7b4367a380d3d8d14145ed097b5329831fb9c9454023c04c3e542d9591e377f5f9c4e0630801414ce44b950b99718a971d88af SHA512 3b823005f02d035435838689ddbf50c4fd9fc14af20450c413526cda7a29eb01ee01f68d6867545ebf966235688eedeeb3d00f5e6011727486d53e881d8e73b6
 DIST haproxy-1.9.7.tar.gz 2373430 BLAKE2B 604eb99a15baa885c8956871a418b99a8ad1f6a08a9afb3d9c423ecf1d5dd0ba77e312bb325b09ede6471b1663619b77a2d9c25d66b52274f6c904bf1fa5ca85 SHA512 3a901849fa4db15676e22dd11f8309a810fcfc38519d1e8488c1e3cd8341c82dccbfe3b083c37920a0d04d5c8b7fa7a2f0910e488693c2e8ffda1511a307bc09
 DIST haproxy-1.9.8.tar.gz 2376526 BLAKE2B b9c6a8dba6d5f4697e08eff5d80651b44d9f6e02fa3dd11b9e7fbcd622c8552971eb6f3b12d8cfcbcd075ab62c2b8c0b2f760807a7f5fe5c815c1b9bbf83f254 SHA512 c291bb25cb6163c789963d7e94ac8dd9bc4404f67937f4b2618e38baa1dbb8b6fa5a879a1b4348c86c0f4570e864afe77ec2498aad042bf6ff268c1b8b51780b
-DIST haproxy-2.0.1.tar.gz 2528926 BLAKE2B fc2dff3f62e5c5013804fb4ac2d85a34acf90d3251b645c1f02a50882910fa055e03b2bd211bafe36d9b23d806f13fad7762252e6210322a07ef1f72336c886c SHA512 bcc2c6fa1fe5699f110a2b2ce5abcec7f4ebff94a2850d731f6d86aadeb7f4048b6f372db6724a91191c2ecc2853f5ac576233e0ff84ffef3de6c80d1250f1b6
-DIST haproxy-2.0.2.tar.gz 2532693 BLAKE2B dcdf7900cabf4cd227f2b92d50c20253bc5bd3f9c3a37f78a89288f617c266489cb52eab369cb99e6ec4a79a34ccd7e4a2dd852d61b67ef3187aa3c70631ff67 SHA512 b41b9c0b33b4fdd0ba9e3a7a032e61dc18c046aa0f45bed5704488e0bdaba07a0660850c32720f2a90cc47cbfa8d6917fecdff0dce9f7acc349d184549d6d7a5
+DIST haproxy-1.9.9.tar.gz 2383704 BLAKE2B 1596d6a96ba8d4b61343ede78e39b7a08b34619396a81ebfa44e42df26770ee3d425e8c091918af1471e7687d52b88131cc67f3de2c58af456b619638eb48985 SHA512 96d650097ef4840634987b31df181848e4940fc9a27a1d92f09c9ed304da299811c1b6592cb7e502c500607a7a0450c1fc50831168d44bf14492ed73b6e75ae5
+DIST haproxy-2.0.3.tar.gz 2534678 BLAKE2B 1753c1ac1cabbe50bd8c20a9b95ac317b9f726ae20bd22e402936b5cb4ee69bbe554b85331c8268704a564f437b1990d831a3e21737df2f9b6c709fb58f638ec SHA512 dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c

diff --git a/net-proxy/haproxy/haproxy-2.0.2.ebuild b/net-proxy/haproxy/haproxy-1.9.9.ebuild
similarity index 89%
rename from net-proxy/haproxy/haproxy-2.0.2.ebuild
rename to net-proxy/haproxy/haproxy-1.9.9.ebuild
index 3924975aade709a92e30b593c92effcedeaceb36..ca0db852190fe75e34dbbaacec64dd885f18f42d 100644 (file)
--- a/net-proxy/haproxy/haproxy-2.0.2.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.9.ebuild
@@ -20,8 +20,8 @@ fi
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
        pcre2-jit? ( pcre2 )
        pcre? ( !pcre2 )
@@ -75,7 +75,9 @@ pkg_setup() {
 src_compile() {
        local -a args=(
                V=1
-               TARGET=linux-glibc
+               TARGET=linux2628
+               USE_GETADDRINFO=1
+               USE_TFO=1
        )
 
        # TODO: PCRE2_WIDTH?
@@ -98,12 +100,7 @@ src_compile() {
        # For now, until the strict-aliasing breakage will be fixed
        append-cflags -fno-strict-aliasing
 
-       if use prometheus-exporter; then
-               EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
-       fi
-
-       # HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-       emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" ${args[@]}
+       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
        emake -C contrib/systemd SBINDIR=/usr/sbin
 
        if use tools ; then
@@ -152,12 +149,12 @@ src_install() {
        if use examples ; then
                docinto examples
                dodoc examples/*.cfg
-               dodoc doc/seamless_reload.txt
+               dodoc examples/seamless_reload.txt
        fi
 
        if use vim-syntax ; then
                insinto /usr/share/vim/vimfiles/syntax
-               doins contrib/syntax-highlight/haproxy.vim
+               doins examples/haproxy.vim
        fi
 }
 

diff --git a/net-proxy/haproxy/haproxy-2.0.1.ebuild b/net-proxy/haproxy/haproxy-2.0.3.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.0.1.ebuild
rename to net-proxy/haproxy/haproxy-2.0.3.ebuild