summaryrefslogtreecommitdiff
path: root/net-proxy/haproxy
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-04-25 11:37:10 +0100
commit38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree04e2cf4bd43601b77daa79fe654e409187093c5e /net-proxy/haproxy
parent623ee73d661e5ed8475cb264511f683407d87365 (diff)
gentoo resync : 25.04.2020
Diffstat (limited to 'net-proxy/haproxy')
-rw-r--r--net-proxy/haproxy/Manifest23
-rw-r--r--net-proxy/haproxy/haproxy-1.8.25-r1.ebuild (renamed from net-proxy/haproxy/haproxy-1.8.24.ebuild)22
-rw-r--r--net-proxy/haproxy/haproxy-1.8.25.ebuild169
-rw-r--r--net-proxy/haproxy/haproxy-1.9.15-r1.ebuild (renamed from net-proxy/haproxy/haproxy-1.9.14.ebuild)9
-rw-r--r--net-proxy/haproxy/haproxy-1.9.9999.ebuild11
-rw-r--r--net-proxy/haproxy/haproxy-2.0.14-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.1.3.ebuild)11
-rw-r--r--net-proxy/haproxy/haproxy-2.0.14.ebuild2
-rw-r--r--net-proxy/haproxy/haproxy-2.0.9999.ebuild11
-rw-r--r--net-proxy/haproxy/haproxy-2.1.4-r1.ebuild (renamed from net-proxy/haproxy/haproxy-2.0.13.ebuild)11
-rw-r--r--net-proxy/haproxy/haproxy-2.1.4.ebuild2
-rw-r--r--net-proxy/haproxy/haproxy-2.1.9999.ebuild11
11 files changed, 51 insertions, 231 deletions
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e42a2d55456b..86b224168eb1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,26 +1,21 @@
AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
-DIST haproxy-1.8.24.tar.gz 2178823 BLAKE2B 4b040133b22f78fa8c4cdbe04183c6ae6a70fb20703907c63b6437d441ba260a41cb2d6067833700a230553648152dde0cbd3a443f05ec7935ff76939db996ae SHA512 1c53c7f579ee7eb95c3e614441745c644e5cb5b00efb1da4db9b202e2ae58ffb331ce0b94da9fe5dd4db591c5a0995030739dd3f925f66bd5b9dcce70d6b6de6
DIST haproxy-1.8.25.tar.gz 2184002 BLAKE2B d6ea39af0109eee679d87dde258038bbb38ccf12796b2e6a7172067fce6bd0f10485e2a3d89ca5b3596529db4e34d511bbb194b019c7403703cb636573b0438d SHA512 655eb4056989a3fee321ea9278a2085b0a999e522293f1f6229ebb8d17f3d33cb78abb4fd55a06d0218082e632b2d42de105575d0acd0c1b49996d4b45aa78e8
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
-DIST haproxy-1.9.14.tar.gz 2476753 BLAKE2B 3bf2b685b04b77fec6637b2c56e824681fe6fbd32de0b66a03fbdc9e71e52357b74eb315c17e72f345d255d9763b719c5d201f994a11c62e96f8f6e50208cb2e SHA512 ee0b0a994f25dff9538326c0e124e291a74a1381f9526352fe01317756ab59dfb523ee7968587f31883c59dabeb5b17effa699e65dbb67a4a18d094f32fab88a
DIST haproxy-1.9.15.tar.gz 2480346 BLAKE2B 9ebdef0cb038324b1cbe74198e73fd7f3adf5d1c6ec4000fb02e2640fe79e4b64257bfb5d6da5f1ee73486969a47e13f386313d1923893d290ef368775a08d79 SHA512 618799c9c9c5ce2c9e42aaf22abe6018d1071a72ce54273c330538007d44568a29f643d53e4861d26dbc4fc5acd1b927361948dfc1c846574d6183b6ae81429c
-DIST haproxy-2.0.13.tar.gz 2643134 BLAKE2B a14ff8488b6d187feea2b0ed81253392b4f26d546b602597bf7dc2802a2b4b2119d5769668cc0eeda1bf448d2f544ce3e456ef78af43719ab6a4c0e0829ab291 SHA512 b0a218e1cebd2c356e81605157d6cee9f448bad59172d31d9b67eb2bab4c72dbc32f48690d84c92faac8c47d8c22002b3a93af49b61a3e7bb97fcf3fa8fe081a
DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
-DIST haproxy-2.1.3.tar.gz 2675529 BLAKE2B be663fd629c001c1c91d6e3db5a8d940ed5ee674d5b886283284d2077ed8e0d13d295aeb376f6580131bdeb105c9d88f7afe367f2279d6c548d5888bd943e2b6 SHA512 4728c1177b2bba69465cbc56b1ed73a1b2d36891ba2d94d29bb49714ad98ccfac4b52947735aded211f0cd8070002f5406ddd77cabd2f8230b00438189dd7a60
DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
EBUILD haproxy-1.8.13.ebuild 4886 BLAKE2B 61bc37ea42b0dd5bc447b68cb45532c184f14ad40461faddb940e041682e88ac81af36ce44d961d1011bc54b788ad9baa4c9447950a97708ea33dcb9d677fc32 SHA512 5dad241368a64aba2b07e429ab82adff67df556fc2b5a447d4863a12d50098545127f30725887b447e6ed583e39177458267777c5b321636211aab5a61b85a65
-EBUILD haproxy-1.8.24.ebuild 4886 BLAKE2B 1408220c0147fa84297d0f87a834f5a44e69b34a7b2c48b216de4971b16f8fa2e125120d9fce05c20882577685a792f1b82735fda94aaaed01ac11fe4e06772a SHA512 a7d1789de3f46c2561cffe26786ae8fece3313993c536f7072208793b8b4e8c0b0c70f8b1d103e29e2c15f38fef37edda7cd5ba6c7ab73b59c0b44663348c042
-EBUILD haproxy-1.8.25.ebuild 4886 BLAKE2B 1408220c0147fa84297d0f87a834f5a44e69b34a7b2c48b216de4971b16f8fa2e125120d9fce05c20882577685a792f1b82735fda94aaaed01ac11fe4e06772a SHA512 a7d1789de3f46c2561cffe26786ae8fece3313993c536f7072208793b8b4e8c0b0c70f8b1d103e29e2c15f38fef37edda7cd5ba6c7ab73b59c0b44663348c042
+EBUILD haproxy-1.8.25-r1.ebuild 4806 BLAKE2B af3c97529af6f1f5e13344ef66c8cddca311cf0c52d9a02dccf5031ef51f090cb7ab356002d78161f1182e84d1da381b08ff2b678e455b27c82f0a6efc414c24 SHA512 07beb412bb20437d94ff8e829741845400ed58f32e5ecc358cbd13ea777b802bf8ce188d7b9b6a9db43bad7bcc1b6136055ed23677ce6b57c8097f03ca607fdc
EBUILD haproxy-1.8.9.ebuild 4885 BLAKE2B beb86eb5714d77b8dad4ac0abc55b46a0e4727ceae1a503ff1febe3943f6393f8ce99f97c098e4046c17de04a32c4f9d0a8708fd4c81eeb69e82f900f156285a SHA512 93290df98b67334d2c89ced563d15d25943a5c87c691fdce2ace423ca38acc364f9307f8a28a6654fb390d41c72ec627e005d0179d10138d92396365496ab8b8
-EBUILD haproxy-1.9.14.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7
+EBUILD haproxy-1.9.15-r1.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
EBUILD haproxy-1.9.15.ebuild 5018 BLAKE2B fa166d23ef442cba45d4362ff480946dda97f3fca49cfc11bdafbc82c2c6ffd158d788af4b8218983a17a604623b0b97d08b670382f807b3143ee51e25a7711b SHA512 7eb2b7e1010ae2e962db93aff0740c875dfacea4b976c5378b5f81e4f5406a5ab6b33a86945301e4520c8d120597fed632d798849a874be485a27faf81005ac7
-EBUILD haproxy-1.9.9999.ebuild 5018 BLAKE2B 93d3a44ccbdbc8abb196df919c8e7515ef58507b208341d5490391590b005ce4a43f91a1c62f810fe5559d21de349611f9d4da05a7d2b1418a3b405b67b603d9 SHA512 c5c4627a42bea17e1a459e4eb5b427ef469959bfe1882fb3ec6f1aba3462d4389c425399caeb2822ee2952af01b75d04e0b770a520c22e5487652d455676955d
-EBUILD haproxy-2.0.13.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
-EBUILD haproxy-2.0.14.ebuild 5243 BLAKE2B 9e83fd592b402209b0599dafffc649a0c74ac147e35bbd61bb8177501557ca815450654de254afb08f9e323c9cabdeaf6b36e6ec62f0737b42cb1080005ac2da SHA512 a55f799d887b132e9f69881385ee38ecb35ca762d40b457d0b2cf33eab4a9011e84303fae5bd5e3572926e2a7efb10fc2939adebe97a3806b09d3a6cfa2b1caa
-EBUILD haproxy-2.0.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
-EBUILD haproxy-2.1.3.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
-EBUILD haproxy-2.1.4.ebuild 5243 BLAKE2B 9e83fd592b402209b0599dafffc649a0c74ac147e35bbd61bb8177501557ca815450654de254afb08f9e323c9cabdeaf6b36e6ec62f0737b42cb1080005ac2da SHA512 a55f799d887b132e9f69881385ee38ecb35ca762d40b457d0b2cf33eab4a9011e84303fae5bd5e3572926e2a7efb10fc2939adebe97a3806b09d3a6cfa2b1caa
-EBUILD haproxy-2.1.9999.ebuild 5245 BLAKE2B 39175f93f60e5ed921e0b176eaa380eac45d85c59ace787f151224e79f53e4915865ef3e68ffead27a0e5d57afda3e29b30de58d4b14f87da563163e6605b84b SHA512 240fb06ccb7e0a9830d6d20807dab2c8d789d4912397a77b6cf8047b947a59389f2e34d980fde0aad06d313249e2abc7510a6120af6b9b6230d5f3d0979da4cc
+EBUILD haproxy-1.9.9999.ebuild 4997 BLAKE2B 72c880344b1c4b61f7a75fa8552d9bc4aea4c7eaeb5a158ea20a5f99a2d811e2c09dd553e70ef33ae0451079fb456ae8670f7ce25b41d53f7e620731bc3e62d0 SHA512 3ba9487968a62978abe58be3bbb2bcc6ab64a3991abb4aad49494b996715f0c69691a31d59b91e4a1601f990684bc05ca10ee8aace38015ada892abb30491c34
+EBUILD haproxy-2.0.14-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
+EBUILD haproxy-2.0.14.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
+EBUILD haproxy-2.0.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
+EBUILD haproxy-2.1.4-r1.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
+EBUILD haproxy-2.1.4.ebuild 5242 BLAKE2B 208fe423b99ed61c827ff682764eabc638d60c9821b6a3bed62dca12c7573c9bd674a1aa52edd46d4b68611d89796c631bcb9e0a27ebfa69086abdcf37b77db6 SHA512 c52730946f4abd1414917dba166b867e897bcb7ac52e79a73777ed6b8c923289be54089559c92e1409e580a1b6123855545c09b8c4338d2f6f4fa39766e21235
+EBUILD haproxy-2.1.9999.ebuild 5224 BLAKE2B 65616d45e46a318de40c7edd0a12843741784181a62f6991b49137fb2e04e479634851138b2ead576c82d3e8160d0e6706ce78da9bb81addf41ef6e2ecd18f4a SHA512 e6b4a5f154e17f96d124ccb723ab5bdcb389f89995a98e65d2f3199780d502b99da4defdba724c13ec6889bf82ec332e5757383c6b7cdd8b01786689e58e872b
MISC metadata.xml 2148 BLAKE2B 2f273c8d5c4704b482cf5b09e038415e0faa6ecba7297f99d0c55d96ba0b8f0bfa50b21dc857680951c3b4794be98f8781a6d1dcfb622ec5f6827648cfdd247e SHA512 91834d33a145ce6f887f83849ea90da984cf131e657824e63fb44b49761dc9999c00796fb20879cc670b83a2f4aae2263aeacc1dc6bf71b9db34a21ef9a3026d
diff --git a/net-proxy/haproxy/haproxy-1.8.24.ebuild b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
index 840825cd8eaf..2c5c63d0d07c 100644
--- a/net-proxy/haproxy/haproxy-1.8.24.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.25-r1.ebuild
@@ -1,20 +1,20 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator toolchain-funcs flag-o-matic systemd linux-info $SCM
+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/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
+ 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-$(get_version_component_range 1-2).git/"
+ EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
fi
@@ -45,16 +45,18 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+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.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
# TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && CONTRIBS+=( hpack )
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
@@ -74,6 +73,7 @@ pkg_setup() {
src_compile() {
local -a args=(
+ V=1
TARGET=linux2628
USE_GETADDRINFO=1
USE_TFO=1
@@ -163,7 +163,7 @@ pkg_postinst() {
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}"
+ einfo " ${EROOT}/usr/share/doc/${PF}"
fi
fi
}
diff --git a/net-proxy/haproxy/haproxy-1.8.25.ebuild b/net-proxy/haproxy/haproxy-1.8.25.ebuild
deleted file mode 100644
index 840825cd8eaf..000000000000
--- a/net-proxy/haproxy/haproxy-1.8.25.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user versionator 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/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~ppc ~x86"
-else
- EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(get_version_component_range 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.
-version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
-# TODO: mod_defender - requires apache / APR, modsecurity - the same
-version_is_at_least 1.8.0 $PV && 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=(
- 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 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
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" 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.14.ebuild b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
index 9c532b354464..7239bbf71492 100644
--- a/net-proxy/haproxy/haproxy-1.9.14.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.15-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-1.9.9999.ebuild b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
index 0eacacdc48d8..7239bbf71492 100644
--- a/net-proxy/haproxy/haproxy-1.9.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.1.3.ebuild b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
index 4dd1e0979a36..7e2cb38725c6 100644
--- a/net-proxy/haproxy/haproxy-2.1.3.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -12,7 +12,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
else
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.14.ebuild b/net-proxy/haproxy/haproxy-2.0.14.ebuild
index 8b0340f13d9c..4dd1e0979a36 100644
--- a/net-proxy/haproxy/haproxy-2.0.14.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.14.ebuild
@@ -12,7 +12,7 @@ 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"
+ KEYWORDS="amd64 arm ~ppc x86"
else
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
diff --git a/net-proxy/haproxy/haproxy-2.0.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index 06e10c936692..7e2cb38725c6 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.0.13.ebuild b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
index 4dd1e0979a36..7e2cb38725c6 100644
--- a/net-proxy/haproxy/haproxy-2.0.13.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="7"
[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit user toolchain-funcs flag-o-matic systemd linux-info $SCM
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -12,7 +12,7 @@ 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"
+ KEYWORDS="~amd64 ~arm ~ppc ~x86"
else
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup
diff --git a/net-proxy/haproxy/haproxy-2.1.4.ebuild b/net-proxy/haproxy/haproxy-2.1.4.ebuild
index 8b0340f13d9c..4dd1e0979a36 100644
--- a/net-proxy/haproxy/haproxy-2.1.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.4.ebuild
@@ -12,7 +12,7 @@ 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"
+ KEYWORDS="amd64 arm ~ppc x86"
else
EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
diff --git a/net-proxy/haproxy/haproxy-2.1.9999.ebuild b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
index 06e10c936692..7e2cb38725c6 100644
--- a/net-proxy/haproxy/haproxy-2.1.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.1.9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
MY_P="${PN}-${PV/_beta/-dev}"
@@ -45,7 +45,9 @@ DEPEND="
zlib? ( sys-libs/zlib )
lua? ( dev-lang/lua:5.3 )
device-atlas? ( dev-libs/device-atlas-api-c )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ acct-group/haproxy
+ acct-user/haproxy"
S="${WORKDIR}/${MY_P}"
@@ -63,9 +65,6 @@ haproxy_use() {
}
pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-
if use net_ns; then
CONFIG_CHECK="~NET_NS"
linux-info_pkg_setup