commit: 7a9928c0cedaaaced9243a304432e6fd158a46a8
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 16 15:11:43 2021 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Mar 16 15:11:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9928c0
net-proxy/haproxy: Cleanup + Version bump to 3.3.7
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/Manifest | 5 +-
net-proxy/haproxy/haproxy-2.2.8.ebuild | 180 ---------------------
net-proxy/haproxy/haproxy-2.2.9.ebuild | 180 ---------------------
net-proxy/haproxy/haproxy-2.3.5.ebuild | 177 --------------------
.../{haproxy-2.3.4.ebuild => haproxy-2.3.7.ebuild} | 0
5 files changed, 1 insertion(+), 541 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 92828b766e0..eb05a1d9d25 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,8 +5,5 @@ DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B
eef039eaf2808aa7a9b824ddd8e5e25623fc2
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B
0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4
SHA512
fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
DIST haproxy-2.2.10.tar.gz 2904903 BLAKE2B
cd9f3cce6797349190b1502377a25d72a75ea8bae53993ed43cba6b434efcffaf77336be383c131fed88d864eff4d9eda788b7ebc74bdeb2182a1890ebf93527
SHA512
b32d1f06dae6df1f266a6ea329dc1769db7153d373e778b7fc7406242b7b70b8e6dd0b9b2b9e38c9484d5f2528e35cdbf10502fab447deace12a5f9d655cff19
DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B
1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98
SHA512
74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
-DIST haproxy-2.2.8.tar.gz 2895932 BLAKE2B
ee918f3f9e05a99266bc27507daf5b42073ff4b51708db052e3cadc10bbd5de0f9e458925ef47ce4ddd30e1d7c292d82092d9a4cb971c18eb0577b94c1c144b3
SHA512
acbdd0b9d186b7d54a161247ae3e35017a8646ac2724ae8cfaa662b4dfbe495e0b321142d7b5a7af5c71a817cfe8156aa8ec5980a64f3d88bc5c5590b9e88886
-DIST haproxy-2.2.9.tar.gz 2900486 BLAKE2B
b468d71c3caaf660b5cd3aff0d6113adf169dfb26254d7d759eb6f979a41e0ebfc754956d914391f0463ba6989609b0cc0c33bf46e34e8472fe471f8020821be
SHA512
579af88b53c626ff05facbe452e28e3dc8195579be7c02c0b64d2a241332311b41ff3f0b38557fe342d663d4b94be1e0812db6804042139cef943cfa79b8a246
-DIST haproxy-2.3.4.tar.gz 2909672 BLAKE2B
4d1b3e6aaa13c30385056c4cefe86c5bcdc98cd34a94ea388a115e2fe547242fb68a9e4b2e22cc4990db16c76eb220d52999209958409bfda7a777eee587b947
SHA512
b6db7f6c573f700ce5e2f533c6b60c5e5cb15fbc31057f3e98c03144c52b87612420e962e5e8ba63176eb1b7459a956c80a0403e9189cb3fde1dcef5bfa64ac5
-DIST haproxy-2.3.5.tar.gz 2915064 BLAKE2B
ce52ab3226bb03a39aad7c94f674b646eceaaf78be1e20fd48b9173fef6cfb9e8ea1db9cec9944b7c916d317efab8339f08a20b376b4331e0744bd9d4d26a03a
SHA512
1d7d191b72157b9b504fd5b58a50225c737491b03b1ed52de4eb61e0cc7898abae298a1fee1c3a576a7de88dd6df5f0630906001046d26c0dfa3c4bf0cd0de50
DIST haproxy-2.3.6.tar.gz 2918082 BLAKE2B
52998996c48b1ba9aaa1437ea2c5bdadda00dce58a7c1cbbafe686997a3b6fe03622986c3f5cd4dd7e3a982047e1a7c295ce6e6de2a65d36546b5e6dfff07800
SHA512
46000e08698db7a25d37b0a7e49b8c69e41eaef3cf17ea21bfda5075737110f682b8454196a72f09932a8c0bde0321e8cd075169cda840e2283aeb38bbbdf719
+DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B
c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab
SHA512
ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec
diff --git a/net-proxy/haproxy/haproxy-2.2.8.ebuild
b/net-proxy/haproxy/haproxy-2.2.8.ebuild
deleted file mode 100644
index 09bca46c32f..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.8.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit 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/$(ver_cut 1-2)"
-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 )
- 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}
- acct-group/haproxy
- acct-user/haproxy"
-
-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() {
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # 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
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- 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}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
${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 doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/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-2.2.9.ebuild
b/net-proxy/haproxy/haproxy-2.2.9.ebuild
deleted file mode 100644
index 09bca46c32f..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.9.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit 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/$(ver_cut 1-2)"
-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 )
- 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}
- acct-group/haproxy
- acct-user/haproxy"
-
-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() {
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # 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
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- 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}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
${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 doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/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-2.3.5.ebuild
b/net-proxy/haproxy/haproxy-2.3.5.ebuild
deleted file mode 100644
index b7ea2373967..00000000000
--- a/net-proxy/haproxy/haproxy-2.3.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit 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 ~arm64 ~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/$(ver_cut 1-2)"
-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 )
- 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}
- acct-group/haproxy
- acct-user/haproxy"
-
-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() {
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- TARGET=linux-glibc
- )
-
- # 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) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- 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}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
${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 doc/seamless_reload.txt
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins contrib/syntax-highlight/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-2.3.4.ebuild
b/net-proxy/haproxy/haproxy-2.3.7.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.3.4.ebuild
rename to net-proxy/haproxy/haproxy-2.3.7.ebuild
