net-proxy/haproxy: Cleanup and version bumps

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

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 72118a32cabfec1a5fe202dfb1851ac33df7a6f6..e09019fd8c4771093d9dd3dd52124a7c3e34152f 100644 (file)
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,8 +6,7 @@ DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b6
 DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
 DIST haproxy-1.8.20.tar.gz 2083917 BLAKE2B a73e01bacd6c3d256f92bba3dc5f1d38feea686d92d9ba2d93c33c082b10f84e0f150b3ce3e98cddaa664443c3661220f2993fea2d52bc3d6c32d5c913e70471 SHA512 c288ccf223da71a29ae0f08f3c9753002735816229ea83ca497d46c860fb8a4bd422077a94652aa475e48aefb78787979cdce7f1bd0b5919dc671ba25212c133
 DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
-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-1.9.10.tar.gz 2386066 BLAKE2B 4dea3f42686cd41d9f6f6849c42f9cf604b26f33925747ec5311243117bcf51729d16e5c09c5eb2cfc9fea88cf49c976a0542dcd90ddee4016b467de699e8bdc SHA512 b204c91633949d20dd06c29c69d2c783134819493f132430aaedddd2aad74eac08da7de7ddc1c45b250446273c35b268ab37fcb3b98eaa6b97b6caf5530ed628
 DIST haproxy-1.9.9.tar.gz 2383704 BLAKE2B 1596d6a96ba8d4b61343ede78e39b7a08b34619396a81ebfa44e42df26770ee3d425e8c091918af1471e7687d52b88131cc67f3de2c58af456b619638eb48985 SHA512 96d650097ef4840634987b31df181848e4940fc9a27a1d92f09c9ed304da299811c1b6592cb7e502c500607a7a0450c1fc50831168d44bf14492ed73b6e75ae5
 DIST haproxy-2.0.3.tar.gz 2534678 BLAKE2B 1753c1ac1cabbe50bd8c20a9b95ac317b9f726ae20bd22e402936b5cb4ee69bbe554b85331c8268704a564f437b1990d831a3e21737df2f9b6c709fb58f638ec SHA512 dd7eaf7e05c9b3ee162fcc17bc116f81184523437d6f4dbd940b0a6a8e4d01e1984fc8fabafcfc20261203e60e8bd0bc5b0bf813f5eff47b9ba364465bd0633c
+DIST haproxy-2.0.4.tar.gz 2538442 BLAKE2B 95dd770d1424a7d783a2bcbdc4b2a39271b633826e458edf8e9323a20422e25ebeaf4d866195f9bafe464cb457f62d7a4ea50ba03821a0910d81e02513a73135 SHA512 38b5dc86b2947418b4af0bb746958abb1b40dec64f1f6969e8643f3e6ac7f553c9ea2b37ef21086f5c795834c0943feedee31cc4498b095037630bb16987ac75

diff --git a/net-proxy/haproxy/haproxy-1.9.6-r1.ebuild b/net-proxy/haproxy/haproxy-1.9.10.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-1.9.6-r1.ebuild
rename to net-proxy/haproxy/haproxy-1.9.10.ebuild

