commit: 4a72498be7cae9e71dc22bd11306dedbb877378d
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 06:38:42 2024 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 14:02:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a72498b
net-proxy/haproxy: Cleanup
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/Manifest | 3 -
net-proxy/haproxy/haproxy-2.4.23.ebuild | 218 --------------------------------
net-proxy/haproxy/haproxy-2.6.14.ebuild | 218 --------------------------------
net-proxy/haproxy/haproxy-3.0.2.ebuild | 217 -------------------------------
4 files changed, 656 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e53dc71bcd6e..e439d5cb13b5 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,8 +1,6 @@
DIST VTest-af198470d7ce482d3d26eb9ca3f246a438739366.tar.gz 196700 BLAKE2B
d740e19104a91b4cf978596ccda861974e96c9ed85a49c91e996c5bc6dde40f1cdcf49e6a75243aba7bf59abfd8d2c051a7ee574bab22f9e512d74376c9e1738
SHA512
cdc62271bb75ef7032745a457e1a54a84bcaadce73324272462b647383177338c5c2c8a17993d6344840e8ce0308a7e6f0df9bb766ebe0e8d4ee6dd4914e188c
-DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
SHA512
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B
b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076
SHA512
bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
DIST haproxy-2.4.27.tar.gz 3671596 BLAKE2B
987df4b07686e68805ff31a6832498ad8a7487a63b37e8d5ba9cd20be245a91c42e50d754d7d580d0899fed630a6bf99bd594cfec7b3a9d00ccac744a09da19b
SHA512
97227805acd6131df8b4d398099bd9b89d1cd2aaddce4a3f334bf5b8b4dd01a30a0c3b56a7c23268456cf0e3a39244ddfd3ea0c27ee44f2c3bdf49c045b5fd8c
-DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
SHA512
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B
15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc
SHA512
81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
DIST haproxy-2.6.18.tar.gz 4103766 BLAKE2B
e55f401ede25e54b199b33b7fc3dd788a45e9abbeef10fde5be6939124ab14e119ace3a2dd9d191b7c32270989c98787bdc30d2defa80c012215e2761538ce4c
SHA512
44bc0504b62c9553fe084c607e8e4d73df100b371a3493663f82fe661d07852046e1be5dc7d195a3d85f1170d9096c6a0770251ed10c1bc88f8f982ce740042f
DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
SHA512
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
@@ -12,5 +10,4 @@ DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B
ae145fe6b642f860af814c2c43e84452a0bbc1
DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B
5666624d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692
SHA512
4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B
60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303c
SHA512
23f320d49f822761cc0a4d8b7e15c8a58b804e4601c9421fa2433afe19798944d5a7264bf83502534b99236dda7c44ec72b97c1e6cdbcf203ab3090ae5313b3b
DIST haproxy-2.9.9.tar.gz 4527952 BLAKE2B
ef20ad71bf4ac0bf628267bc496c57598b2166002c71bd566323ec9e73bc2cea8ebac406d1eb87c5ec07b1253a54604f6b5f798caa29655c342d9846f62619a6
SHA512
6c0cd9fefc82d340ff2ac8427936b0c3e5a48208728f31239c511ee6c1e09299f8bb77b46a20194a31fee8b8299092979978d6564c0bbab033b2e437331c7dae
-DIST haproxy-3.0.2.tar.gz 4679721 BLAKE2B
301605d6e0c3e05241aeaac0c2c4d208896f0a8a239d0961f002c981da844ac8006cf11cd89e6017fe96030723d3dbea910a52d311fc82342f5eea196dea2a57
SHA512
f8add239e7c85ceff7a2fbc1a4e2394a449e247682d1868983ddb34943f14e01b74c710ded7a758b1e985dfaecf24e07a0b47c4c9d195f74ee1d3c2ef4567c71
DIST haproxy-3.0.3.tar.gz 4684023 BLAKE2B
d5f10110f0c95e214885b3a2248ed048adaf747e382fd343f90cfd35ed58e58f71a643260d87208e70f4d37101ba80471cd06ccd2d4cd9915031aa42fc86104f
SHA512
a5aa15c0b95ab7920b6cd531a640f6a1fd75339b92a7b5dd0905ff281dea138ac287fc92cd5d8910fbbd18f2ae92d76d7ce09482debba9838def511b02f998c5
diff --git a/net-proxy/haproxy/haproxy-2.4.23.ebuild
b/net-proxy/haproxy/haproxy-2.4.23.ebuild
deleted file mode 100644
index 74bb3576a796..000000000000
--- a/net-proxy/haproxy/haproxy-2.4.23.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
- # This is arbitrary; upstream uses master. Try to update when possible
- VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
- VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut
1-2)/src/${MY_P}.tar.gz
- test? (
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz ->
VTest-${VTEST_COMMIT}.tar.gz )"
- KEYWORDS="amd64 arm64 x86"
-elif [[ ${PV} == 9999 ]]; then
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
- EGIT_BRANCH=master
-else
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )
- test? (
- dev-libs/libpcre2
- sys-libs/zlib
- )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- default
- else
- git-r3_src_unpack
- EGIT_REPO_URI="https://github.com/vtest/VTest";
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- if use elibc_musl; then
- args+=( TARGET=linux-musl )
- else
- args+=( TARGET=linux-glibc )
- fi
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-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 wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- 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}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
- SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack
Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_test() {
- # https://github.com/vtest/VTest/issues/12
- emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS}
-Wno-error=unused-result"
- ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536
for tests"
- env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j
"$(makeopts_jobs)" \
- HAPROXY_PROGRAM="${S}/haproxy"
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
- dosbin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/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 admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && {
- newbin admin/iprange/iprange haproxy_iprange
- newbin admin/iprange/ip6range haproxy_ip6range
- }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
-}
-
-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.6.14.ebuild
b/net-proxy/haproxy/haproxy-2.6.14.ebuild
deleted file mode 100644
index 1e57b8694cc7..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.14.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
- # This is arbitrary; upstream uses master. Try to update when possible
- VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
- VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut
1-2)/src/${MY_P}.tar.gz
- test? (
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz ->
VTest-${VTEST_COMMIT}.tar.gz )"
- KEYWORDS="amd64 arm64 ppc x86"
-elif [[ ${PV} == 9999 ]]; then
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
- EGIT_BRANCH=master
-else
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )
- test? (
- dev-libs/libpcre2
- sys-libs/zlib
- )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- default
- else
- git-r3_src_unpack
- EGIT_REPO_URI="https://github.com/vtest/VTest";
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- if use elibc_musl; then
- args+=( TARGET=linux-musl )
- else
- args+=( TARGET=linux-glibc )
- fi
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-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 wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- 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}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
- SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)"
LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack
Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_test() {
- # https://github.com/vtest/VTest/issues/12
- emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS}
-Wno-error=unused-result"
- ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536
for tests"
- env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j
"$(makeopts_jobs)" \
- HAPROXY_PROGRAM="${S}/haproxy"
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
- dosbin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && {
- newbin admin/iprange/iprange haproxy_iprange
- newbin admin/iprange/ip6range haproxy_ip6range
- }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
-}
-
-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-3.0.2.ebuild
b/net-proxy/haproxy/haproxy-3.0.2.ebuild
deleted file mode 100644
index 019b7ed1219f..000000000000
--- a/net-proxy/haproxy/haproxy-3.0.2.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM} multiprocessing
-
-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
- # This is arbitrary; upstream uses master. Try to update when possible
- VTEST_COMMIT="af198470d7ce482d3d26eb9ca3f246a438739366"
- VTEST_DIR="${WORKDIR}/VTest-${VTEST_COMMIT}"
- SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut
1-2)/src/${MY_P}.tar.gz
- test? (
https://github.com/vtest/VTest/archive/${VTEST_COMMIT}.tar.gz ->
VTest-${VTEST_COMMIT}.tar.gz )"
- KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/";
- EGIT_BRANCH=master
-else
- VTEST_DIR="${WORKDIR}/VTest"
- EGIT_REPO_URI="https://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 prometheus-exporter
-ssl systemd test +threads tools zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
- lua? ( ${LUA_REQUIRED_USE} )
- ?? ( slz zlib )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
- crypt? ( virtual/libcrypt:= )
- pcre? (
- dev-libs/libpcre2:=
- pcre-jit? ( dev-libs/libpcre2:=[jit] )
- )
- ssl? (
- dev-libs/openssl:0=
- )
- systemd? ( sys-apps/systemd )
- zlib? ( sys-libs/zlib )
- lua? ( ${LUA_DEPS} )
- test? (
- dev-libs/libpcre2
- sys-libs/zlib
- )"
-RDEPEND="${DEPEND}
- acct-group/haproxy
- acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
- (( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
- usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- if use net_ns; then
- CONFIG_CHECK="~NET_NS"
- linux-info_pkg_setup
- fi
-}
-
-src_unpack() {
- if [[ ${PV} != *9999 ]]; then
- default
- else
- git-r3_src_unpack
- EGIT_REPO_URI="https://github.com/vtest/VTest";
EGIT_CHECKOUT_DIR="${VTEST_DIR}" git-r3_src_unpack
- fi
-}
-
-src_compile() {
- local -a args=(
- V=1
- # Switching to PCRE2 by default, bug 838013
- PCRE=
- PCRE_JIT=
- )
-
- if use elibc_musl; then
- args+=( TARGET=linux-musl )
- else
- args+=( TARGET=linux-glibc )
- fi
-
- # TODO: PCRE2_WIDTH?
- args+=( $(haproxy_use threads THREAD) )
- args+=( $(haproxy_use crypt LIBCRYPT) )
- args+=( $(haproxy_use net_ns NS) )
- args+=( $(haproxy_use pcre PCRE2) )
- args+=( $(haproxy_use pcre-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 wurfl WURFL) )
- args+=( $(haproxy_use systemd SYSTEMD) )
- args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
- # Bug #668002
- if use ppc || use arm || use hppa; then
- TARGET_LDFLAGS=-latomic
- fi
-
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
EXTRA_OBJS="${EXTRA_OBJS}" \
- TARGET_LDFLAGS="${TARGET_LDFLAGS}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
- emake -C admin/systemd CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}"
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) \
- SBINDIR=/usr/sbin
-
- if use tools ; then
- for extra in ${EXTRAS[@]} ; do
- if [ "${extra}" = "admin/halog" ]; then
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
- elif [ "${extra}" = "dev/hpack" ]; then
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
CC="$(tc-getCC)" \
- EXTRA_OBJS="${EXTRA_OBJS}"
TARGET_LDFLAGS="${TARGET_LDFLAGS}" \
-
PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
dev/hpack/{decode,gen-enc,gen-rht}
- else
- # Those two includes are a workaround for hpack
Makefile missing those
- emake -C ${extra} \
- CFLAGS="${CFLAGS} -I../../include/
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
- CC="$(tc-getCC)" ${args[@]}
- fi
- done
- fi
-}
-
-src_test() {
- # https://github.com/vtest/VTest/issues/12
- emake -C "${VTEST_DIR}" CC="$(tc-getCC)" FLAGS="${CFLAGS}
-Wno-error=unused-result"
- ulimit -n 65536 || die "${PN} requires ulimit -n set to at least 65536
for tests"
- env -u A -u D TMPDIR="/tmp" emake reg-tests -- --v --j
"$(makeopts_jobs)" \
- HAPROXY_PROGRAM="${S}/haproxy"
VTEST_PROGRAM="${VTEST_DIR}/vtest" REGTESTS_TYPE="default,bug,devel"
-}
-
-src_install() {
- dosbin haproxy
-
- newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
- newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
- doman doc/haproxy.1
-
- systemd_dounit admin/systemd/haproxy.service
-
- einstalldocs
-
- # The errorfiles are used by upstream defaults.
- insinto /etc/haproxy/errors/
- doins examples/errorfiles/*
-
- if use doc; then
- dodoc doc/*.txt
- #if use lua; then
- # TODO: doc/lua-api/
- #fi
- fi
-
- if use tools ; then
- has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
- has admin/iprange "${EXTRAS[@]}" && {
- newbin admin/iprange/iprange haproxy_iprange
- newbin admin/iprange/ip6range haproxy_ip6range
- }
- has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop
haproxy_tcploop
- has dev/hpack "${EXTRAS[@]}" && {
- newbin dev/hpack/gen-rht haproxy_gen-rht
- newbin dev/hpack/gen-enc haproxy_gen-enc
- newbin dev/hpack/decode haproxy_decode
- }
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- dodoc doc/seamless_reload.txt
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins admin/syntax-highlight/haproxy.vim
-}
-
-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
-}
