summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-06-30 19:38:38 +0100
committerSam James <sam@gentoo.org>2021-06-30 19:38:39 +0100
commit5f9482ca0441356011d892efabde2552055102f4 (patch)
tree55326e983b465b07cfc221758a7a70a336fda820 /net-proxy
parentnet-proxy/squid: add missing libcrypt dependency (diff)
downloadgentoo-5f9482ca0441356011d892efabde2552055102f4.tar.gz
gentoo-5f9482ca0441356011d892efabde2552055102f4.tar.bz2
gentoo-5f9482ca0441356011d892efabde2552055102f4.zip
net-proxy/haproxy: add missing libcrypt dependency
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-proxy')
-rw-r--r--net-proxy/haproxy/haproxy-1.8.29-r1.ebuild (renamed from net-proxy/haproxy/haproxy-1.8.29.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-1.8.30-r1.ebuild (renamed from net-proxy/haproxy/haproxy-1.8.30.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.0.14-r3.ebuild (renamed from net-proxy/haproxy/haproxy-2.0.14-r2.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.0.21-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.0.22.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.0.22-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.2.12.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.0.9999.ebuild5
-rw-r--r--net-proxy/haproxy/haproxy-2.2.12-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.2.13.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.2.13-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.0.21.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.2.14-r1.ebuild181
-rw-r--r--net-proxy/haproxy/haproxy-2.2.14.ebuild180
-rw-r--r--net-proxy/haproxy/haproxy-2.2.5-r2.ebuild (renamed from net-proxy/haproxy/haproxy-2.2.5-r1.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.2.9999.ebuild5
-rw-r--r--net-proxy/haproxy/haproxy-2.3.10-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.3.10.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.3.9-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.3.9.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.3.9999.ebuild5
-rw-r--r--net-proxy/haproxy/haproxy-2.4.0-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.4.0.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.4.1-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.4.1.ebuild)5
-rw-r--r--net-proxy/haproxy/haproxy-2.4.9999.ebuild5
18 files changed, 229 insertions, 212 deletions
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29-r1.ebuild
index 6b6c80be510..90d01074475 100644
--- a/net-proxy/haproxy/haproxy-1.8.29.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.29-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-1.8.30.ebuild b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
index 6b6c80be510..90d01074475 100644
--- a/net-proxy/haproxy/haproxy-1.8.30.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.30-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
index 59e794398e8..49cfe55e3a3 100644
--- a/net-proxy/haproxy/haproxy-2.0.14-r2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r3.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.22.ebuild b/net-proxy/haproxy/haproxy-2.0.21-r1.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.0.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.21-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.12.ebuild b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.2.12.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.22-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 212a9472379..0dd6f708510 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.13.ebuild b/net-proxy/haproxy/haproxy-2.2.12-r1.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.2.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.12-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild b/net-proxy/haproxy/haproxy-2.2.13-r1.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.0.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.13-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
new file mode 100644
index 00000000000..42c17e31be4
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.14-r1.ebuild
@@ -0,0 +1,181 @@
+# 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 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="
+ crypt? ( virtual/libcrypt:= )
+ pcre? (
+ dev-libs/libpcre
+ pcre-jit? ( dev-libs/libpcre[jit] )
+ )
+ pcre2? (
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+ )
+ ssl? (
+ dev-libs/openssl:0=[zlib?]
+ )
+ slz? ( dev-libs/libslz:= )
+ systemd? ( sys-apps/systemd )
+ 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.14.ebuild b/net-proxy/haproxy/haproxy-2.2.14.ebuild
deleted file mode 100644
index 85d813df107..00000000000
--- a/net-proxy/haproxy/haproxy-2.2.14.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 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? (
- dev-libs/openssl:0=[zlib?]
- )
- slz? ( dev-libs/libslz:= )
- systemd? ( sys-apps/systemd )
- 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.5-r1.ebuild b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
index f2141551be5..f773d9548c6 100644
--- a/net-proxy/haproxy/haproxy-2.2.5-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.5-r2.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.10.ebuild b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
index a2280c3fd25..143c6394abd 100644
--- a/net-proxy/haproxy/haproxy-2.3.10.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.10-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.9.ebuild b/net-proxy/haproxy/haproxy-2.3.9-r1.ebuild
index a2280c3fd25..143c6394abd 100644
--- a/net-proxy/haproxy/haproxy-2.3.9.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.3.9999.ebuild b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
index 85d813df107..42c17e31be4 100644
--- a/net-proxy/haproxy/haproxy-2.3.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.3.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.0.ebuild b/net-proxy/haproxy/haproxy-2.4.0-r1.ebuild
index ec2939f568a..31171c86ed5 100644
--- a/net-proxy/haproxy/haproxy-2.4.0.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.0-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.1.ebuild b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
index ec2939f568a..31171c86ed5 100644
--- a/net-proxy/haproxy/haproxy-2.4.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.1-r1.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index ec2939f568a..31171c86ed5 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -29,13 +29,14 @@ REQUIRED_USE="pcre-jit? ( pcre )
?? ( slz zlib )"
DEPEND="
+ crypt? ( virtual/libcrypt:= )
pcre? (
dev-libs/libpcre
pcre-jit? ( dev-libs/libpcre[jit] )
)
pcre2? (
- dev-libs/libpcre
- pcre2-jit? ( dev-libs/libpcre2[jit] )
+ dev-libs/libpcre2:=
+ pcre2-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=[zlib?]