diff --git a/net-proxy/haproxy/haproxy-1.9.8.ebuild b/net-proxy/haproxy/haproxy-1.9.8.ebuild
deleted file mode 100644 (file)
index ca0db85..0000000
--- a/net-proxy/haproxy/haproxy-1.9.8.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-       SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-       KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
-       EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-       EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-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 )
-       device-atlas? ( pcre )
-       ?? ( slz zlib )"
-
-DEPEND="
-       pcre? (
-               dev-libs/libpcre
-               pcre-jit? ( dev-libs/libpcre[jit] )
-       )
-       pcre2? (
-               dev-libs/libpcre
-               pcre2-jit? ( dev-libs/libpcre2[jit] )
-       )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0=[zlib?] )
-               libressl? ( dev-libs/libressl:0= )
-       )
-       slz? ( dev-libs/libslz:= )
-       zlib? ( sys-libs/zlib )
-       lua? ( dev-lang/lua:5.3 )
-       device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-CONTRIBS=( halog iprange )
-# ip6range is present in 1.6, but broken.
-ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
-
-haproxy_use() {
-       (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-       usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-       enewgroup haproxy
-       enewuser haproxy -1 -1 -1 haproxy
-
-       if use net_ns; then
-               CONFIG_CHECK="~NET_NS"
-               linux-info_pkg_setup
-       fi
-}
-
-src_compile() {
-       local -a args=(
-               V=1
-               TARGET=linux2628
-               USE_GETADDRINFO=1
-               USE_TFO=1
-       )
-
-       # TODO: PCRE2_WIDTH?
-       args+=( $(haproxy_use threads THREAD) )
-       args+=( $(haproxy_use crypt LIBCRYPT) )
-       args+=( $(haproxy_use net_ns NS) )
-       args+=( $(haproxy_use pcre PCRE) )
-       args+=( $(haproxy_use pcre-jit PCRE_JIT) )
-       args+=( $(haproxy_use pcre2 PCRE2) )
-       args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
-       args+=( $(haproxy_use ssl OPENSSL) )
-       args+=( $(haproxy_use slz SLZ) )
-       args+=( $(haproxy_use zlib ZLIB) )
-       args+=( $(haproxy_use lua LUA) )
-       args+=( $(haproxy_use 51degrees 51DEGREES) )
-       args+=( $(haproxy_use device-atlas DEVICEATLAS) )
-       args+=( $(haproxy_use wurfl WURFL) )
-       args+=( $(haproxy_use systemd SYSTEMD) )
-
-       # For now, until the strict-aliasing breakage will be fixed
-       append-cflags -fno-strict-aliasing
-
-       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-       emake -C contrib/systemd SBINDIR=/usr/sbin
-
-       if use tools ; then
-               for contrib in ${CONTRIBS[@]} ; do
-                       # Those two includes are a workaround for hpack Makefile missing those
-                       emake -C contrib/${contrib} \
-                               CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
-               done
-       fi
-}
-
-src_install() {
-       dosbin haproxy
-       dosym ../sbin/haproxy /usr/bin/haproxy
-
-       newconfd "${FILESDIR}/${PN}.confd" $PN
-       newinitd "${FILESDIR}/${PN}.initd-r6" $PN
-
-       doman doc/haproxy.1
-
-       systemd_dounit contrib/systemd/haproxy.service
-
-       einstalldocs
-
-       # The errorfiles are used by upstream defaults.
-       insinto /etc/haproxy/errors/
-       doins examples/errorfiles/*
-
-       if use doc; then
-               dodoc ROADMAP doc/*.txt
-               #if use lua; then
-               # TODO: doc/lua-api/
-               #fi
-       fi
-
-       if use tools ; then
-               has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
-               has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
-               has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
-               has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
-               has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
-               has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
-               has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
-       fi
-
-       if use examples ; then
-               docinto examples
-               dodoc examples/*.cfg
-               dodoc examples/seamless_reload.txt
-       fi
-
-       if use vim-syntax ; then
-               insinto /usr/share/vim/vimfiles/syntax
-               doins examples/haproxy.vim
-       fi
-}
-
-pkg_postinst() {
-       if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-               ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-               ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-               ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-               if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-                       einfo "Please consult the installed documentation for learning the configuration file's syntax."
-                       einfo "The documentation and sample configuration files are installed here:"
-                       einfo "   ${EROOT}usr/share/doc/${PF}"
-               fi
-       fi
-}

diff --git a/net-proxy/haproxy/haproxy-1.9.7.ebuild b/net-proxy/haproxy/haproxy-2.0.4.ebuild
similarity index 89%
rename from net-proxy/haproxy/haproxy-1.9.7.ebuild
rename to net-proxy/haproxy/haproxy-2.0.4.ebuild
index ca0db852190fe75e34dbbaacec64dd885f18f42d..3924975aade709a92e30b593c92effcedeaceb36 100644 (file)
--- a/net-proxy/haproxy/haproxy-1.9.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.4.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 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 prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
        pcre2-jit? ( pcre2 )
        pcre? ( !pcre2 )
@@ -75,9 +75,7 @@ pkg_setup() {
 src_compile() {
        local -a args=(
                V=1
-               TARGET=linux2628
-               USE_GETADDRINFO=1
-               USE_TFO=1
+               TARGET=linux-glibc
        )
 
        # TODO: PCRE2_WIDTH?
@@ -100,7 +98,12 @@ src_compile() {
        # For now, until the strict-aliasing breakage will be fixed
        append-cflags -fno-strict-aliasing
 
-       emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+       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 -C contrib/systemd SBINDIR=/usr/sbin
 
        if use tools ; then
@@ -149,12 +152,12 @@ src_install() {
        if use examples ; then
                docinto examples
                dodoc examples/*.cfg
-               dodoc examples/seamless_reload.txt
+               dodoc doc/seamless_reload.txt
        fi
 
        if use vim-syntax ; then
                insinto /usr/share/vim/vimfiles/syntax
-               doins examples/haproxy.vim
+               doins contrib/syntax-highlight/haproxy.vim
        fi
 }