from:"Christian Ruppert"

[gentoo-commits] repo/gentoo:master commit in: net-wireless/sdrplay/

2024-05-21 Thread Christian Ruppert

commit: bb60618fb5a9d873880b5b2d5388fd684068342e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue May 21 14:54:26 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue May 21 14:54:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb60618f

net-wireless/sdrplay: EAPI 6->8

Bug: https://bugs.gentoo.org/867280
Signed-off-by: Christian Ruppert  gentoo.org>

 net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild 
b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
index 0154f873ac51..60f674d398fd 100644
--- a/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
+++ b/net-wireless/sdrplay/sdrplay-2.13.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit versionator unpacker udev multilib-minimal
+inherit unpacker udev multilib-minimal
 
-MY_PV_1=$(get_major_version)
-MY_PV_12=$(get_version_component_range 1-2)
+MY_PV_1=$(ver_cut 1)
+MY_PV_12=$(ver_cut 1-2)
 
 DESCRIPTION="SDRplay API/HW driver for all RSPs"
 HOMEPAGE="https://www.sdrplay.com;
@@ -38,13 +38,13 @@ multilib_src_install_all() {
 
 multilib_src_install() {
if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_32" ]; then
-   dolib "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
+   dolib.so "${S}/i686/libmirsdrapi-rsp.so.${MY_PV_12}"
fi
 
if [ "${MULTILIB_ABI_FLAG}" = "abi_x86_64" ]; then
-   dolib "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
+   dolib.so "${S}/x86_64/libmirsdrapi-rsp.so.${MY_PV_12}"
fi
 
-   dosym libmirsdrapi-rsp.so.${MY_PV_12} 
"${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
-   dosym libmirsdrapi-rsp.so.${MY_PV_1} 
"${EROOT}usr/$(get_libdir)/libmirsdrapi-rsp.so"
+   dosym libmirsdrapi-rsp.so.${MY_PV_12} 
"${EROOT}/usr/$(get_libdir)/libmirsdrapi-rsp.so.${MY_PV_1}"
+   dosym libmirsdrapi-rsp.so.${MY_PV_1} 
"${EROOT}/usr/$(get_libdir)/libmirsdrapi-rsp.so"
 }

[gentoo-commits] repo/gentoo:master commit in: sys-firmware/nvidia-firmware/

2024-04-15 Thread Christian Ruppert

commit: 37f1a8c32814d56cc5e5d23b174cddcf54a9bf91
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr 15 07:57:24 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr 15 07:57:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f1a8c3

sys-firmware/nvidia-firmware: Python 3.12 compat

Bug: https://bugs.gentoo.org/929839
Signed-off-by: Christian Ruppert  gentoo.org>

 sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild 
b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
index ad2f4c625007..6a6d6622a002 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 
 inherit python-any-r1 unpacker

[gentoo-commits] repo/gentoo:master commit in: net-proxy/hatop/files/, net-proxy/hatop/

2024-04-15 Thread Christian Ruppert

commit: 66b27227cce343c5e700ab0a2aa36a4128802455
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr 15 07:48:21 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr 15 07:49:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b27227

net-proxy/hatop: Python 3.12 compat

Bug: https://bugs.gentoo.org/929738
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/hatop/files/hatop-0.8.2-python312.patch | 73 +++
 net-proxy/hatop/hatop-0.8.2.ebuild|  6 +-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/net-proxy/hatop/files/hatop-0.8.2-python312.patch 
b/net-proxy/hatop/files/hatop-0.8.2-python312.patch
new file mode 100644
index ..68515d6d6bd1
--- /dev/null
+++ b/net-proxy/hatop/files/hatop-0.8.2-python312.patch
@@ -0,0 +1,73 @@
+From 0c0a392d319ed495a55f8ad29291c4a7cbd5077a Mon Sep 17 00:00:00 2001
+From: sblondon 
+Date: Tue, 19 Mar 2024 19:33:17 +0100
+Subject: [PATCH] Fix syntax warnings in Python3.12 (#17)
+
+Python3.12 added new syntax warning if strings contain invalid sequence.
+
+The change is documented in:
+https://docs.python.org/3/whatsnew/3.12.html#other-language-changes
+---
+ bin/hatop | 34 +-
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/bin/hatop b/bin/hatop
+index bb69311..9aa9553 100755
+--- a/bin/hatop
 b/bin/hatop
+@@ -196,7 +196,7 @@ HAPROXY_CLI_MAXLINES = 1000
+ CLI_MAXLINES = 1000
+ CLI_MAXHIST = 100
+ CLI_INPUT_LIMIT = 200
+-CLI_INPUT_RE = re.compile('[a-zA-Z0-9_:\.\-\+; /#%]')
++CLI_INPUT_RE = re.compile(r'[a-zA-Z0-9_:\.\-\+; /#%]')
+ CLI_INPUT_DENY_CMD = ['prompt', 'set timeout cli', 'quit']
+ 
+ # Note: Only the last 3 lines are visible instantly on 80x25
+@@ -214,20 +214,20 @@ SCREEN_YMAX = 100
+ SCREEN_HPOS = 11
+ 
+ HAPROXY_INFO_RE = {
+-'software_name':re.compile('^Name:\s*(?P\S+)'),
+-'software_version': re.compile('^Version:\s*(?P\S+)'),
+-'software_release': re.compile('^Release_date:\s*(?P\S+)'),
+-'nproc':re.compile('^Nbproc:\s*(?P\d+)'),
+-'procn':re.compile('^Process_num:\s*(?P\d+)'),
+-'pid':  re.compile('^Pid:\s*(?P\d+)'),
+-'uptime':   re.compile('^Uptime:\s*(?P[\S ]+)$'),
+-'maxconn':  re.compile('^Maxconn:\s*(?P\d+)'),
+-'curconn':  re.compile('^CurrConns:\s*(?P\d+)'),
+-'maxpipes': re.compile('^Maxpipes:\s*(?P\d+)'),
+-'curpipes': re.compile('^PipesUsed:\s*(?P\d+)'),
+-'tasks':re.compile('^Tasks:\s*(?P\d+)'),
+-'runqueue': re.compile('^Run_queue:\s*(?P\d+)'),
+-'node': re.compile('^node:\s*(?P\S+)'),
++'software_name':re.compile(r'^Name:\s*(?P\S+)'),
++'software_version': re.compile(r'^Version:\s*(?P\S+)'),
++'software_release': re.compile(r'^Release_date:\s*(?P\S+)'),
++'nproc':re.compile(r'^Nbproc:\s*(?P\d+)'),
++'procn':re.compile(r'^Process_num:\s*(?P\d+)'),
++'pid':  re.compile(r'^Pid:\s*(?P\d+)'),
++'uptime':   re.compile(r'^Uptime:\s*(?P[\S ]+)$'),
++'maxconn':  re.compile(r'^Maxconn:\s*(?P\d+)'),
++'curconn':  re.compile(r'^CurrConns:\s*(?P\d+)'),
++'maxpipes': re.compile(r'^Maxpipes:\s*(?P\d+)'),
++'curpipes': re.compile(r'^PipesUsed:\s*(?P\d+)'),
++'tasks':re.compile(r'^Tasks:\s*(?P\d+)'),
++'runqueue': re.compile(r'^Run_queue:\s*(?P\d+)'),
++'node': re.compile(r'^node:\s*(?P\S+)'),
+ }
+ 
+ HAPROXY_STAT_MAX_SERVICES = 1000
+@@ -236,9 +236,9 @@ Warning: You have reached the stat parser limit! (%d)
+ Use --filter to parse specific service stats only.
+ ''' % HAPROXY_STAT_MAX_SERVICES
+ HAPROXY_STAT_FILTER_RE = re.compile(
+-'^(?P-?\d+)\s+(?P-?\d+)\s+(?P-?\d+)$')
++r'^(?P-?\d+)\s+(?P-?\d+)\s+(?P-?\d+)$')
+ HAPROXY_STAT_PROXY_FILTER_RE = re.compile(
+-'^(?P[a-zA-Z0-9_:\.\-]+)$')
++r'^(?P[a-zA-Z0-9_:\.\-]+)$')
+ HAPROXY_STAT_COMMENT = '#'
+ HAPROXY_STAT_SEP = ','
+ HAPROXY_STAT_CSV = [

diff --git a/net-proxy/hatop/hatop-0.8.2.ebuild 
b/net-proxy/hatop/hatop-0.8.2.ebuild
index e79b4979df73..a0a1364cd6bb 100644
--- a/net-proxy/hatop/hatop-0.8.2.ebuild
+++ b/net-proxy/hatop/hatop-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1
@@ -22,6 +22,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}"
 
+PATCHES=("${FILESDIR}/hatop-0.8.2-python312.patch")
+
 src_install() {
python_foreach_impl python_doscript bin/hatop

[gentoo-commits] repo/gentoo:master commit in: net-proxy/hatop/

2024-04-15 Thread Christian Ruppert

commit: 3638de72599c6a612e735e4d94a00b90eedbce5e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr 15 07:48:55 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr 15 07:49:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3638de72

net-proxy/hatop: Drop old version

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/hatop/Manifest   |  1 -
 net-proxy/hatop/hatop-0.8.1.ebuild | 31 ---
 2 files changed, 32 deletions(-)

diff --git a/net-proxy/hatop/Manifest b/net-proxy/hatop/Manifest
index 4805ecabf813..545e28f8d5e3 100644
--- a/net-proxy/hatop/Manifest
+++ b/net-proxy/hatop/Manifest
@@ -1,2 +1 @@
-DIST hatop-0.8.1.tar.gz 136760 BLAKE2B 
3692e9dd307d5f098bd3a66a3a75be5184e17d246dc94b3581d2742c9629d558dc4768baaef1c1e290825e57a651dccc926f22b4ecc98074cc8309fdda4b4b57
 SHA512 
25026ddd62ef43f02cfb3ef41a815adf232c8a4b3053e925dcea69696c207ffbf22966ce1177ef460071e683f5a4ec8d011d2bb2b0aa06f4a9b3e5932aae93b6
 DIST hatop-0.8.2.tar.gz 138013 BLAKE2B 
c4a86952bf892ad989c6a28aa4bec503b24cbd11ec78cc9fb89625e30f7b1d39c0f8929018df03e7c8906d1b478f31be1003b0c37be0d09916787e1825780a60
 SHA512 
5e772394d72962bdd014f93ee94ea59814cee33e17c1864af5b3ec97a19c2c33a6ad13f24d0cf0baf78335d9a82cee28b60a03754430b0aa9132c1dd92753cdb

diff --git a/net-proxy/hatop/hatop-0.8.1.ebuild 
b/net-proxy/hatop/hatop-0.8.1.ebuild
deleted file mode 100644
index 9dc0452c3aa8..
--- a/net-proxy/hatop/hatop-0.8.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy 
status"
-HOMEPAGE="https://github.com/jhunt/hatop;
-SRC_URI="https://github.com/jhunt/hatop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   python_foreach_impl python_doscript bin/hatop
-
-   doman man/hatop.1
-
-   dodoc CHANGES.rst KEYBINDS README.rst
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-04-08 Thread Christian Ruppert

commit: 30bbea2605861aec68c78591c8368f76385f71ec
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr  8 08:28:45 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr  8 08:36:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30bbea26

net-proxy/haproxy: Bump to 2.4.26, 2.6.17, 2.8.9 and 2.9.7

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   4 +
 net-proxy/haproxy/haproxy-2.4.26.ebuild | 218 
 net-proxy/haproxy/haproxy-2.6.17.ebuild | 218 
 net-proxy/haproxy/haproxy-2.8.9.ebuild  | 218 
 net-proxy/haproxy/haproxy-2.9.7.ebuild  | 218 
 5 files changed, 876 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 48cef5e0d617..d1a83192bfa9 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,9 +1,13 @@
 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.26.tar.gz 3670267 BLAKE2B 
073ca954935021fe1986492181137324b8e4a3cdcae0e079e7a817e8dd7ad8b0097a4da57de116ed9c5932565e30962504dc18bf0ce40ac77fb384aa6527e6d2
 SHA512 
6397e5938fde77915786514def120472791f58e273cffb4562c9a74bda02300413f862e1dfcea33f5ba7b67753c156a326b4a63efadb107f85f6922fc2b89427
 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.17.tar.gz 4094829 BLAKE2B 
c1be1ef756883ca8edbad738630bbabae5c108d34c7eee6833029210c06be481dd0eb6261fb27959bb8c0cd5eebab432b6b6c2ca7a6da258f7a5dab8dbc81688
 SHA512 
b8e9768e768d6de10bec5811998ecbfed27d51d32dcb821ac320d02930530a950f5e2833e804284a1ae46df15bd636145bc147e55ffc7a0ca78008ebdb0d3f81
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
 SHA512 
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B 
ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc
 SHA512 
dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
+DIST haproxy-2.8.9.tar.gz 4383096 BLAKE2B 
5db0bc2d568989f4c319d0c9f1d7cbf2b0e235fce76ccc2c5688059ffbdcfda0f0d3958c5fc332f01e6fbcf38fb3d9e5e453c44df9baae5bbba16a9db8e0d761
 SHA512 
087dfe318bd56c3b1e834975277a35f5ebf434fdc4d342a78a24e8bec2f1d5a07d958383581eae6277754cd138e69f465e1d8fe6f1eae2f94f14a9914082bb7f
 DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 
524d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733f0e8692
 SHA512 
4e00069356083c8d428bf056e2a26ccfb3e18029cc96769189010d59d0b4f1c7af58986f1653067db83838dcbc2c138798663d3fbb9aac1d3c49c30cfc579c2a
+DIST haproxy-2.9.7.tar.gz 4516225 BLAKE2B 
60590f2ff726bce2078c2075fe7f5476b870bda935560bcbecaf2deeb097c031d458105920f04b441dd59418b7a45b451b16be142f3bb89ddc5efd92ba98303

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-04-08 Thread Christian Ruppert

commit: 2eef525f192e72bfd3c7517551f6ca38c036fbfa
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr  8 08:31:18 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr  8 08:36:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eef525f

net-proxy/haproxy: Stabilize 2.4.25, 2.6.16, 2.8.7 and 2.9.6 for x86/amd64

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.4.25.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.6.16.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.8.7.ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.9.6.ebuild  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.4.25.ebuild 
b/net-proxy/haproxy/haproxy-2.4.25.ebuild
index 7f97bd0b755f..ec56dcf067f4 100644
--- a/net-proxy/haproxy/haproxy-2.4.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.25.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != * ]]; then
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 ~arm ~arm64 ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} ==  ]]; then
VTEST_DIR="${WORKDIR}/VTest"
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;

diff --git a/net-proxy/haproxy/haproxy-2.6.16.ebuild 
b/net-proxy/haproxy/haproxy-2.6.16.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.6.16.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.16.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != * ]]; then
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 ~arm ~arm64 ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} ==  ]]; then
VTEST_DIR="${WORKDIR}/VTest"
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;

diff --git a/net-proxy/haproxy/haproxy-2.8.7.ebuild 
b/net-proxy/haproxy/haproxy-2.8.7.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.8.7.ebuild
+++ b/net-proxy/haproxy/haproxy-2.8.7.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != * ]]; then
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 ~arm ~arm64 ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} ==  ]]; then
VTEST_DIR="${WORKDIR}/VTest"
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;

diff --git a/net-proxy/haproxy/haproxy-2.9.6.ebuild 
b/net-proxy/haproxy/haproxy-2.9.6.ebuild
index e34d28a9f9c3..86ce84d00cf8 100644
--- a/net-proxy/haproxy/haproxy-2.9.6.ebuild
+++ b/net-proxy/haproxy/haproxy-2.9.6.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} != * ]]; then
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 ~arm ~arm64 ~ppc ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 elif [[ ${PV} ==  ]]; then
VTEST_DIR="${WORKDIR}/VTest"
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-02-27 Thread Christian Ruppert

commit: 223085199a55a6e08c7df2d67d457150e6b3a72d
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Feb 27 10:38:16 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Feb 27 10:38:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22308519

net-proxy/haproxy: Bump to 2.8.7 and 2.9.6 as well as cleanup old versions

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   9 +-
 net-proxy/haproxy/haproxy-2.8.6.ebuild | 218 -
 .../{haproxy-2.8.4.ebuild => haproxy-2.8.7.ebuild} |   0
 net-proxy/haproxy/haproxy-2.9.2.ebuild | 218 -
 net-proxy/haproxy/haproxy-2.9.3.ebuild | 218 -
 net-proxy/haproxy/haproxy-2.9.4.ebuild | 218 -
 net-proxy/haproxy/haproxy-2.9.5.ebuild | 218 -
 .../{haproxy-2.8.5.ebuild => haproxy-2.9.6.ebuild} |   0
 8 files changed, 2 insertions(+), 1097 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 39a8ecc4f002..48cef5e0d617 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,10 +5,5 @@ DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef64
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 
15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc
 SHA512 
81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
 SHA512 
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
-DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
-DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
-DIST haproxy-2.8.6.tar.gz 4377203 BLAKE2B 
354448e8b98f126295bd3c5d46d883de9ddcdd062ef2b72ceeb3d790ddad32e558fdae428cdab70cd352e9c336b66f14851bd3ee5db7d270695a9f414ff90914
 SHA512 
7abedd98a1fac7565a9be4936ab314799122a79ecc5e101bed1393cc991b7d6a54d95cb92a88ebd981aae5993be29ed154cb4e7ed45194af8bbce18fda5fa40b
-DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 SHA512 
1c174182dfea021d6e648eb847fb73355fba4d0cdbf97187d0e0e89ca089db985fc7f7027585bf72c520b70825875dabd76a0db2ebe3f60583ff2eb308e50a5d
-DIST haproxy-2.9.3.tar.gz 4499271 BLAKE2B 
4f034de910d90133dafa98ea04abd02f82c7bc328dddb9d3d3c71e0c660ef026a842371f5ec2259c3a5c18deac5f2104c78f04cef9f0dafa57a37abf1df224b5
 SHA512 
675d1d2754ee5a704c4e004e916fa42b641e418e775ff326a271d7344a3601ee938c8ca86107185731fdcfab59dc143cd693351b0e508496702c37a413c2db47
-DIST haproxy-2.9.4.tar.gz 4501098 BLAKE2B 
405eeff81ae7ce374bef8b4e7ce7461e827def6d79f19db60c6592acb19a684bbf30b687fdb9f4ac4f8d4f982c43c47b2e677367f2a2df785e476dfbbaeda0e8
 SHA512 
a22977f7ceb24325bcbaf531d96aad7b6e8404b026405538e0512a0c7538165736e641a05720e0ca8c9fbec497f0c9935fe0a706a9923e76d34aadd879c64d36
-DIST haproxy-2.9.5.tar.gz 4509783 BLAKE2B 
9e89c3b05c3d16683f288bac89cdfb6c6cd4385a424cca53177a9ef7aa77f61c1c937dac03c5491aeb146f8af318b642c0a9600b72dd5b7e625a7ea74d8a27fc
 SHA512 
ce340466dfe71d9dde823e415bf96fb80e13d929ed16f4a9bd90cf951f47cca1cadaeea1666d1fd184e8d8317198de24f23db9ad93d67ecc19ca1b5659ee88df
+DIST haproxy-2.8.7.tar.gz 4376705 BLAKE2B 
ae145fe6b642f860af814c2c43e84452a0bbc1b545b1b11eb07c65d903b97e42576b94e1774838b32b29ce32778941b79222669fc7615779c49f2ced85bf3fdc
 SHA512 
dd2fe2ccd5d8805da3f7544451507b182377c34a9951747643c04cb9ee178b7be0978d56a0586c59771c2bb955765d3e961f6f06187afb768dc1fd27f08da464
+DIST haproxy-2.9.6.tar.gz 4507680 BLAKE2B 
524d340cba70bc21f53efbe0a7b37897a616e55aa865ffa80471b6b5c03b3eae10bf86078245ec87cc2681b1fd2777148e0fa7f0d4a0a6bc65733

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-02-16 Thread Christian Ruppert

commit: 45cb87340582eee77b117ec6e0992152bf81ac47
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Feb 16 10:41:13 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Feb 16 10:41:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cb8734

net-proxy/haproxy: Bump to 2.8.6

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.8.6.ebuild | 218 +
 2 files changed, 219 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 76a4ac9099dd..39a8ecc4f002 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -7,6 +7,7 @@ DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d0
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
 DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
+DIST haproxy-2.8.6.tar.gz 4377203 BLAKE2B 
354448e8b98f126295bd3c5d46d883de9ddcdd062ef2b72ceeb3d790ddad32e558fdae428cdab70cd352e9c336b66f14851bd3ee5db7d270695a9f414ff90914
 SHA512 
7abedd98a1fac7565a9be4936ab314799122a79ecc5e101bed1393cc991b7d6a54d95cb92a88ebd981aae5993be29ed154cb4e7ed45194af8bbce18fda5fa40b
 DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 SHA512 
1c174182dfea021d6e648eb847fb73355fba4d0cdbf97187d0e0e89ca089db985fc7f7027585bf72c520b70825875dabd76a0db2ebe3f60583ff2eb308e50a5d
 DIST haproxy-2.9.3.tar.gz 4499271 BLAKE2B 
4f034de910d90133dafa98ea04abd02f82c7bc328dddb9d3d3c71e0c660ef026a842371f5ec2259c3a5c18deac5f2104c78f04cef9f0dafa57a37abf1df224b5
 SHA512 
675d1d2754ee5a704c4e004e916fa42b641e418e775ff326a271d7344a3601ee938c8ca86107185731fdcfab59dc143cd693351b0e508496702c37a413c2db47
 DIST haproxy-2.9.4.tar.gz 4501098 BLAKE2B 
405eeff81ae7ce374bef8b4e7ce7461e827def6d79f19db60c6592acb19a684bbf30b687fdb9f4ac4f8d4f982c43c47b2e677367f2a2df785e476dfbbaeda0e8
 SHA512 
a22977f7ceb24325bcbaf531d96aad7b6e8404b026405538e0512a0c7538165736e641a05720e0ca8c9fbec497f0c9935fe0a706a9923e76d34aadd879c64d36

diff --git a/net-proxy/haproxy/haproxy-2.8.6.ebuild 
b/net-proxy/haproxy/haproxy-2.8.6.ebuild
new file mode 100644
index ..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.6.ebuild
@@ -0,0 +1,218 @@
+# 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} == * ]] && 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} != * ]]; 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 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; 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="

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-02-16 Thread Christian Ruppert

commit: 31ebdfb2515fbd78477484ca7a4196e15678cd70
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Feb 16 08:41:18 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Feb 16 08:41:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31ebdfb2

net-proxy/haproxy: Bump to 2.9.5

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.9.5.ebuild | 218 +
 2 files changed, 219 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 664c0e3788c6..76a4ac9099dd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -10,3 +10,4 @@ DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498
 DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 SHA512 
1c174182dfea021d6e648eb847fb73355fba4d0cdbf97187d0e0e89ca089db985fc7f7027585bf72c520b70825875dabd76a0db2ebe3f60583ff2eb308e50a5d
 DIST haproxy-2.9.3.tar.gz 4499271 BLAKE2B 
4f034de910d90133dafa98ea04abd02f82c7bc328dddb9d3d3c71e0c660ef026a842371f5ec2259c3a5c18deac5f2104c78f04cef9f0dafa57a37abf1df224b5
 SHA512 
675d1d2754ee5a704c4e004e916fa42b641e418e775ff326a271d7344a3601ee938c8ca86107185731fdcfab59dc143cd693351b0e508496702c37a413c2db47
 DIST haproxy-2.9.4.tar.gz 4501098 BLAKE2B 
405eeff81ae7ce374bef8b4e7ce7461e827def6d79f19db60c6592acb19a684bbf30b687fdb9f4ac4f8d4f982c43c47b2e677367f2a2df785e476dfbbaeda0e8
 SHA512 
a22977f7ceb24325bcbaf531d96aad7b6e8404b026405538e0512a0c7538165736e641a05720e0ca8c9fbec497f0c9935fe0a706a9923e76d34aadd879c64d36
+DIST haproxy-2.9.5.tar.gz 4509783 BLAKE2B 
9e89c3b05c3d16683f288bac89cdfb6c6cd4385a424cca53177a9ef7aa77f61c1c937dac03c5491aeb146f8af318b642c0a9600b72dd5b7e625a7ea74d8a27fc
 SHA512 
ce340466dfe71d9dde823e415bf96fb80e13d929ed16f4a9bd90cf951f47cca1cadaeea1666d1fd184e8d8317198de24f23db9ad93d67ecc19ca1b5659ee88df

diff --git a/net-proxy/haproxy/haproxy-2.9.5.ebuild 
b/net-proxy/haproxy/haproxy-2.9.5.ebuild
new file mode 100644
index ..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.9.5.ebuild
@@ -0,0 +1,218 @@
+# 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} == * ]] && 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} != * ]]; 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 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; 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}  "
+
+   usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+   if use net_ns; then
+   CONFIG_CH

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-01-31 Thread Christian Ruppert

commit: d6c0c7fbe8e9cff03ff4960934ab11e27d6d007f
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Jan 31 17:23:09 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Jan 31 17:23:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6c0c7fb

net-proxy/haproxy: Bump to 2.9.4

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.9.4.ebuild | 218 +
 2 files changed, 219 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bea9c7533f86..664c0e3788c6 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,3 +9,4 @@ DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41
 DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
 DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 SHA512 
1c174182dfea021d6e648eb847fb73355fba4d0cdbf97187d0e0e89ca089db985fc7f7027585bf72c520b70825875dabd76a0db2ebe3f60583ff2eb308e50a5d
 DIST haproxy-2.9.3.tar.gz 4499271 BLAKE2B 
4f034de910d90133dafa98ea04abd02f82c7bc328dddb9d3d3c71e0c660ef026a842371f5ec2259c3a5c18deac5f2104c78f04cef9f0dafa57a37abf1df224b5
 SHA512 
675d1d2754ee5a704c4e004e916fa42b641e418e775ff326a271d7344a3601ee938c8ca86107185731fdcfab59dc143cd693351b0e508496702c37a413c2db47
+DIST haproxy-2.9.4.tar.gz 4501098 BLAKE2B 
405eeff81ae7ce374bef8b4e7ce7461e827def6d79f19db60c6592acb19a684bbf30b687fdb9f4ac4f8d4f982c43c47b2e677367f2a2df785e476dfbbaeda0e8
 SHA512 
a22977f7ceb24325bcbaf531d96aad7b6e8404b026405538e0512a0c7538165736e641a05720e0ca8c9fbec497f0c9935fe0a706a9923e76d34aadd879c64d36

diff --git a/net-proxy/haproxy/haproxy-2.9.4.ebuild 
b/net-proxy/haproxy/haproxy-2.9.4.ebuild
new file mode 100644
index ..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.9.4.ebuild
@@ -0,0 +1,218 @@
+# 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} == * ]] && 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} != * ]]; 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 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; 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}  "
+
+   usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+   if use net_ns; then
+   CONFIG_CHECK=&q

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-01-20 Thread Christian Ruppert

commit: 37bd728a1a437e1899c63aa3867fd250a4e130de
Author: Matoro Mahri  matoro  tk>
AuthorDate: Sat Jan 20 05:49:16 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Sat Jan 20 08:08:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37bd728a

net-proxy/haproxy: wire up tests

Painstakingly tested on every version in tree including lives.  Should
be completely identical across all versions - if there are any
differences it is a mistake.

Bug: https://bugs.gentoo.org/900737
Signed-off-by: Matoro Mahri  matoro.tk>
Closes: https://github.com/gentoo/gentoo/pull/34914
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|  1 +
 net-proxy/haproxy/haproxy-2.4.23.ebuild   | 38 +++
 net-proxy/haproxy/haproxy-2.4.25.ebuild   | 38 +++
 net-proxy/haproxy/haproxy-2.4..ebuild | 38 +++
 net-proxy/haproxy/haproxy-2.6.14.ebuild   | 38 +++
 net-proxy/haproxy/haproxy-2.6.16.ebuild   | 38 +++
 net-proxy/haproxy/haproxy-2.6..ebuild | 38 +++
 net-proxy/haproxy/haproxy-2.7.11.ebuild   | 38 +++
 net-proxy/haproxy/haproxy-2.7.9.ebuild| 38 +++
 net-proxy/haproxy/haproxy-2.7..ebuild | 38 +++
 net-proxy/haproxy/haproxy-2.8.4.ebuild| 38 +++
 net-proxy/haproxy/haproxy-2.8.5.ebuild| 38 +++
 net-proxy/haproxy/haproxy-2.8..ebuild | 38 +++
 net-proxy/haproxy/haproxy-2.9.2.ebuild| 36 +
 net-proxy/haproxy/haproxy-2.9..ebuild | 38 +++
 net-proxy/haproxy/haproxy-.ebuild | 38 +++
 16 files changed, 495 insertions(+), 74 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 3214cb4e51f4..bbf0f3c5176d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,3 +1,4 @@
+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.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601

diff --git a/net-proxy/haproxy/haproxy-2.4.23.ebuild 
b/net-proxy/haproxy/haproxy-2.4.23.ebuild
index 796d22deb9a8..2f32d219b374 100644
--- a/net-proxy/haproxy/haproxy-2.4.23.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,19 +6,25 @@ EAPI="7"
 LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single systemd linux-info ${SCM}
+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} != * ]]; then
-   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   # 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 arm ~arm64 ppc ~x86"
 elif [[ ${PV} ==  ]]; then
+   VTEST_DIR="${WORKDIR}/VTest&q

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-01-20 Thread Christian Ruppert

commit: fe2253157aa37f2805df0c45c22d0f7a3667ed8c
Author: Christian Ruppert  gentoo  org>
AuthorDate: Sat Jan 20 08:08:04 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Sat Jan 20 08:08:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe225315

net-proxy/haproxy: Bump to 2.9.3

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.9.3.ebuild | 218 +
 2 files changed, 219 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bbf0f3c5176d..bea9c7533f86 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,3 +8,4 @@ DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68fae
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
 DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
 DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b21db
 SHA512 
1c174182dfea021d6e648eb847fb73355fba4d0cdbf97187d0e0e89ca089db985fc7f7027585bf72c520b70825875dabd76a0db2ebe3f60583ff2eb308e50a5d
+DIST haproxy-2.9.3.tar.gz 4499271 BLAKE2B 
4f034de910d90133dafa98ea04abd02f82c7bc328dddb9d3d3c71e0c660ef026a842371f5ec2259c3a5c18deac5f2104c78f04cef9f0dafa57a37abf1df224b5
 SHA512 
675d1d2754ee5a704c4e004e916fa42b641e418e775ff326a271d7344a3601ee938c8ca86107185731fdcfab59dc143cd693351b0e508496702c37a413c2db47

diff --git a/net-proxy/haproxy/haproxy-2.9.3.ebuild 
b/net-proxy/haproxy/haproxy-2.9.3.ebuild
new file mode 100644
index ..e34d28a9f9c3
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.9.3.ebuild
@@ -0,0 +1,218 @@
+# 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} == * ]] && 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} != * ]]; 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 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; 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}  "
+
+   usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+   if use net_ns; then
+   CONFIG_CHECK=&q

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2024-01-15 Thread Christian Ruppert

commit: b24167aa561016cbe3dc6e8e23e45e0a016e17e4
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Jan 15 18:25:26 2024 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Jan 15 18:25:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b24167aa

net-proxy/haproxy: Bump to 2.9.2 + Cleanup

Bug: https://bugs.gentoo.org/921708
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   5 +-
 net-proxy/haproxy/haproxy-2.4.24.ebuild| 190 -
 net-proxy/haproxy/haproxy-2.6.15.ebuild| 190 -
 net-proxy/haproxy/haproxy-2.7.10.ebuild| 190 -
 .../{haproxy-2.9.1.ebuild => haproxy-2.9.2.ebuild} |   2 +-
 5 files changed, 2 insertions(+), 575 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e7cd760f94cd..3214cb4e51f4 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,12 +1,9 @@
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
-DIST haproxy-2.4.24.tar.gz 3657466 BLAKE2B 
b8b7065ee87a02b239e55e2b6943aa56a6613e87bb76e086b60bda35221c7a6a0a70e4dd8765914c6af9c4f4f3d54e77143f3d32409473bb2d139f956fc3d2b2
 SHA512 
48ff30ab27c6c92309255ba8aae25e950be8342d35f527bd5ff4eba05fa4049c7bdbc5acbcf7c62cff81af0b0746fe29079334a859cd7a99b7ab4688774239db
 DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B 
b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076
 SHA512 
bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
-DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154004bc96109a65988ff67974dedd22ddcc68f1907f9af7b3ba6e8ffde13db7ac5fef513ece1495ab559c6c2560f2
 SHA512 
e308f8f89df06503e10132afcaf7df9d0253122f38c44acd1ddf3e2a3d769f7721dd361d12db5948248ae42bcd7aab368e6515ccfe1e38c7bd78df764a6833eb
 DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 
15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc
 SHA512 
81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
-DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
 DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
 SHA512 
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
 DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
-DIST haproxy-2.9.1.tar.gz 4493103 BLAKE2B 
a5d43af96e457711e3826b5ebc64eda7ac15f3f6c58b4d89f4b53df1e08b176f9bbd5ff8290dad7b3208326655e22c89a5e07deaa7d522ecc0110342670e3c62
 SHA512 
612295c54634dff04f7a357c0a9ae221a2c27b9c81e0671cf6173f8a1ae31441b718ed929c3bef6ec807264f8b41cf5d4ca31466496191f9dcf7246ec9f77e22
+DIST haproxy-2.9.2.tar.gz 4498040 BLAKE2B 
257a594fdb18e50c99e4256aa364d2ea55b56e39bfda0435c921927939a09231be5ae2bd7f39e23286febb343fa0dca5fc33f9b279461c5083050898390b

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/

2023-12-18 Thread Christian Ruppert

commit: f19cc4e0e26fdc341b85ee8921c25586e7c3af40
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Dec 18 15:01:04 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Dec 18 15:01:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19cc4e0

net-proxy/haproxy: Use the full commandline when checking the config

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy.initd-r8 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/files/haproxy.initd-r8 
b/net-proxy/haproxy/files/haproxy.initd-r8
index 4994c28b42d5..44d8bf64e3b3 100644
--- a/net-proxy/haproxy/files/haproxy.initd-r8
+++ b/net-proxy/haproxy/files/haproxy.initd-r8
@@ -44,7 +44,7 @@ checkconfig() {
done
 
ebegin "Checking ${CONFIGS}"
-   $command -q -c $configs $HAPROXY_OPTS
+   $command -q -c $command_args
eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-12-18 Thread Christian Ruppert

commit: 4b8cb2c8f5d47deb90873504124e4afefd513831
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Dec 18 10:07:38 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Dec 18 10:07:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8cb2c8

net-proxy/haproxy: Bumps to 2.4.25, 2.6.16, 2.7.11 and 2.9.1

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest| 6 --
 net-proxy/haproxy/{haproxy-2.8.3.ebuild => haproxy-2.4.25.ebuild} | 2 +-
 net-proxy/haproxy/{haproxy-2.8.3.ebuild => haproxy-2.6.16.ebuild} | 0
 net-proxy/haproxy/{haproxy-2.9.0.ebuild => haproxy-2.7.11.ebuild} | 0
 net-proxy/haproxy/{haproxy-2.8.3.ebuild => haproxy-2.9.1.ebuild}  | 0
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 75a0c1d4fa4b..e7cd760f94cd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,10 +1,12 @@
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.4.24.tar.gz 3657466 BLAKE2B 
b8b7065ee87a02b239e55e2b6943aa56a6613e87bb76e086b60bda35221c7a6a0a70e4dd8765914c6af9c4f4f3d54e77143f3d32409473bb2d139f956fc3d2b2
 SHA512 
48ff30ab27c6c92309255ba8aae25e950be8342d35f527bd5ff4eba05fa4049c7bdbc5acbcf7c62cff81af0b0746fe29079334a859cd7a99b7ab4688774239db
+DIST haproxy-2.4.25.tar.gz 3664305 BLAKE2B 
b02eca0ef2719fad33c8db65b6568706cff3af9b19e2e0656970986b59116c054972341b5efd010907adb8d664fe1f72dd29feeab6a7b8bb9508e65c3bed9076
 SHA512 
bffe50c4155f28743fc4368e08f5912d137ac8fcad2bea70b9fb171be6a1c46c82e24059634add0b42a1d8da7d6fc76bf5287ffa8d4d530d46dbe522ad51a9e1
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154004bc96109a65988ff67974dedd22ddcc68f1907f9af7b3ba6e8ffde13db7ac5fef513ece1495ab559c6c2560f2
 SHA512 
e308f8f89df06503e10132afcaf7df9d0253122f38c44acd1ddf3e2a3d769f7721dd361d12db5948248ae42bcd7aab368e6515ccfe1e38c7bd78df764a6833eb
+DIST haproxy-2.6.16.tar.gz 4084854 BLAKE2B 
15a33d6d88de9181d4b1b05d59d32f1c76496e3c8d4a8be8d762ff5945a3e56d416f463473dfb9e3c266032458dab737264fea0d18f467e66cca016da33c9fdc
 SHA512 
81d55c46debe61f691cd0d8ccefd6eb8b5387ce1f4591ed7011ddbcc13b521f708499c9921983c9089e7f9ffcf1ed545d5b6124a92409b78def1f7eb1044e147
 DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
+DIST haproxy-2.7.11.tar.gz 4213212 BLAKE2B 
ca5713d694b8d709188457dd821218d3474d05dd63ed6d3906d98bf4b24b2ea9847b032d6264c7e80a59043a9e085595fdcbdc0dec44137f0b7d71f1189688e0
 SHA512 
1e5298397e8759cb260997bf23336b9aa62b56ca7dd832cb4155526d9e7c5c664122e33717ce5be34bbf1539a85a8fbdb6e535aa056d2c232673a4034446288a
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
-DIST haproxy-2.8.3.tar.gz 4350288 BLAKE2B 
00b593a4c89a2688ccdf541cd4343e033bd7cc4ec2e0b2a43afcf03cf623ef31944086b5e42c1ea77ec5767b4712c5c26668456e09c6379e33406b3baa8b495f
 SHA512 
1fe08c29b22581cc5a71934e420c00faaba0f5b5028b10f82e0a16556fcdd4a3943b9f2f3e2ad675442d70cf37a125a3583cdf2d4ae45d3db67bc42cfc457112
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
 DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
-DIST haproxy-2.9.0.tar.gz 4492320 BLAKE2B 
7db2c16501fd3258e0858228986cfed5e95aff9048d32560039c39c928edba6f68a068866006f2d307a090c0197fd529ee05e15791f7120d415

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-12-07 Thread Christian Ruppert

commit: 60c391dc300b233655700744a0a111e3926fbdeb
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Dec  7 14:30:58 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Dec  7 14:31:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c391dc

net-proxy/haproxy: Bump to 2.8.5

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.8.5.ebuild | 190 +
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 97d3327f2b01..75a0c1d4fa4b 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,4 +6,5 @@ DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.3.tar.gz 4350288 BLAKE2B 
00b593a4c89a2688ccdf541cd4343e033bd7cc4ec2e0b2a43afcf03cf623ef31944086b5e42c1ea77ec5767b4712c5c26668456e09c6379e33406b3baa8b495f
 SHA512 
1fe08c29b22581cc5a71934e420c00faaba0f5b5028b10f82e0a16556fcdd4a3943b9f2f3e2ad675442d70cf37a125a3583cdf2d4ae45d3db67bc42cfc457112
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
+DIST haproxy-2.8.5.tar.gz 4364802 BLAKE2B 
2c5c66b83a5b514d6518b6b5d62cfa17881498bc4adca664a2cb307630adea815d80ee1a9a823e7ae4043328a3940ce34a62dd218b165cedf9111c1190bc541a
 SHA512 
7634b9f7d85a246ea467335f71def0085ec63f96f862d2e0016b206c266e5c9cafce1431a7ebe1e8cb0e4f2a80cd5d8f9222c93630c74170bb4175000623380b
 DIST haproxy-2.9.0.tar.gz 4492320 BLAKE2B 
7db2c16501fd3258e0858228986cfed5e95aff9048d32560039c39c928edba6f68a068866006f2d307a090c0197fd529ee05e15791f7120d4155791ab06948c1
 SHA512 
562d9d0e7783b5b7f86cfb7b085a4f6149f284c284af784ba005bed0bb59ccba0bb0baa53b728362b1262a02150b4ebe4157e39ded5e09d5c06264ea99734ffc

diff --git a/net-proxy/haproxy/haproxy-2.8.5.ebuild 
b/net-proxy/haproxy/haproxy-2.8.5.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.5.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   if use elibc_musl

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-12-06 Thread Christian Ruppert

commit: 4d3c9c1f34eaa0442bd12f429bd756b216e4eb6c
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Dec  6 08:17:55 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Dec  6 08:17:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d3c9c1f

net-proxy/haproxy: Bump to 2.9.0

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.9.0.ebuild | 190 +
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d6b7997dab47..97d3327f2b01 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,3 +6,4 @@ DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.3.tar.gz 4350288 BLAKE2B 
00b593a4c89a2688ccdf541cd4343e033bd7cc4ec2e0b2a43afcf03cf623ef31944086b5e42c1ea77ec5767b4712c5c26668456e09c6379e33406b3baa8b495f
 SHA512 
1fe08c29b22581cc5a71934e420c00faaba0f5b5028b10f82e0a16556fcdd4a3943b9f2f3e2ad675442d70cf37a125a3583cdf2d4ae45d3db67bc42cfc457112
 DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6
+DIST haproxy-2.9.0.tar.gz 4492320 BLAKE2B 
7db2c16501fd3258e0858228986cfed5e95aff9048d32560039c39c928edba6f68a068866006f2d307a090c0197fd529ee05e15791f7120d4155791ab06948c1
 SHA512 
562d9d0e7783b5b7f86cfb7b085a4f6149f284c284af784ba005bed0bb59ccba0bb0baa53b728362b1262a02150b4ebe4157e39ded5e09d5c06264ea99734ffc

diff --git a/net-proxy/haproxy/haproxy-2.9.0.ebuild 
b/net-proxy/haproxy/haproxy-2.9.0.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.9.0.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=( $(h

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-11-17 Thread Christian Ruppert

commit: a688a4bef05a4f2a8c5197d0a3f0a42e3570c7f9
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Nov 17 19:02:39 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Nov 17 19:06:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a688a4be

net-proxy/haproxy: Bump to 2.8.4 + cleanup

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   3 +-
 net-proxy/haproxy/haproxy-2.4.18.ebuild| 180 -
 .../{haproxy-2.8.2.ebuild => haproxy-2.8.4.ebuild} |   0
 3 files changed, 1 insertion(+), 182 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4018167770e1..d6b7997dab47 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,9 +1,8 @@
-DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.4.24.tar.gz 3657466 BLAKE2B 
b8b7065ee87a02b239e55e2b6943aa56a6613e87bb76e086b60bda35221c7a6a0a70e4dd8765914c6af9c4f4f3d54e77143f3d32409473bb2d139f956fc3d2b2
 SHA512 
48ff30ab27c6c92309255ba8aae25e950be8342d35f527bd5ff4eba05fa4049c7bdbc5acbcf7c62cff81af0b0746fe29079334a859cd7a99b7ab4688774239db
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154004bc96109a65988ff67974dedd22ddcc68f1907f9af7b3ba6e8ffde13db7ac5fef513ece1495ab559c6c2560f2
 SHA512 
e308f8f89df06503e10132afcaf7df9d0253122f38c44acd1ddf3e2a3d769f7721dd361d12db5948248ae42bcd7aab368e6515ccfe1e38c7bd78df764a6833eb
 DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
-DIST haproxy-2.8.2.tar.gz 4335907 BLAKE2B 
9dcc79dec3f0e117a61c91e41b5e92d2b3788935e116db828abbdaae8c7265a5e24827731e6b29f30426cddf64f04ccac0d5293d27a4eec929fd4f936af761d5
 SHA512 
717bbdd626d3c03c06ad237fe2cb46c71b7cddcf0ba40b6bedb66293a9db9655204f83848ada32dc28dd782b98c8ee32516f90203ac0273759f171e955b4527d
 DIST haproxy-2.8.3.tar.gz 4350288 BLAKE2B 
00b593a4c89a2688ccdf541cd4343e033bd7cc4ec2e0b2a43afcf03cf623ef31944086b5e42c1ea77ec5767b4712c5c26668456e09c6379e33406b3baa8b495f
 SHA512 
1fe08c29b22581cc5a71934e420c00faaba0f5b5028b10f82e0a16556fcdd4a3943b9f2f3e2ad675442d70cf37a125a3583cdf2d4ae45d3db67bc42cfc457112
+DIST haproxy-2.8.4.tar.gz 4361756 BLAKE2B 
2a19b4902783ceac6322c3a531ce1fe16f2c41d2090a0e4278e2303509e264aa1d19e32ff36a6bfd7415c90f33d4aed6dc5adbc2807af51ff814717c0db98eca
 SHA512 
7de5098d6004e66da656a83d86fdb342e465d503c3e179678bf989abb6735e61f35522d913e9046774cd71b0853737f9a84a2561dfd35395f95ecfbd987c0cd6

diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild 
b/net-proxy/haproxy/haproxy-2.4.18.ebuild
deleted file mode 100644
index 3cb34fca9462..
--- a/net-proxy/haproxy/haproxy-2.4.18.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs lua-single 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} != * ]]; then
-   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
-   KEYWORDS="amd64 arm ~arm64 ppc ~x86"
-elif [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
-   EGIT_BRANCH=master
-else
-   EGIT_REPO_URI="https://

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-09-07 Thread Christian Ruppert

commit: cb2925970bce64b1114a91942de912be16d1e0d2
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Sep  7 09:56:51 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Sep  7 09:57:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb292597

net-proxy/haproxy: Bump to 2.8.3

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.8.3.ebuild | 190 +
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 3f1b2274714c..4018167770e1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,3 +6,4 @@ DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154
 DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.2.tar.gz 4335907 BLAKE2B 
9dcc79dec3f0e117a61c91e41b5e92d2b3788935e116db828abbdaae8c7265a5e24827731e6b29f30426cddf64f04ccac0d5293d27a4eec929fd4f936af761d5
 SHA512 
717bbdd626d3c03c06ad237fe2cb46c71b7cddcf0ba40b6bedb66293a9db9655204f83848ada32dc28dd782b98c8ee32516f90203ac0273759f171e955b4527d
+DIST haproxy-2.8.3.tar.gz 4350288 BLAKE2B 
00b593a4c89a2688ccdf541cd4343e033bd7cc4ec2e0b2a43afcf03cf623ef31944086b5e42c1ea77ec5767b4712c5c26668456e09c6379e33406b3baa8b495f
 SHA512 
1fe08c29b22581cc5a71934e420c00faaba0f5b5028b10f82e0a16556fcdd4a3943b9f2f3e2ad675442d70cf37a125a3583cdf2d4ae45d3db67bc42cfc457112

diff --git a/net-proxy/haproxy/haproxy-2.8.3.ebuild 
b/net-proxy/haproxy/haproxy-2.8.3.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.3.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=( $(h

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-08-21 Thread Christian Ruppert

commit: edc20f11d95197bcae933e54c59c7a54150fca31
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Aug 21 17:01:07 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Aug 21 17:02:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc20f11

net-proxy/haproxy: Bump to 2.4.24

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.4.24.ebuild | 190 
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9a74bc0ab513..f5597547e170 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,6 +2,7 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac04f9cc69173c0c1b95ba66658ddcaa49fca10737b5af5ad8bc4d5efcfd17e3209f703e9399093786c72647ddafb
 SHA512 
9c8486fac3794df97151468a1cbe26aa1fd07e1e9fd00f8adf35144e39eebe01795741e984891f0501184228ac431a3cf8676361aa9d8d415a58edabcc515c28
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
+DIST haproxy-2.4.24.tar.gz 3657466 BLAKE2B 
b8b7065ee87a02b239e55e2b6943aa56a6613e87bb76e086b60bda35221c7a6a0a70e4dd8765914c6af9c4f4f3d54e77143f3d32409473bb2d139f956fc3d2b2
 SHA512 
48ff30ab27c6c92309255ba8aae25e950be8342d35f527bd5ff4eba05fa4049c7bdbc5acbcf7c62cff81af0b0746fe29079334a859cd7a99b7ab4688774239db
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154004bc96109a65988ff67974dedd22ddcc68f1907f9af7b3ba6e8ffde13db7ac5fef513ece1495ab559c6c2560f2
 SHA512 
e308f8f89df06503e10132afcaf7df9d0253122f38c44acd1ddf3e2a3d769f7721dd361d12db5948248ae42bcd7aab368e6515ccfe1e38c7bd78df764a6833eb
 DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e

diff --git a/net-proxy/haproxy/haproxy-2.4.24.ebuild 
b/net-proxy/haproxy/haproxy-2.4.24.ebuild
new file mode 100644
index ..291a00595e4a
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.24.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/

2023-08-21 Thread Christian Ruppert

commit: 031545bda42452b21874a77a8d939f7de9a0c134
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Aug 21 17:02:17 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Aug 21 17:02:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031545bd

net-proxy/haproxy: Cleanup old confd

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy.confd | 14 --
 1 file changed, 14 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy.confd 
b/net-proxy/haproxy/files/haproxy.confd
deleted file mode 100644
index 30739eb8bf23..
--- a/net-proxy/haproxy/files/haproxy.confd
+++ /dev/null
@@ -1,14 +0,0 @@
-# HAProxy config file(s), space separated
-#CONFIGS="/etc/haproxy/haproxy.cfg"
-
-# Additional HAProxy command line options
-HAPROXY_OPTS=""
-
-# If you want to make use ot the new seamless reload you can just write your 
own
-# reload_seamless function here. It will be called by the init script.
-# For more information on how to use that feature please have a look at the
-# "seamless_reload.txt" documentation file (requires 
net-proxy/haproxy[examples])
-#reload_seamless() {
-#  checkpath -d -m 0700 haproxy:haproxy "/run/haproxy/"
-#  socat /run/haproxy/socket - <<< "show servers state" > 
/run/haproxy/global.state
-#}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-08-21 Thread Christian Ruppert

commit: aeff6c0e10b7a7bfdca351862fb0216d7e7ea0cf
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Aug 21 17:01:31 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Aug 21 17:02:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeff6c0e

net-proxy/haproxy: Cleanup 2.2.x

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|   2 -
 net-proxy/haproxy/haproxy-2.2.25.ebuild   | 184 -
 net-proxy/haproxy/haproxy-2.2.30.ebuild   | 185 --
 net-proxy/haproxy/haproxy-2.2..ebuild | 185 --
 4 files changed, 556 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index f5597547e170..3f1b2274714c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,3 @@
-DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac04f9cc69173c0c1b95ba66658ddcaa49fca10737b5af5ad8bc4d5efcfd17e3209f703e9399093786c72647ddafb
 SHA512 
9c8486fac3794df97151468a1cbe26aa1fd07e1e9fd00f8adf35144e39eebe01795741e984891f0501184228ac431a3cf8676361aa9d8d415a58edabcc515c28
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.4.24.tar.gz 3657466 BLAKE2B 
b8b7065ee87a02b239e55e2b6943aa56a6613e87bb76e086b60bda35221c7a6a0a70e4dd8765914c6af9c4f4f3d54e77143f3d32409473bb2d139f956fc3d2b2
 SHA512 
48ff30ab27c6c92309255ba8aae25e950be8342d35f527bd5ff4eba05fa4049c7bdbc5acbcf7c62cff81af0b0746fe29079334a859cd7a99b7ab4688774239db

diff --git a/net-proxy/haproxy/haproxy-2.2.25.ebuild 
b/net-proxy/haproxy/haproxy-2.2.25.ebuild
deleted file mode 100644
index bec46c997025..
--- a/net-proxy/haproxy/haproxy-2.2.25.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
-   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
-   KEYWORDS="amd64 arm ~arm64 ppc ~x86"
-elif [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
-   EGIT_BRANCH=master
-else
-   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 +threads tools +zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-   lua? ( ${LUA_REQUIRED_USE} )
-   ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-   crypt? ( virtual/libcrypt:= )
-   pcre? (
-   dev-libs/libpcre2:=
-   pcre-jit? ( dev-libs/libpcre2:=[jit] )
-   )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   slz? ( dev-libs/libslz:= )
-   systemd? ( sys-apps/systemd )
-   zlib? ( sys-libs/zlib )
-   lua? ( ${LUA_DEPS} )"
-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}  "
-
-   usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-   use lua && lua-single_p

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-08-10 Thread Christian Ruppert

commit: 84cd1343a1cb8023b21c932cc75f41935370ca1e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Aug 10 06:56:24 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Aug 10 06:56:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84cd1343

net-proxy/haproxy: Bump to 2.6.15

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.6.15.ebuild | 190 
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index bf7cf7b5b7fc..9a74bc0ab513 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,6 +3,7 @@ DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
+DIST haproxy-2.6.15.tar.gz 4074156 BLAKE2B 
b785cb30fe34382dfd65efd1c6492434af154004bc96109a65988ff67974dedd22ddcc68f1907f9af7b3ba6e8ffde13db7ac5fef513ece1495ab559c6c2560f2
 SHA512 
e308f8f89df06503e10132afcaf7df9d0253122f38c44acd1ddf3e2a3d769f7721dd361d12db5948248ae42bcd7aab368e6515ccfe1e38c7bd78df764a6833eb
 DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.2.tar.gz 4335907 BLAKE2B 
9dcc79dec3f0e117a61c91e41b5e92d2b3788935e116db828abbdaae8c7265a5e24827731e6b29f30426cddf64f04ccac0d5293d27a4eec929fd4f936af761d5
 SHA512 
717bbdd626d3c03c06ad237fe2cb46c71b7cddcf0ba40b6bedb66293a9db9655204f83848ada32dc28dd782b98c8ee32516f90203ac0273759f171e955b4527d

diff --git a/net-proxy/haproxy/haproxy-2.6.15.ebuild 
b/net-proxy/haproxy/haproxy-2.6.15.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.15.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-08-09 Thread Christian Ruppert

commit: ad0f52035a3878da83d01a5fcd14d048c22ae6e5
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Aug  9 14:30:51 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Aug  9 14:31:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0f5203

net-proxy/haproxy: Bump to 2.7.10

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.7.10.ebuild | 190 
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4ab136a5d951..bf7cf7b5b7fc 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,5 +3,6 @@ DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
+DIST haproxy-2.7.10.tar.gz 4191948 BLAKE2B 
66a64f7315d8ff4ca28d94b3dc06b327d5845bce146aa84b0b7414ef264836e1e172dc03ae44d255ddb1366eeead8959189a918669559e4e91934f68690f0b46
 SHA512 
47896b1084eb02a84ef6d08697c0e57147bdda1abc9b2e0eec4403297236f49f81011656a4d4f53379a8259d1dc3a55abc639905983f8cb0e97f41ac83ff871e
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.2.tar.gz 4335907 BLAKE2B 
9dcc79dec3f0e117a61c91e41b5e92d2b3788935e116db828abbdaae8c7265a5e24827731e6b29f30426cddf64f04ccac0d5293d27a4eec929fd4f936af761d5
 SHA512 
717bbdd626d3c03c06ad237fe2cb46c71b7cddcf0ba40b6bedb66293a9db9655204f83848ada32dc28dd782b98c8ee32516f90203ac0273759f171e955b4527d

diff --git a/net-proxy/haproxy/haproxy-2.7.10.ebuild 
b/net-proxy/haproxy/haproxy-2.7.10.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.7.10.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+   use lua && lua-single_pkg_setup
+

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-08-09 Thread Christian Ruppert

commit: c6891032e171730b26ab1db5282ac568b38d674a
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Aug  9 14:15:02 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Aug  9 14:15:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6891032

net-proxy/haproxy: Bump to 2.8.2 + Cleanup old versions

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   9 +-
 net-proxy/haproxy/haproxy-2.2.29.ebuild| 185 
 net-proxy/haproxy/haproxy-2.4.22.ebuild| 191 -
 net-proxy/haproxy/haproxy-2.7.3.ebuild | 190 
 net-proxy/haproxy/haproxy-2.7.8.ebuild | 190 
 net-proxy/haproxy/haproxy-2.8.0.ebuild | 190 
 net-proxy/haproxy/haproxy-2.8.1.ebuild | 190 
 ...{haproxy-2.6.13.ebuild => haproxy-2.8.2.ebuild} |   0
 ...aproxy-2.6.9.ebuild => haproxy-2.9..ebuild} |   0
 9 files changed, 1 insertion(+), 1144 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0491795496e7..4ab136a5d951 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,14 +1,7 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac04f9cc69173c0c1b95ba66658ddcaa49fca10737b5af5ad8bc4d5efcfd17e3209f703e9399093786c72647ddafb
 SHA512 
9c8486fac3794df97151468a1cbe26aa1fd07e1e9fd00f8adf35144e39eebe01795741e984891f0501184228ac431a3cf8676361aa9d8d415a58edabcc515c28
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
-DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
-DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6
 SHA512 
672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
 DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
-DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
-DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
-DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-07-03 Thread Christian Ruppert

commit: 4269b04a2ffc324157687e204b14317584f6
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Jul  3 12:46:40 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Jul  3 12:46:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4269b04a

net-proxy/haproxy: Bump to 2.8.1

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.8.1.ebuild | 190 +
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1ae30827b831..0491795496e7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -11,3 +11,4 @@ DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
 DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.0.tar.gz 4328018 BLAKE2B 
a5382e153f08a315b7df7f92736aabad8e9d4cd0152a9178c448d1071440b88dbd723599fd3709d266f97eee4fa89d336a3390d70a0c4ab7f0b46e4ae713fa12
 SHA512 
4197e94df3d4ab8b27487146181335422358a097f7d50188b40ae23263c58ddeab6d17d9ed91e93d239a7fccec2fa58319e3f2cf07ac589c79fd78a3839c2b81
+DIST haproxy-2.8.1.tar.gz 4329591 BLAKE2B 
4c4cb6d0a50d1a5d799b4d861f1dff98d5b3cf6f33c94c1b5927dd1998afb968c0bded9ddbac3e95fc1b16b5515d3d29695d5a6e20ee4424e7240e6a309e8b89
 SHA512 
65950da1287bfa806109e29ff62b4416ac45754af37bb899e3be0acce31457ca687d22f43ce8d311310e8134fb214a04ebf99bca379f91db79b1dfa19137

diff --git a/net-proxy/haproxy/haproxy-2.8.1.ebuild 
b/net-proxy/haproxy/haproxy-2.8.1.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=( $(h

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-06-12 Thread Christian Ruppert

commit: 9e9f62e220480db75183f5df3bc9caef27581bc7
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Jun 12 13:29:53 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Jun 12 13:29:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9f62e2

net-proxy/haproxy: Bump to 2.2.30

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.2.30.ebuild | 185 
 2 files changed, 186 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 803709ebf4cd..1ae30827b831 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,6 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
+DIST haproxy-2.2.30.tar.gz 2974259 BLAKE2B 
fd506d4f449194ea3c72190f2d92233ba7bac04f9cc69173c0c1b95ba66658ddcaa49fca10737b5af5ad8bc4d5efcfd17e3209f703e9399093786c72647ddafb
 SHA512 
9c8486fac3794df97151468a1cbe26aa1fd07e1e9fd00f8adf35144e39eebe01795741e984891f0501184228ac431a3cf8676361aa9d8d415a58edabcc515c28
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227

diff --git a/net-proxy/haproxy/haproxy-2.2.30.ebuild 
b/net-proxy/haproxy/haproxy-2.2.30.ebuild
new file mode 100644
index ..6f386ae05520
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.30.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools +zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/libpcre2:=
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
+   )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? ( ${LUA_DEPS} )"
+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 "${FU

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-06-10 Thread Christian Ruppert

commit: 73c77a835f186255221324b6e3c60f69b89c7c5f
Author: Christian Ruppert  gentoo  org>
AuthorDate: Sat Jun 10 07:31:00 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Sat Jun 10 07:31:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c77a83

net-proxy/haproxy: Bump to 2.4.23 and 2.6.14

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   2 +
 net-proxy/haproxy/haproxy-2.4.23.ebuild | 190 
 net-proxy/haproxy/haproxy-2.6.14.ebuild | 190 
 3 files changed, 382 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 01749f0af380..803709ebf4cd 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,7 +2,9 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
+DIST haproxy-2.4.23.tar.gz 3652465 BLAKE2B 
271fd166365f5589653b6651d30306689e99710c27964e70a126469c3b9b616af2923be2276fc8c87362303388ee2bf28e80ca8bfa02dc45bc0e2d931e33e685
 SHA512 
d40203f9bf4f4a76dce09d0b1c785060d545dd8b7907b752d7fec9b12d7e2e4c2c7aca915d72c79e19040a75bd7d338c0783f9897cf1a46bdb047e336a0aa227
 DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6
 SHA512 
672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
+DIST haproxy-2.6.14.tar.gz 4067797 BLAKE2B 
20439faeca2c3e789542cf34d988f4de2ef643e7dd1214cad4cb2d70e39b047f32bd180cd8c410a4f7b17f7ed891938bf1b18e21d20bb41eef603ae99619810d
 SHA512 
5acfaffba8df65d4dbbc57cdb61fd4a9e415214ee2dc8dabc3877da5501c46f4abe64a4512999ebd391e03d38f8ed146fe8a6a5deb90197c5255325f8749a601
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700

diff --git a/net-proxy/haproxy/haproxy-2.4.23.ebuild 
b/net-proxy/haproxy/haproxy-2.4.23.ebuild
new file mode 100644
index ..291a00595e4a
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.23.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-06-07 Thread Christian Ruppert

commit: d0a1d189cafcfca052643bf941635e394bd6f8a0
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Jun  7 17:24:25 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Jun  7 17:24:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0a1d189

net-proxy/haproxy: Bump to 2.7.9

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.7.9.ebuild | 190 +
 2 files changed, 191 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 0f07ab6fa6e9..01749f0af380 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,4 +6,5 @@ DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca0274300
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
+DIST haproxy-2.7.9.tar.gz 4186553 BLAKE2B 
a2c7e92d008886ac5b5cf9f67be808bed68faea41b4bc25a3e5e187a4a2116bc37c40a5df9e2f640dba6c79caea39615eff434e904470e67d7703125a5ffc7e2
 SHA512 
774d0ae7a402fae0805706f4b88891162e18179f6ad9c2d0916ae30be2502409afdd11dfbbbce9b49564c7e14e8625e4a26751bbfc3b19e3e13ac12c8cc19495
 DIST haproxy-2.8.0.tar.gz 4328018 BLAKE2B 
a5382e153f08a315b7df7f92736aabad8e9d4cd0152a9178c448d1071440b88dbd723599fd3709d266f97eee4fa89d336a3390d70a0c4ab7f0b46e4ae713fa12
 SHA512 
4197e94df3d4ab8b27487146181335422358a097f7d50188b40ae23263c58ddeab6d17d9ed91e93d239a7fccec2fa58319e3f2cf07ac589c79fd78a3839c2b81

diff --git a/net-proxy/haproxy/haproxy-2.7.9.ebuild 
b/net-proxy/haproxy/haproxy-2.7.9.ebuild
new file mode 100644
index ..843fa7ff2a33
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.7.9.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   if use elibc_musl

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-05-31 Thread Christian Ruppert

commit: 7bd72bdd62230e3d78dfbe8ba6facf3374151d32
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed May 31 19:12:52 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed May 31 19:18:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd72bdd

net-proxy/haproxy: Get rid of vim-syntax flag

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.2.25.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.2.29.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.2..ebuild | 8 +++-
 net-proxy/haproxy/haproxy-2.4.18.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.4.22.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.4..ebuild | 8 +++-
 net-proxy/haproxy/haproxy-2.6.10.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.6.12.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.6.13.ebuild   | 8 +++-
 net-proxy/haproxy/haproxy-2.6.9.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.6..ebuild | 8 +++-
 net-proxy/haproxy/haproxy-2.7.3.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.7.4.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.7.6.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.7.7.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.7.8.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.7..ebuild | 8 +++-
 net-proxy/haproxy/haproxy-2.8.0.ebuild| 8 +++-
 net-proxy/haproxy/haproxy-2.8..ebuild | 8 +++-
 net-proxy/haproxy/haproxy-.ebuild | 8 +++-
 20 files changed, 60 insertions(+), 100 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.2.25.ebuild 
b/net-proxy/haproxy/haproxy-2.2.25.ebuild
index dc5155b408da..bec46c997025 100644
--- a/net-proxy/haproxy/haproxy-2.2.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.25.ebuild
@@ -26,7 +26,7 @@ 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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
lua? ( ${LUA_REQUIRED_USE} )
?? ( slz zlib )"
@@ -165,10 +165,8 @@ src_install() {
dodoc doc/seamless_reload.txt
fi
 
-   if use vim-syntax ; then
-   insinto /usr/share/vim/vimfiles/syntax
-   doins contrib/syntax-highlight/haproxy.vim
-   fi
+   insinto /usr/share/vim/vimfiles/syntax
+   doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {

diff --git a/net-proxy/haproxy/haproxy-2.2.29.ebuild 
b/net-proxy/haproxy/haproxy-2.2.29.ebuild
index 55877bc2b9f5..a1da00905684 100644
--- a/net-proxy/haproxy/haproxy-2.2.29.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.29.ebuild
@@ -26,7 +26,7 @@ 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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
lua? ( ${LUA_REQUIRED_USE} )
?? ( slz zlib )"
@@ -166,10 +166,8 @@ src_install() {
dodoc doc/seamless_reload.txt
fi
 
-   if use vim-syntax ; then
-   insinto /usr/share/vim/vimfiles/syntax
-   doins contrib/syntax-highlight/haproxy.vim
-   fi
+   insinto /usr/share/vim/vimfiles/syntax
+   doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {

diff --git a/net-proxy/haproxy/haproxy-2.2..ebuild 
b/net-proxy/haproxy/haproxy-2.2..ebuild
index 752bdc4828b3..6f386ae05520 100644
--- a/net-proxy/haproxy/haproxy-2.2..ebuild
+++ b/net-proxy/haproxy/haproxy-2.2..ebuild
@@ -26,7 +26,7 @@ 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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+ssl systemd +threads tools +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
lua? ( ${LUA_REQUIRED_USE} )
?? ( slz zlib )"
@@ -166,10 +166,8 @@ src_install() {
dodoc doc/seamless_reload.txt
fi
 
-   if use vim-syntax ; then
-   insinto /usr/share/vim/vimfiles/syntax
-   doins contrib/syntax-highlight/haproxy.vim
-   fi
+   insinto /usr/share/vim/vimfiles/syntax
+   doins contrib/syntax-highlight/haproxy.vim
 }
 
 pkg_postinst() {

diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild 
b/net-proxy/haproxy/haproxy-2.4.18.ebuild
index 883ab8118c3f..3cb34fca9462 100644
--- a/net-proxy/haproxy/haproxy-2.4.18.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.18.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pc

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-05-31 Thread Christian Ruppert

commit: f9e567f4236fb702e8c8dcc58d267e139c4561f4
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed May 31 19:17:56 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed May 31 19:18:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e567f4

net-proxy/haproxy: Cleanup old versions

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   5 -
 net-proxy/haproxy/haproxy-2.6.10.ebuild | 190 
 net-proxy/haproxy/haproxy-2.6.12.ebuild | 190 
 net-proxy/haproxy/haproxy-2.7.4.ebuild  | 190 
 net-proxy/haproxy/haproxy-2.7.6.ebuild  | 190 
 net-proxy/haproxy/haproxy-2.7.7.ebuild  | 190 
 6 files changed, 955 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ff604a7a942e..0f07ab6fa6e9 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,13 +2,8 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
-DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
-DIST haproxy-2.6.12.tar.gz 4060878 BLAKE2B 
c142ea24dfa8d68b8338ce46e326523c7568c5a99493f8418a6d0bd63e94e64a41f5843a017ca9140f0025c7d0baf3356099b32464d3d2046c9cdec20df42f6f
 SHA512 
95841a7379488bf9632151a07f64a1a10af578e41c2749bd5e832f61977e195e3efdbf381db59f56a966732bcbf89f1ccb559f0bf3c369e4462b8419a1e347a6
 DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6
 SHA512 
672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
-DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
-DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B 
f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3
 SHA512 
2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e
-DIST haproxy-2.7.7.tar.gz 4176633 BLAKE2B 
b52f5d6cf00bfd888e97a0da0d52d631ead9cb136a6952fdfaa84e6d3c9ee314a4385fef7ebc0537599c1b27f4ded9178801655d2503c279788ff07a35d55588
 SHA512 
22750713803a1c340a21211fa1f588ccc24a811fdf99c87c8bd18b00c35cbe3931a9e2bce17dd41a2adeb94fa804cbc0e847af9bb20457951c7b44d8d444164c
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
 DIST haproxy-2.8.0.tar.gz 432801

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-05-31 Thread Christian Ruppert

commit: 27a6c9ca6efc5f9a06e6b2ace94fe8a706a06ddb
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed May 31 18:59:04 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed May 31 19:18:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a6c9ca

net-proxy/haproxy: HAProxy 2.8

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|   1 +
 net-proxy/haproxy/haproxy-2.8.0.ebuild| 192 ++
 net-proxy/haproxy/haproxy-2.8..ebuild | 192 ++
 3 files changed, 385 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ce941f2c516e..ff604a7a942e 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -11,3 +11,4 @@ DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed
 DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B 
f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3
 SHA512 
2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e
 DIST haproxy-2.7.7.tar.gz 4176633 BLAKE2B 
b52f5d6cf00bfd888e97a0da0d52d631ead9cb136a6952fdfaa84e6d3c9ee314a4385fef7ebc0537599c1b27f4ded9178801655d2503c279788ff07a35d55588
 SHA512 
22750713803a1c340a21211fa1f588ccc24a811fdf99c87c8bd18b00c35cbe3931a9e2bce17dd41a2adeb94fa804cbc0e847af9bb20457951c7b44d8d444164c
 DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700
+DIST haproxy-2.8.0.tar.gz 4328018 BLAKE2B 
a5382e153f08a315b7df7f92736aabad8e9d4cd0152a9178c448d1071440b88dbd723599fd3709d266f97eee4fa89d336a3390d70a0c4ab7f0b46e4ae713fa12
 SHA512 
4197e94df3d4ab8b27487146181335422358a097f7d50188b40ae23263c58ddeab6d17d9ed91e93d239a7fccec2fa58319e3f2cf07ac589c79fd78a3839c2b81

diff --git a/net-proxy/haproxy/haproxy-2.8.0.ebuild 
b/net-proxy/haproxy/haproxy-2.8.0.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.8.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=( $(hapr

[gentoo-commits] repo/gentoo:master commit in: sys-firmware/nvidia-firmware/

2023-05-03 Thread Christian Ruppert

commit: 303c958b24b3512fa8379a6d7c215f2eeda33721
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed May  3 07:07:35 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed May  3 07:07:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303c958b

sys-firmware/nvidia-firmware: Python 3.11 support

Bug: https://bugs.gentoo.org/897298
Signed-off-by: Christian Ruppert  gentoo.org>

 sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild 
b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
index 86f2c762321b..ad2f4c625007 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit python-any-r1 unpacker

[gentoo-commits] repo/gentoo:master commit in: net-proxy/hatop/

2023-05-03 Thread Christian Ruppert

commit: 73595240115d1b46d227aab6d2a7fd00acd5df6d
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed May  3 07:04:31 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed May  3 07:04:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73595240

net-proxy/hatop: Python 3.11 support

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/hatop/hatop-0.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/hatop/hatop-0.8.2.ebuild 
b/net-proxy/hatop/hatop-0.8.2.ebuild
index 9dc0452c3aa8..e79b4979df73 100644
--- a/net-proxy/hatop/hatop-0.8.2.ebuild
+++ b/net-proxy/hatop/hatop-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-05-02 Thread Christian Ruppert

commit: d5425f18e2d1adfef006323dbaae4d59ec4bc358
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue May  2 14:20:05 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue May  2 14:20:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5425f18

net-proxy/haproxy: Bump to 2.6.13

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.6.13.ebuild | 192 
 2 files changed, 193 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 72d2dbbfa770..ce941f2c516e 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,6 +4,7 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
 DIST haproxy-2.6.12.tar.gz 4060878 BLAKE2B 
c142ea24dfa8d68b8338ce46e326523c7568c5a99493f8418a6d0bd63e94e64a41f5843a017ca9140f0025c7d0baf3356099b32464d3d2046c9cdec20df42f6f
 SHA512 
95841a7379488bf9632151a07f64a1a10af578e41c2749bd5e832f61977e195e3efdbf381db59f56a966732bcbf89f1ccb559f0bf3c369e4462b8419a1e347a6
+DIST haproxy-2.6.13.tar.gz 4065839 BLAKE2B 
5eed5e29d2121117866a1e7dde06ca02743001bd54f9b9a01c82c8c81e24686e3e24f5b8c291db12255d98b10f251b7f6e7612785130a8cf7fb68a0c7c5e28e6
 SHA512 
672b1c5cd373261865d03af1c5cc42d1f6ec672f08c8482185d17dca2bd7dbd1e83e65107bb0bf1eee33a7149d9d25cca3f2c90beeacb38ab2e3ab74e9bdc5ed
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397

diff --git a/net-proxy/haproxy/haproxy-2.6.13.ebuild 
b/net-proxy/haproxy/haproxy-2.6.13.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.13.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAIN

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-05-02 Thread Christian Ruppert

commit: 7c5452140ec3d28f46080a5b4b51551a73ea750e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue May  2 13:04:33 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue May  2 13:04:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c545214

net-proxy/haproxy: Bump to 2.7.8

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.7.8.ebuild | 192 +
 2 files changed, 193 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 277331ad79ea..72d2dbbfa770 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,3 +9,4 @@ DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
 DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B 
f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3
 SHA512 
2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e
 DIST haproxy-2.7.7.tar.gz 4176633 BLAKE2B 
b52f5d6cf00bfd888e97a0da0d52d631ead9cb136a6952fdfaa84e6d3c9ee314a4385fef7ebc0537599c1b27f4ded9178801655d2503c279788ff07a35d55588
 SHA512 
22750713803a1c340a21211fa1f588ccc24a811fdf99c87c8bd18b00c35cbe3931a9e2bce17dd41a2adeb94fa804cbc0e847af9bb20457951c7b44d8d444164c
+DIST haproxy-2.7.8.tar.gz 4176647 BLAKE2B 
2627c28fed6e760406a7eac824da1209a2f7473374e4b6dbce7995ac85ca888ee29e7554cfdea1f53841e90f53edad653124546173218366cd79565e3f197729
 SHA512 
00ea172faccb7a329a08baff1ba67345a233f94f2c0c388eb1446a8f00972a0fa77015645351ec80763f739889a24dcbfa5b0e92eec79fd310c0cafc88b5a700

diff --git a/net-proxy/haproxy/haproxy-2.7.8.ebuild 
b/net-proxy/haproxy/haproxy-2.7.8.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.7.8.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=(

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-04-27 Thread Christian Ruppert

commit: 5b4e4741fc714993ec40b7bb868321c1295ab355
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Apr 27 17:05:20 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Apr 27 17:05:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4e4741

net-proxy/haproxy: Bump to 2.7.7

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.7.7.ebuild | 192 +
 2 files changed, 193 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 120f0b30afae..277331ad79ea 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,3 +8,4 @@ DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669a
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
 DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B 
f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3
 SHA512 
2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e
+DIST haproxy-2.7.7.tar.gz 4176633 BLAKE2B 
b52f5d6cf00bfd888e97a0da0d52d631ead9cb136a6952fdfaa84e6d3c9ee314a4385fef7ebc0537599c1b27f4ded9178801655d2503c279788ff07a35d55588
 SHA512 
22750713803a1c340a21211fa1f588ccc24a811fdf99c87c8bd18b00c35cbe3931a9e2bce17dd41a2adeb94fa804cbc0e847af9bb20457951c7b44d8d444164c

diff --git a/net-proxy/haproxy/haproxy-2.7.7.ebuild 
b/net-proxy/haproxy/haproxy-2.7.7.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.7.7.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_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+=(

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-03-28 Thread Christian Ruppert

commit: 01a4b3bd561abba3433dfcef36dd09ff134add48
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Mar 28 13:42:24 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Mar 28 13:43:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a4b3bd

net-proxy/haproxy: Bump to 2.6.12

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest | 2 +-
 net-proxy/haproxy/{haproxy-2.6.11.ebuild => haproxy-2.6.12.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9e1bb9e31b83..120f0b30afae 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,7 +3,7 @@ DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df7
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
-DIST haproxy-2.6.11.tar.gz 4060392 BLAKE2B 
e198710f336156a45b1c751172b6a2fe545fd4c673a8eaf62f4c704080bad1b9a94e481ea17ceeab567964732a5e8bbc11f8d89b4b8cfc9c85fe35c90dbed8fc
 SHA512 
774ffb19dee2021c4b494757eed9b83c6f2ba554c453a911dcf73cf5f3507b0503af6c493923d1981cab2abaa686db5b9dd4500f541beacfe8e631cbb69b0056
+DIST haproxy-2.6.12.tar.gz 4060878 BLAKE2B 
c142ea24dfa8d68b8338ce46e326523c7568c5a99493f8418a6d0bd63e94e64a41f5843a017ca9140f0025c7d0baf3356099b32464d3d2046c9cdec20df42f6f
 SHA512 
95841a7379488bf9632151a07f64a1a10af578e41c2749bd5e832f61977e195e3efdbf381db59f56a966732bcbf89f1ccb559f0bf3c369e4462b8419a1e347a6
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397

diff --git a/net-proxy/haproxy/haproxy-2.6.11.ebuild 
b/net-proxy/haproxy/haproxy-2.6.12.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.6.11.ebuild
rename to net-proxy/haproxy/haproxy-2.6.12.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-03-28 Thread Christian Ruppert

commit: ff012866492d715d8c49a0b2ac742494a88ae0af
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Mar 28 09:00:15 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Mar 28 09:00:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff012866

net-proxy/haproxy: Bump to 2.7.6

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest   | 2 +-
 net-proxy/haproxy/{haproxy-2.7.5.ebuild => haproxy-2.7.6.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 89ed78ad0c4c..9e1bb9e31b83 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -7,4 +7,4 @@ DIST haproxy-2.6.11.tar.gz 4060392 BLAKE2B 
e198710f336156a45b1c751172b6a2fe545fd
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
-DIST haproxy-2.7.5.tar.gz 4160630 BLAKE2B 
fd4fc130cee82d82935de5c3eb0fafe68b99ddada36ff9bb4418927d11713f1b77894cefc099ce3782d431238902a1bb298c59346bb4acd95caa83f3fbd8e39c
 SHA512 
6d29140d7fbbac5f8f0615f180906df33e4138d661ddca3df209091d59197b65093f44493fd093038ee36ea6a99faaed043e8c2f6fd199d7825aeb8b3879730f
+DIST haproxy-2.7.6.tar.gz 4162978 BLAKE2B 
f85dcccb4ad245c557cb7af84b93f825784247b5734d26720a9255c81b07062ca7d42c65096f13b0336a9684311879ffb379e9d0ab63b4bd0d9aaf674dadc0e3
 SHA512 
2e4227de737361a8176358c755809669feed6860eba2f2f285e96095eba54e8b0d1dcae0b952f31ecf88632636175088afe8cd1457bc758eeea350b8e973062e

diff --git a/net-proxy/haproxy/haproxy-2.7.5.ebuild 
b/net-proxy/haproxy/haproxy-2.7.6.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.7.5.ebuild
rename to net-proxy/haproxy/haproxy-2.7.6.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-03-21 Thread Christian Ruppert

commit: d33e87641586aec4a90e8d086ffe5771c83d90ef
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Mar 21 08:44:43 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Mar 21 08:44:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d33e8764

net-proxy/haproxy: Bumps to 2.6.11 and 2.7.5

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   2 +
 net-proxy/haproxy/haproxy-2.6.11.ebuild | 192 
 net-proxy/haproxy/haproxy-2.7.5.ebuild  | 192 
 3 files changed, 386 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index c0364cf66f70..89ed78ad0c4c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,6 +3,8 @@ DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df7
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
+DIST haproxy-2.6.11.tar.gz 4060392 BLAKE2B 
e198710f336156a45b1c751172b6a2fe545fd4c673a8eaf62f4c704080bad1b9a94e481ea17ceeab567964732a5e8bbc11f8d89b4b8cfc9c85fe35c90dbed8fc
 SHA512 
774ffb19dee2021c4b494757eed9b83c6f2ba554c453a911dcf73cf5f3507b0503af6c493923d1981cab2abaa686db5b9dd4500f541beacfe8e631cbb69b0056
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
 DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397
+DIST haproxy-2.7.5.tar.gz 4160630 BLAKE2B 
fd4fc130cee82d82935de5c3eb0fafe68b99ddada36ff9bb4418927d11713f1b77894cefc099ce3782d431238902a1bb298c59346bb4acd95caa83f3fbd8e39c
 SHA512 
6d29140d7fbbac5f8f0615f180906df33e4138d661ddca3df209091d59197b65093f44493fd093038ee36ea6a99faaed043e8c2f6fd199d7825aeb8b3879730f

diff --git a/net-proxy/haproxy/haproxy-2.6.11.ebuild 
b/net-proxy/haproxy/haproxy-2.6.11.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.11.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-03-13 Thread Christian Ruppert

commit: ecf1156d242334cf3d3d75989d2dc9180e064813
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Mar 13 12:06:53 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Mar 13 12:06:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf1156d

net-proxy/haproxy: Bumps to 2.6.10 and 2.7.4

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   2 +
 net-proxy/haproxy/haproxy-2.6.10.ebuild | 192 
 net-proxy/haproxy/haproxy-2.7.4.ebuild  | 192 
 3 files changed, 386 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 67be8c677f82..c0364cf66f70 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,5 +2,7 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
+DIST haproxy-2.6.10.tar.gz 4056147 BLAKE2B 
10e54b324826b99f8873e528368519d8cdf758a8796623852bcb8a2fdf2ab28259e1c60e5705041563bcdb5498b4ace72052d646586ab3627a0e444a100340e2
 SHA512 
3f07c3b3e33402e26334682612ada1ddc5feae8cd99fda52a521847baf417d7979d609d94eb34abcc97055cdca248bbf0df297bb7d16a2bd72f78cbe5933d5d3
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
+DIST haproxy-2.7.4.tar.gz 4154182 BLAKE2B 
16c32de742b0782389e62f5f0e737a50ff42ed8ed37c9d912d22e84f2dc3d68af112015e3774f7f583b73ef3c724171a5d18e55bfa957e55947555a49d9c14ba
 SHA512 
c15be0a59ab86e9793ab0e20728f6f4e4b9d4e6fbaaa1839e25ba26efc4ee0cef0a0123ca5901dd25559213eadb5d2745dbbd2d937f7077fbfc883f44a29b397

diff --git a/net-proxy/haproxy/haproxy-2.6.10.ebuild 
b/net-proxy/haproxy/haproxy-2.6.10.ebuild
new file mode 100644
index ..7c18e82dbedb
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.10.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/

2023-02-14 Thread Christian Ruppert

commit: 8eceece0888e0788c3829c998d3ce7f1e2c72e83
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Feb 14 16:05:33 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Feb 14 16:13:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8eceece0

net-proxy/haproxy: Bumps to fix CVE-2023-25725

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |  8 ++--
 net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch  | 49 --
 ...haproxy-2.2.28.ebuild => haproxy-2.2.29.ebuild} |  0
 ...haproxy-2.4.21.ebuild => haproxy-2.4.22.ebuild} |  1 -
 .../{haproxy-2.7.2.ebuild => haproxy-2.6.9.ebuild} |  1 -
 .../{haproxy-2.6.8.ebuild => haproxy-2.7.3.ebuild} |  1 -
 6 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 5e780660c0bb..334f154ec05d 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,6 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.2.28.tar.gz 2969396 BLAKE2B 
65e3ee6bf3afbbb64cd989fd693a1bf1c471a90da8e44a531d7beebd38b0fcc748abdd0bbc7d89cc42c28b87fe56a63c5924e153e19f4d951537652aab6ea17d
 SHA512 
4f815e2628d6401ca6469418f85aef540f904f6788a801b2bdfe028a29534e1bee542527ad4ecde95409429f84b95d0db4208512c916aa27590495de6e64e385
+DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
-DIST haproxy-2.4.21.tar.gz 3648019 BLAKE2B 
bdccbcb546f889f02fccf1f56befa644d2b82f5d63820069e7966457142f35519390ce6f64e4ba9f3ba507bcbcc0ec1a3300d01c58a788d97a1f81ae79adf2d4
 SHA512 
e50a8d5e7ee2ed389c1b53c0f6363f4a68a941122d8fcbe185f65bf0a1610c0f2243b7a534fd2a11687e59de37591d200aa54d7cc9dcc260fa0687429db865bc
-DIST haproxy-2.6.8.tar.gz 4041517 BLAKE2B 
1f3fe78e04565440f6a578ec15a436df4857ecbf0256333df8c195f2ce7fc4c7d522be8a7bdbaadc882c0f02ee2b4af543b4bf236d63994a8699c829cc9c6b28
 SHA512 
b5c126c6e0249ebd461bd1a98c63f821392a665f0ae2c6cb1527becb5e1be6326121680f17b6f96785e9a7bd6b5bc6789091eb21cb7c2fc7b88cd6a87b12
-DIST haproxy-2.7.2.tar.gz 4130348 BLAKE2B 
97cd3a28c64b1fe0b14976f29a7b2f07e10dfb6a2abfe0c8baaced58a706f54e0c8bcbd8da1a8f3741e72bc2f59fea37ea16297f996906cac039662d19b062e8
 SHA512 
0746f715b9f0acce3c5eb6ade6f201f21806ee51cdd3da453cf32c7e36fab772a74b4a476ed80f1176fe29a0c706479017cfeb8850d53fc6ad2ee40da66ba1e1
+DIST haproxy-2.4.22.tar.gz 1507328 BLAKE2B 
4eec8b2f5a323390306eaea05807120859141817feb982b50758e2ecdf23b36f0992bd23d30eb2d86c1460609e84f6ec352f576d2d4261c498fd1b312c8368ec
 SHA512 
27220adc865b372935c05dddeb54a39b453c18ec63b953cf7d03a529a9fc895fce9ce0b6dc3b5bbe4b27b57b3e8a0f22e80c564e4c737359085e9b12e30bc82c
+DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
+DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758

diff --git a/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch 
b/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
deleted file mode 100644
index f744eccfaba9..
--- a/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 494ae0c35c883632faf1d22b54083d3e97a7c129 Mon Sep 17 00:00:00 2001
-From: Aurelien DARRAGON 
-Date: Wed, 25 Jan 2023 16:35:00 +0100
-Subject: [PATCH] DEV: hpack: fix `trash` build regression
-
-Since 7d84439 ("BUILD: hpack: include global.h for the trash that is needed
-in debug mode"), hpack decode tool fails to compile on targets that enable
-USE_THREAD. (ie: linux-glibc target as reported by Christian Ruppert)
-
-When building hpack devtool, we are including src/hpack-dec.c as a dependency.
-src/hpack-dec.c relies on the global trash whe debug mode is enable

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/

2023-02-14 Thread Christian Ruppert

commit: 5440524943be3eef14c2912ae789fa2b61e75380
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Feb 14 16:13:14 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Feb 14 16:13:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54405249

net-proxy/haproxy: Fix 2.4.22 re https://github.com/haproxy/haproxy/issues/2009

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |  2 +-
 net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch | 49 ++
 net-proxy/haproxy/haproxy-2.4.22.ebuild|  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 334f154ec05d..67be8c677f82 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,6 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
 DIST haproxy-2.2.29.tar.gz 2969963 BLAKE2B 
c921c5d06ec5d6c19e1b0d62bca27cfc80df76ec2f25e1c96c4703dc8e55baf2cd112d0ae0ccec298809fe7e4258a5f682768849757b8754b73f83e0b1a4a4fe
 SHA512 
066affb96d46de9c323e53cb3766f5eafa4f34f2403107d5d056588462c59b8340fb0e33acebd560e016d695b4423f61b9c42ea2b08d1754448e9919a4c6865f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
-DIST haproxy-2.4.22.tar.gz 1507328 BLAKE2B 
4eec8b2f5a323390306eaea05807120859141817feb982b50758e2ecdf23b36f0992bd23d30eb2d86c1460609e84f6ec352f576d2d4261c498fd1b312c8368ec
 SHA512 
27220adc865b372935c05dddeb54a39b453c18ec63b953cf7d03a529a9fc895fce9ce0b6dc3b5bbe4b27b57b3e8a0f22e80c564e4c737359085e9b12e30bc82c
+DIST haproxy-2.4.22.tar.gz 3648716 BLAKE2B 
b030faa8fb5e906494a8faeda8ee6a4496ed78dbaabb391a8b7020e5ef66803c4cf14438516435af84237352cca982a724857b61d033a1aa4dfa0ea5248f5b77
 SHA512 
c22ad38046e3c70beb3bf57a62e4e74db329559059e2f36d2f801768c26b1f1222631702e83e9839fab4396c1b78089a807750ff743b4192da06c751cf9f0779
 DIST haproxy-2.6.9.tar.gz 4045208 BLAKE2B 
e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77
 SHA512 
24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
 DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B 
a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a
 SHA512 
f92d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758

diff --git a/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch 
b/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch
new file mode 100644
index ..f744eccfaba9
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch
@@ -0,0 +1,49 @@
+From 494ae0c35c883632faf1d22b54083d3e97a7c129 Mon Sep 17 00:00:00 2001
+From: Aurelien DARRAGON 
+Date: Wed, 25 Jan 2023 16:35:00 +0100
+Subject: [PATCH] DEV: hpack: fix `trash` build regression
+
+Since 7d84439 ("BUILD: hpack: include global.h for the trash that is needed
+in debug mode"), hpack decode tool fails to compile on targets that enable
+USE_THREAD. (ie: linux-glibc target as reported by Christian Ruppert)
+
+When building hpack devtool, we are including src/hpack-dec.c as a dependency.
+src/hpack-dec.c relies on the global trash whe debug mode is enabled.
+But as we're building hpack tool with a limited scope of haproxy
+sources, global trash (which is declared in src/chunk.c) is not available.
+Thus, src/hpack-dec.c relies on a local 'trash' variable declared within
+dev/hpack/decode.c
+
+This used to work fine until 7d84439.
+But now that global.h is explicitely included in src/hpack-dec.c,
+trash variable definition from decode.c conflicts with the one from global.h:
+
+  In file included from include/../src/hpack-dec.c:35,
+   from dev/hpack/decode.c:87:
+  include/haproxy/global.h:52:35: error: thread-local declaration of 'trash' 
follows non-thread-local declaration
+ 52 | extern THREAD_LOCAL struct buffer trash;
+
+Adding THREAD_LOCAL attribute to 'decode.c' local trash variable definition
+makes the compiler happy again.
+
+This should fix GH issue #2009
+---
+ dev/hpack/decode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dev/hpack/decode.c b/dev/hpack/decode.c
+index ae825120f..13c95c77a 100644
+--- a/dev/hpack/decode.c
 b/dev/hpack/decode.c
+@@ -30,7 +30,7 @@ uint

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-02-14 Thread Christian Ruppert

commit: ce5c1596f59b22a6c201f07846e6c984fe33c953
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Feb 14 08:26:57 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Feb 14 08:27:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5c1596

net-proxy/haproxy: Cleanup + drop 2.5 due to EoL soon

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|   4 -
 net-proxy/haproxy/haproxy-2.2.27.ebuild   | 182 -
 net-proxy/haproxy/haproxy-2.5.11.ebuild   | 188 --
 net-proxy/haproxy/haproxy-2.5.8.ebuild| 177 
 net-proxy/haproxy/haproxy-2.5..ebuild | 187 -
 net-proxy/haproxy/haproxy-2.6.7.ebuild| 187 -
 6 files changed, 925 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index a538b6288f38..5e780660c0bb 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,10 +1,6 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.2.27.tar.gz 2969395 BLAKE2B 
6d7d945fc7cde1f2dd9a6d2a8d9ac618e6ca267aa9513ecad3042fddb5bc4b453bbe069dd8d52884d0ba00525a68a271abea29765733a1cceb8a93f6e0ca814f
 SHA512 
430eee9a85290f95f0e002500fe545e6fd78e22e644e2c8091227a437c840b2313ccd513d7c225031c684cc929ee46a908a69e20d311ebeeb175d85686a767e4
 DIST haproxy-2.2.28.tar.gz 2969396 BLAKE2B 
65e3ee6bf3afbbb64cd989fd693a1bf1c471a90da8e44a531d7beebd38b0fcc748abdd0bbc7d89cc42c28b87fe56a63c5924e153e19f4d951537652aab6ea17d
 SHA512 
4f815e2628d6401ca6469418f85aef540f904f6788a801b2bdfe028a29534e1bee542527ad4ecde95409429f84b95d0db4208512c916aa27590495de6e64e385
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.21.tar.gz 3648019 BLAKE2B 
bdccbcb546f889f02fccf1f56befa644d2b82f5d63820069e7966457142f35519390ce6f64e4ba9f3ba507bcbcc0ec1a3300d01c58a788d97a1f81ae79adf2d4
 SHA512 
e50a8d5e7ee2ed389c1b53c0f6363f4a68a941122d8fcbe185f65bf0a1610c0f2243b7a534fd2a11687e59de37591d200aa54d7cc9dcc260fa0687429db865bc
-DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 
657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3
 SHA512 
11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e
-DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 
3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d
 SHA512 
d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
 DIST haproxy-2.6.8.tar.gz 4041517 BLAKE2B 
1f3fe78e04565440f6a578ec15a436df4857ecbf0256333df8c195f2ce7fc4c7d522be8a7bdbaadc882c0f02ee2b4af543b4bf236d63994a8699c829cc9c6b28
 SHA512 
b5c126c6e0249ebd461bd1a98c63f821392a665f0ae2c6cb1527becb5e1be6326121680f17b6f96785e9a7bd6b5bc6789091eb21cb7c2fc7b88cd6a87b12
 DIST haproxy-2.7.2.tar.gz 4130348 BLAKE2B 
97cd3a28c64b1fe0b14976f29a7b2f07e10dfb6a2abfe0c8baaced58a706f54e0c8bcbd8da1a8f3741e72bc2f59fea37ea16297f996906cac039662d19b062e8
 SHA512 
0746f715b9f0acce3c5eb6ade6f201f21806ee51cdd3da453cf32c7e36fab772a74b4a476ed80f1176fe29a0c706479017cfeb8850d53fc6ad2ee40da66ba1e1

diff --git a/net-proxy/haproxy/haproxy-2.2.27.ebuild 
b/net-proxy/haproxy/haproxy-2.2.27.ebuild
deleted file mode 100644
index 5a6ecbd9677d..
--- a/net-proxy/haproxy/haproxy-2.2.27.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
-   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/

2023-02-13 Thread Christian Ruppert

commit: fe7293b8570b8fdd206764ffa04e9f568b7fd010
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Fri Feb 10 18:47:45 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Feb 13 09:01:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7293b8

net-proxy/haproxy: remove unused file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29538
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy.initd-r7 | 85 
 1 file changed, 85 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy.initd-r7 
b/net-proxy/haproxy/files/haproxy.initd-r7
deleted file mode 100644
index 95f27d676b6c..
--- a/net-proxy/haproxy/files/haproxy.initd-r7
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-command="/usr/sbin/haproxy"
-
-pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
-
-configs=
-
-if [ -z "${CONFIGS}" ]; then
-   if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
-   CONFIGS=/etc/haproxy/${SVCNAME}.cfg
-   elif [ -f "/etc/${SVCNAME}.cfg" ]; then
-   CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
-   fi
-fi
-
-for conf in $CONFIGS; do
-   configs="${configs} -f ${conf}"
-done
-
-command_args="-D -W -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
-
-depend() {
-   need net
-   use dns logger
-}
-
-checkconfig() {
-   if [ -z "${CONFIGS}" ]; then
-   eerror "No config(s) has been specified"
-   return 1
-   fi
-
-   for conf in $CONFIGS; do
-   if [ ! -f "${conf}" ]; then
-   eerror "${conf} does not exist!"
-   return 1
-   fi
-   done
-
-   ebegin "Checking ${CONFIGS}"
-   $command -q -c $configs $HAPROXY_OPTS
-   eend $?
-}
-
-start_pre() {
-   if [ "${RC_CMD}" != "restart" ]; then
-   checkconfig || return 1
-   fi
-}
-
-stop_pre() {
-   if [ "${RC_CMD}" = "restart" ]; then
-   checkconfig || return 1
-   fi
-}
-
-stop() {
-   local _t _pid
-
-   _t="$(mktemp)"
-   for _pid in $(cat ${pidfile}) ; do
-   echo "${_pid}" > "${_t}"
-   start-stop-daemon --stop --pidfile="${_t}"
-   done
-   rm -f "${_t}"
-}
-
-reload() {
-   checkconfig || { eerror "Reloading failed, please fix your config(s) 
first"; return 1; }
-
-   if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
-   einfo "Calling user-defined reload_seamless()"
-   reload_seamless || { eerror "reload_seamless() failed!"; return 
1; }
-   fi
-
-   ebegin "Reloading ${SVCNAME}"
-   $command -D -p "${pidfile}" $configs $HAPROXY_OPTS -sf $(cat 
"${pidfile}")
-   eend $?
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-02-08 Thread Christian Ruppert

commit: de93e36d97c7d167ffe41f74a8f3a15ea3f9e00b
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Feb  8 10:51:57 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Feb  8 10:53:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de93e36d

net-proxy/haproxy: Cleanup

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   7 --
 net-proxy/haproxy/haproxy-2.2.26.ebuild | 182 ---
 net-proxy/haproxy/haproxy-2.4.19.ebuild | 187 
 net-proxy/haproxy/haproxy-2.4.20.ebuild | 187 
 net-proxy/haproxy/haproxy-2.5.10.ebuild | 187 
 net-proxy/haproxy/haproxy-2.5.7.ebuild  | 177 --
 net-proxy/haproxy/haproxy-2.6.6.ebuild  | 187 
 net-proxy/haproxy/haproxy-2.7.1.ebuild  | 187 
 8 files changed, 1301 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 44958d999376..681cc9eb2517 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,16 +1,9 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.2.26.tar.gz 2962273 BLAKE2B 
3e998657db2bf0410f487ffe87d2f14eaabeb0c19e34d14870523bac9df564f5b00a88cc66fae681f9886a9ab7953a33f8e74bcd23d72b02019a2752994a57d2
 SHA512 
f109287d5c83c9fed716544dd23c7d7196533d1d664222688c0cbda1ab677cd9dd4cd0b30264052a3a05c928efff6ee83aa93151604e6f608732ce21a48c91f3
 DIST haproxy-2.2.27.tar.gz 2969395 BLAKE2B 
6d7d945fc7cde1f2dd9a6d2a8d9ac618e6ca267aa9513ecad3042fddb5bc4b453bbe069dd8d52884d0ba00525a68a271abea29765733a1cceb8a93f6e0ca814f
 SHA512 
430eee9a85290f95f0e002500fe545e6fd78e22e644e2c8091227a437c840b2313ccd513d7c225031c684cc929ee46a908a69e20d311ebeeb175d85686a767e4
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
-DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
-DIST haproxy-2.4.20.tar.gz 3640093 BLAKE2B 
45c6b9d22628c34177154900a85d303392b4de4c9fc74db64fed7bd31bc64df5ca6c853c393a59afbd762c0f96b27c54717ca7d89bc46e336678574f333bbccc
 SHA512 
dbd3a025627b2115f9e16cf8d2774138049760aa89ad235e7c7f0fa7c706e6bd83cb41be0e597c70948825fa90f968579ca8ab35f7a435a4ea18dbbea72405d7
 DIST haproxy-2.4.21.tar.gz 3648019 BLAKE2B 
bdccbcb546f889f02fccf1f56befa644d2b82f5d63820069e7966457142f35519390ce6f64e4ba9f3ba507bcbcc0ec1a3300d01c58a788d97a1f81ae79adf2d4
 SHA512 
e50a8d5e7ee2ed389c1b53c0f6363f4a68a941122d8fcbe185f65bf0a1610c0f2243b7a534fd2a11687e59de37591d200aa54d7cc9dcc260fa0687429db865bc
-DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
 DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 
657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3
 SHA512 
11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e
-DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
 DIST haproxy-2.6.7.tar.gz 402835

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-02-08 Thread Christian Ruppert

commit: 5d4ac069b3b4997298a6dcad01b8f6f6a241bb1e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Feb  8 10:53:02 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Feb  8 10:53:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d4ac069

net-proxy/haproxy: Bump to 2.2.28

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.2.28.ebuild | 182 
 2 files changed, 183 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 681cc9eb2517..a538b6288f38 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,6 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
 DIST haproxy-2.2.27.tar.gz 2969395 BLAKE2B 
6d7d945fc7cde1f2dd9a6d2a8d9ac618e6ca267aa9513ecad3042fddb5bc4b453bbe069dd8d52884d0ba00525a68a271abea29765733a1cceb8a93f6e0ca814f
 SHA512 
430eee9a85290f95f0e002500fe545e6fd78e22e644e2c8091227a437c840b2313ccd513d7c225031c684cc929ee46a908a69e20d311ebeeb175d85686a767e4
+DIST haproxy-2.2.28.tar.gz 2969396 BLAKE2B 
65e3ee6bf3afbbb64cd989fd693a1bf1c471a90da8e44a531d7beebd38b0fcc748abdd0bbc7d89cc42c28b87fe56a63c5924e153e19f4d951537652aab6ea17d
 SHA512 
4f815e2628d6401ca6469418f85aef540f904f6788a801b2bdfe028a29534e1bee542527ad4ecde95409429f84b95d0db4208512c916aa27590495de6e64e385
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.21.tar.gz 3648019 BLAKE2B 
bdccbcb546f889f02fccf1f56befa644d2b82f5d63820069e7966457142f35519390ce6f64e4ba9f3ba507bcbcc0ec1a3300d01c58a788d97a1f81ae79adf2d4
 SHA512 
e50a8d5e7ee2ed389c1b53c0f6363f4a68a941122d8fcbe185f65bf0a1610c0f2243b7a534fd2a11687e59de37591d200aa54d7cc9dcc260fa0687429db865bc
 DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 
657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3
 SHA512 
11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e

diff --git a/net-proxy/haproxy/haproxy-2.2.28.ebuild 
b/net-proxy/haproxy/haproxy-2.2.28.ebuild
new file mode 100644
index ..5a6ecbd9677d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.28.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/libpcre2:=
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
+   )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? ( ${LUA_DEPS} )"
+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 )) &a

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-01-27 Thread Christian Ruppert

commit: b728d3e0c0406c8246e8666f5ef0a2af6224c9d7
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Jan 27 14:25:43 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Jan 27 14:25:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b728d3e0

net-proxy/haproxy: Bump to 2.2.27 and 2.4.21

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   2 +
 net-proxy/haproxy/haproxy-2.2.27.ebuild | 182 +++
 net-proxy/haproxy/haproxy-2.4.21.ebuild | 188 
 3 files changed, 372 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index a5ab90ddcfac..44958d999376 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,8 +1,10 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
 DIST haproxy-2.2.26.tar.gz 2962273 BLAKE2B 
3e998657db2bf0410f487ffe87d2f14eaabeb0c19e34d14870523bac9df564f5b00a88cc66fae681f9886a9ab7953a33f8e74bcd23d72b02019a2752994a57d2
 SHA512 
f109287d5c83c9fed716544dd23c7d7196533d1d664222688c0cbda1ab677cd9dd4cd0b30264052a3a05c928efff6ee83aa93151604e6f608732ce21a48c91f3
+DIST haproxy-2.2.27.tar.gz 2969395 BLAKE2B 
6d7d945fc7cde1f2dd9a6d2a8d9ac618e6ca267aa9513ecad3042fddb5bc4b453bbe069dd8d52884d0ba00525a68a271abea29765733a1cceb8a93f6e0ca814f
 SHA512 
430eee9a85290f95f0e002500fe545e6fd78e22e644e2c8091227a437c840b2313ccd513d7c225031c684cc929ee46a908a69e20d311ebeeb175d85686a767e4
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
 DIST haproxy-2.4.20.tar.gz 3640093 BLAKE2B 
45c6b9d22628c34177154900a85d303392b4de4c9fc74db64fed7bd31bc64df5ca6c853c393a59afbd762c0f96b27c54717ca7d89bc46e336678574f333bbccc
 SHA512 
dbd3a025627b2115f9e16cf8d2774138049760aa89ad235e7c7f0fa7c706e6bd83cb41be0e597c70948825fa90f968579ca8ab35f7a435a4ea18dbbea72405d7
+DIST haproxy-2.4.21.tar.gz 3648019 BLAKE2B 
bdccbcb546f889f02fccf1f56befa644d2b82f5d63820069e7966457142f35519390ce6f64e4ba9f3ba507bcbcc0ec1a3300d01c58a788d97a1f81ae79adf2d4
 SHA512 
e50a8d5e7ee2ed389c1b53c0f6363f4a68a941122d8fcbe185f65bf0a1610c0f2243b7a534fd2a11687e59de37591d200aa54d7cc9dcc260fa0687429db865bc
 DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
 DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 
657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3
 SHA512 
11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9

diff --git a/net-proxy/haproxy/haproxy-2.2.27.ebuild 
b/net-proxy/haproxy/haproxy-2.2.27.ebuild
new file mode 100644
index ..5a6ecbd9677d
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.27.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   EGIT_REPO_URI="https:

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/, net-proxy/haproxy/files/

2023-01-26 Thread Christian Ruppert

commit: de0ae9f5165b5c8cf2d542d9655f546dc802fbe4
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Jan 26 08:47:19 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Jan 26 08:47:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0ae9f5

net-proxy/haproxy: Bump to 2.5.11, 2.6.8 and also fix hpack compiling

Bug: https://bugs.gentoo.org/891859
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |  2 +
 net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch  | 49 ++
 ...{haproxy-2.7.2.ebuild => haproxy-2.5.11.ebuild} |  5 ++-
 .../{haproxy-2.7.2.ebuild => haproxy-2.6.8.ebuild} |  1 +
 net-proxy/haproxy/haproxy-2.7.2.ebuild |  1 +
 5 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4fccbe9fd80a..a5ab90ddcfac 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,9 +4,11 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
 DIST haproxy-2.4.20.tar.gz 3640093 BLAKE2B 
45c6b9d22628c34177154900a85d303392b4de4c9fc74db64fed7bd31bc64df5ca6c853c393a59afbd762c0f96b27c54717ca7d89bc46e336678574f333bbccc
 SHA512 
dbd3a025627b2115f9e16cf8d2774138049760aa89ad235e7c7f0fa7c706e6bd83cb41be0e597c70948825fa90f968579ca8ab35f7a435a4ea18dbbea72405d7
 DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
+DIST haproxy-2.5.11.tar.gz 3860869 BLAKE2B 
657651c6e9a3fa03cfa932d50e6cc72023973531685bccb3690f9458437bcf5a9da81faf0e7cd35bacb4747f5cf2a0b7250e8355d5b849129ea58b41cf0beed3
 SHA512 
11f63ddc590823b312819e1baa5a05fac97bdcf20ea36de5ff9cbc0c8b18ef81954492b6ef4ca7a3e93848ea81543edfa9bc3a27e48b517b60f0da589ec9005e
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
 DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 
3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d
 SHA512 
d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
+DIST haproxy-2.6.8.tar.gz 4041517 BLAKE2B 
1f3fe78e04565440f6a578ec15a436df4857ecbf0256333df8c195f2ce7fc4c7d522be8a7bdbaadc882c0f02ee2b4af543b4bf236d63994a8699c829cc9c6b28
 SHA512 
b5c126c6e0249ebd461bd1a98c63f821392a665f0ae2c6cb1527becb5e1be6326121680f17b6f96785e9a7bd6b5bc6789091eb21cb7c2fc7b88cd6a87b12
 DIST haproxy-2.7.1.tar.gz 4120306 BLAKE2B 
aa9e6273468e07b91efb8ecedcf06f2bdcb0ba7949ba710bf94d23a59987031be0f94d78a3efa707fbaba711773db76516f76e1cdc2a92b1eaeac0786e1b8663
 SHA512 
89df867b2f052618480d1e28293e8460c31fa250c2af1a452f8fce627fd2c69c929bcfd5d68399fd02ebbf77301b0ff34a58a64fe73f034a234491c3e4d2
 DIST haproxy-2.7.2.tar.gz 4130348 BLAKE2B 
97cd3a28c64b1fe0b14976f29a7b2f07e10dfb6a2abfe0c8baaced58a706f54e0c8bcbd8da1a8f3741e72bc2f59fea37ea16297f996906cac039662d19b062e8
 SHA512 
0746f715b9f0acce3c5eb6ade6f201f21806ee51cdd3da453cf32c7e36fab772a74b4a476ed80f1176fe29a0c706479017cfeb8850d53fc6ad2ee40da66ba1e1

diff --git a/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch 
b/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
new file mode 100644
index ..f744eccfaba9
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-2.7.2-hpack.patch
@@ -0,0 +1,49 @@
+From 494ae0c35c883632faf1d22b54083d3e97a7c129 Mon Sep 17 00:00:00 2001
+From: Aurelien DARRAGON 
+Date: Wed, 25 Jan 2023 16:35:00 +0100
+Subject: [PATCH] DEV: hpack: fix `trash` build regression
+

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2023-01-23 Thread Christian Ruppert

commit: c2630684b137527773aa47de45803304183db9da
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Jan 23 08:05:06 2023 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Jan 23 08:05:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2630684

net-proxy/haproxy: Bump to 2.7.2

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.7.2.ebuild | 187 +
 2 files changed, 188 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4baeb81a6564..4fccbe9fd80a 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,3 +9,4 @@ DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a3
 DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
 DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 
3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d
 SHA512 
d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
 DIST haproxy-2.7.1.tar.gz 4120306 BLAKE2B 
aa9e6273468e07b91efb8ecedcf06f2bdcb0ba7949ba710bf94d23a59987031be0f94d78a3efa707fbaba711773db76516f76e1cdc2a92b1eaeac0786e1b8663
 SHA512 
89df867b2f052618480d1e28293e8460c31fa250c2af1a452f8fce627fd2c69c929bcfd5d68399fd02ebbf77301b0ff34a58a64fe73f034a234491c3e4d2
+DIST haproxy-2.7.2.tar.gz 4130348 BLAKE2B 
97cd3a28c64b1fe0b14976f29a7b2f07e10dfb6a2abfe0c8baaced58a706f54e0c8bcbd8da1a8f3741e72bc2f59fea37ea16297f996906cac039662d19b062e8
 SHA512 
0746f715b9f0acce3c5eb6ade6f201f21806ee51cdd3da453cf32c7e36fab772a74b4a476ed80f1176fe29a0c706479017cfeb8850d53fc6ad2ee40da66ba1e1

diff --git a/net-proxy/haproxy/haproxy-2.7.2.ebuild 
b/net-proxy/haproxy/haproxy-2.7.2.ebuild
new file mode 100644
index ..83227697a6a5
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.7.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   # 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+=( $(hap

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/

2022-12-28 Thread Christian Ruppert

commit: 16a34069d260ef001af09be5625853c9917c01bd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Dec 27 17:12:06 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Dec 28 08:16:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a34069

net-proxy/haproxy: remove unused patch/file

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28855
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy-lua54.patch | 63 -
 net-proxy/haproxy/files/haproxy.initd-r6| 85 -
 2 files changed, 148 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy-lua54.patch 
b/net-proxy/haproxy/files/haproxy-lua54.patch
deleted file mode 100644
index c89310120ab8..
--- a/net-proxy/haproxy/files/haproxy-lua54.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 4634eb54a7dbfb38b0d2db8282ce281aa9ff5296 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert 
-Date: Tue, 28 Jun 2022 10:03:00 +0200
-Subject: [PATCH] Add Lua 5.4 autodetect
-
-This patch is based on:
-https://www.mail-archive.com/haproxy@formilux.org/msg39689.html
-Thanks to Callum Farmer!
-
-Signed-off-by: Christian Ruppert 

- INSTALL  | 6 +++---
- Makefile | 8 
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/INSTALL b/INSTALL
-index 96936ea46..9269051af 100644
 a/INSTALL
-+++ b/INSTALL
-@@ -324,9 +324,9 @@ Lua is an embedded programming language supported by 
HAProxy to provide more
- advanced scripting capabilities. Only versions 5.3 and above are supported.
- In order to enable Lua support, please specify "USE_LUA=1" on the command 
line.
- Some systems provide this library under various names to avoid conflicts with
--previous versions. By default, HAProxy looks for "lua5.3", "lua53", "lua". If
--your system uses a different naming, you may need to set the library name in
--the "LUA_LIB_NAME" variable.
-+previous versions. By default, HAProxy looks for "lua5.4", "lua54", "lua5.3",
-+"lua53", "lua". If your system uses a different naming, you may need to set 
the
-+library name in the "LUA_LIB_NAME" variable.
- 
- If Lua is not provided on your system, it can be very simply built locally. It
- can be downloaded from https://www.lua.org/, extracted and built, for example 
:
-diff --git a/Makefile b/Makefile
-index 814837133..85f6c632d 100644
 a/Makefile
-+++ b/Makefile
-@@ -104,7 +104,7 @@
- #   LUA_LIB: force the lib path to lua
- #   LUA_INC: force the include path to lua
- #   LUA_LIB_NAME   : force the lib name (or automatically evaluated, by order 
of
--#priority : lua5.3, lua53, lua).
-+#priority : lua5.4, lua54, lua5.3, 
lua53, lua).
- #   OT_DEBUG   : compile the OpenTracing filter in debug mode
- #   OT_INC : force the include path to libopentracing-c-wrapper
- #   OT_LIB : force the lib path to libopentracing-c-wrapper
-@@ -648,11 +648,11 @@ OPTIONS_CFLAGS  += $(if $(LUA_INC),-I$(LUA_INC))
- LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) 
$(if $(LUA_LIB),-L$(LUA_LIB))
- ifeq ($(LUA_LIB_NAME),)
- # Try to automatically detect the Lua library
--LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call 
check_lua_lib,$(lib),$(LUA_LD_FLAGS
-+LUA_LIB_NAME := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 
lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS
- ifeq ($(LUA_LIB_NAME),)
--$(error unable to automatically detect the Lua library name, you can enforce 
its name with LUA_LIB_NAME= (where  can be lua5.3, lua53, lua, ...))
-+$(error unable to automatically detect the Lua library name, you can enforce 
its name with LUA_LIB_NAME= (where  can be lua5.4, lua54, lua, ...))
- endif
--LUA_INC := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call 
check_lua_inc,$(lib),"/usr/include/")))
-+LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call 
check_lua_inc,$(lib),"/usr/include/")))
- ifneq ($(LUA_INC),)
- OPTIONS_CFLAGS  += -I$(LUA_INC)
- endif
--- 
-2.35.1
-

diff --git a/net-proxy/haproxy/files/haproxy.initd-r6 
b/net-proxy/haproxy/files/haproxy.initd-r6
deleted file mode 100644
index 9b7c5fe973ba..
--- a/net-proxy/haproxy/files/haproxy.initd-r6
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-command="/usr/sbin/haproxy"
-
-pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
-
-configs=
-
-if [ -z "${CONFIGS}" ]; then
-   if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; th

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-20 Thread Christian Ruppert

commit: e08005d35b416edc845c535f2ebe0f7e1f090916
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Dec 20 08:08:32 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Dec 20 08:08:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08005d3

net-proxy/haproxy: Bump to 2.7.1

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest   | 2 +-
 net-proxy/haproxy/{haproxy-2.7.0.ebuild => haproxy-2.7.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 5261c2bcbc65..4baeb81a6564 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,4 +8,4 @@ DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abc
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
 DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 
3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d
 SHA512 
d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
-DIST haproxy-2.7.0.tar.gz 4105416 BLAKE2B 
9ebbc26593dc5433f66d9ac553123023865ccea6fd578a6f0c57e56046baa231fb7d60c465415081632e22352b6d1b95e0cddcaab9fde2465677c86eda5166f9
 SHA512 
cc2eb49c6055cca1d4744cb715d43048621e3078b2621cc104b3e54671f6b9a0a530c0c044c23e4cbd276f3d792bfa46d88bf034c777a671dc49ace0777829ad
+DIST haproxy-2.7.1.tar.gz 4120306 BLAKE2B 
aa9e6273468e07b91efb8ecedcf06f2bdcb0ba7949ba710bf94d23a59987031be0f94d78a3efa707fbaba711773db76516f76e1cdc2a92b1eaeac0786e1b8663
 SHA512 
89df867b2f052618480d1e28293e8460c31fa250c2af1a452f8fce627fd2c69c929bcfd5d68399fd02ebbf77301b0ff34a58a64fe73f034a234491c3e4d2

diff --git a/net-proxy/haproxy/haproxy-2.7.0.ebuild 
b/net-proxy/haproxy/haproxy-2.7.1.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.7.0.ebuild
rename to net-proxy/haproxy/haproxy-2.7.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-09 Thread Christian Ruppert

commit: cbe6a547cf8ff740fae437f425fdcbab3e57b2bd
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Dec  9 09:49:30 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Dec  9 09:49:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe6a547

net-proxy/haproxy: Bump to 2.2.26 and 2.4.20

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   2 +
 net-proxy/haproxy/haproxy-2.2.26.ebuild | 182 +++
 net-proxy/haproxy/haproxy-2.4.20.ebuild | 187 
 3 files changed, 371 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 6d9b05847692..5261c2bcbc65 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,8 @@
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
+DIST haproxy-2.2.26.tar.gz 2962273 BLAKE2B 
3e998657db2bf0410f487ffe87d2f14eaabeb0c19e34d14870523bac9df564f5b00a88cc66fae681f9886a9ab7953a33f8e74bcd23d72b02019a2752994a57d2
 SHA512 
f109287d5c83c9fed716544dd23c7d7196533d1d664222688c0cbda1ab677cd9dd4cd0b30264052a3a05c928efff6ee83aa93151604e6f608732ce21a48c91f3
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
+DIST haproxy-2.4.20.tar.gz 3640093 BLAKE2B 
45c6b9d22628c34177154900a85d303392b4de4c9fc74db64fed7bd31bc64df5ca6c853c393a59afbd762c0f96b27c54717ca7d89bc46e336678574f333bbccc
 SHA512 
dbd3a025627b2115f9e16cf8d2774138049760aa89ad235e7c7f0fa7c706e6bd83cb41be0e597c70948825fa90f968579ca8ab35f7a435a4ea18dbbea72405d7
 DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68

diff --git a/net-proxy/haproxy/haproxy-2.2.26.ebuild 
b/net-proxy/haproxy/haproxy-2.2.26.ebuild
new file mode 100644
index ..2bf20bf3ac64
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.26.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/libpcre2:=
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
+   )
+

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-06 Thread Christian Ruppert

commit: dd9b145aaab3cbc6f01d42db47f3b3461cf856ee
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Dec  6 09:26:00 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Dec  6 09:26:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9b145a

net-proxy/haproxy: Remove old versions

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   7 --
 net-proxy/haproxy/haproxy-2.2.17.ebuild | 183 ---
 net-proxy/haproxy/haproxy-2.2.21.ebuild | 183 ---
 net-proxy/haproxy/haproxy-2.2.24.ebuild | 181 ---
 net-proxy/haproxy/haproxy-2.4.14.ebuild | 179 --
 net-proxy/haproxy/haproxy-2.4.17.ebuild | 181 ---
 net-proxy/haproxy/haproxy-2.5.4.ebuild  | 179 --
 net-proxy/haproxy/haproxy-2.5.9.ebuild  | 187 
 8 files changed, 1280 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index aa861c125404..6d9b05847692 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,16 +1,9 @@
-DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
-DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
-DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
-DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
-DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
 DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
-DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.5.9.tar.g

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-06 Thread Christian Ruppert

commit: 464ae63af4f4e57f9379d5753e7105b14043dbae
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Dec  6 09:24:51 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Dec  6 09:26:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=464ae63a

net-proxy/haproxy: Fix ExcessiveLineLength

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.2..ebuild |  6 --
 net-proxy/haproxy/haproxy-2.4.19.ebuild   | 23 +--
 net-proxy/haproxy/haproxy-2.4..ebuild | 23 +--
 net-proxy/haproxy/haproxy-2.5.10.ebuild   | 23 +--
 net-proxy/haproxy/haproxy-2.5.9.ebuild| 23 +--
 net-proxy/haproxy/haproxy-2.5..ebuild | 25 ++---
 net-proxy/haproxy/haproxy-2.6.6.ebuild| 23 +--
 net-proxy/haproxy/haproxy-2.6.7.ebuild| 23 +--
 net-proxy/haproxy/haproxy-2.6..ebuild | 23 +--
 net-proxy/haproxy/haproxy-2.7.0.ebuild| 23 +--
 net-proxy/haproxy/haproxy-2.7..ebuild | 23 +--
 net-proxy/haproxy/haproxy-.ebuild | 23 +--
 12 files changed, 192 insertions(+), 69 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.2..ebuild 
b/net-proxy/haproxy/haproxy-2.2..ebuild
index c3fd5e9e2c2b..2bf20bf3ac64 100644
--- a/net-proxy/haproxy/haproxy-2.2..ebuild
+++ b/net-proxy/haproxy/haproxy-2.2..ebuild
@@ -108,14 +108,16 @@ src_compile() {
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 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[@]}
+   CFLAGS="${CFLAGS} -I../../include/ 
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+   CC="$(tc-getCC)" ${args[@]}
done
fi
 }

diff --git a/net-proxy/haproxy/haproxy-2.4.19.ebuild 
b/net-proxy/haproxy/haproxy-2.4.19.ebuild
index 4d418328ed38..ab90e472bdf0 100644
--- a/net-proxy/haproxy/haproxy-2.4.19.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.19.ebuild
@@ -97,19 +97,27 @@ src_compile() {
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
+   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
+   emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" 
LDFLAGS="${LDFLAGS}" CC=

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-05 Thread Christian Ruppert

commit: 4a98a273216e1006bbd6f4acb3e236aaf003561e
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Dec  5 11:00:46 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Dec  5 11:01:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a98a273

net-proxy/haproxy: Bump to 2.5.10

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.5.10.ebuild | 176 
 2 files changed, 177 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 86826c9c4374..aa861c125404 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,6 +6,7 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
+DIST haproxy-2.5.10.tar.gz 3850472 BLAKE2B 
c5d7301447ece3733aa78ce2aa4f41b73f03e9b684d609469f68cb109a477e99aa569ee7a7d23cd8f0734dc1c631233b12b9e4367b71b06d139c8aba5faaa2b9
 SHA512 
0a91bc1c65924fa5c43f9c58eedd59213a431ed3196a0479df74b59885de0e6ead799d3943ede38f42ddd5ffb6e61b95bf0653c758ec442ff5bb3533645788c5
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68

diff --git a/net-proxy/haproxy/haproxy-2.5.10.ebuild 
b/net-proxy/haproxy/haproxy-2.5.10.ebuild
new file mode 100644
index ..bc614b04caba
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.5.10.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-05 Thread Christian Ruppert

commit: 210a30d10e3584ea661f68735c9fb712e797015d
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Dec  5 08:49:18 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Dec  5 08:55:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210a30d1

net-proxy/haproxy: Bump to 2.6.7 and 2.7.0 / 2.7.

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   2 +
 net-proxy/haproxy/haproxy-2.6.7.ebuild | 176 +
 net-proxy/haproxy/haproxy-2.7.0.ebuild | 176 +
 3 files changed, 354 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 88e68402e27a..86826c9c4374 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -11,3 +11,5 @@ DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abc
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.5.9.tar.gz 3843788 BLAKE2B 
dcff2af4beba435abfcf13337f91575a19b13360f0a5abfeedfd214b7811f4d7324ca29476bdef06712dd2a89413450234735e7101f7a22ab4b1b45b3b3c482c
 SHA512 
b00756372f40de65b645cccecc11a835146d34588bd2c805f51c1bc3ab61b054af2a7cc62bbfa56607c26e42bbb791f2bbc191afb7ea992fe03b52e942112c3e
 DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
+DIST haproxy-2.6.7.tar.gz 4028355 BLAKE2B 
3af8123bf534cc6dc2bf6777c080c9ccaf9d910f4b53ae4349d9abf8868f3fd552855c86d0ff9a1e3a948b769232400377786aed1ac6404a671bfadb6f66dc5d
 SHA512 
d6f4399195647cef39a502e4c2170a9a494992880d5a805cf7ceae8b0845f7b5768b25e2f3c025dcfffd6da478058ae0b687904020ca21fee486223ad22e9c35
+DIST haproxy-2.7.0.tar.gz 4105416 BLAKE2B 
9ebbc26593dc5433f66d9ac553123023865ccea6fd578a6f0c57e56046baa231fb7d60c465415081632e22352b6d1b95e0cddcaab9fde2465677c86eda5166f9
 SHA512 
cc2eb49c6055cca1d4744cb715d43048621e3078b2621cc104b3e54671f6b9a0a530c0c044c23e4cbd276f3d792bfa46d88bf034c777a671dc49ace0777829ad

diff --git a/net-proxy/haproxy/haproxy-2.6.7.ebuild 
b/net-proxy/haproxy/haproxy-2.6.7.ebuild
new file mode 100644
index ..5d7459642b66
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.7.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=l

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-12-05 Thread Christian Ruppert

commit: 058b3676d45b17713f9e1c0a61d50e5876d034a1
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Dec  5 08:53:46 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Dec  5 08:55:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058b3676

net-proxy/haproxy: unused eclass: flag-o-matic

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.4.14.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4.17.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4.18.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4.19.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4..ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.5.4.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5.7.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5.8.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5.9.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5..ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.6.6.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.6.7.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.6..ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.7.0.ebuild | 2 +-
 net-proxy/haproxy/{haproxy-2.6..ebuild => haproxy-2.7..ebuild} | 2 +-
 net-proxy/haproxy/haproxy-.ebuild  | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild 
b/net-proxy/haproxy/haproxy-2.4.14.ebuild
index 177ad6df9650..72d321d72102 100644
--- a/net-proxy/haproxy/haproxy-2.4.14.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.14.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.4.17.ebuild 
b/net-proxy/haproxy/haproxy-2.4.17.ebuild
index fe83c6a1fb10..24d2e8eda754 100644
--- a/net-proxy/haproxy/haproxy-2.4.17.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.17.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild 
b/net-proxy/haproxy/haproxy-2.4.18.ebuild
index 4a7cfd8022ca..a0008b4be30c 100644
--- a/net-proxy/haproxy/haproxy-2.4.18.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.18.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.4.19.ebuild 
b/net-proxy/haproxy/haproxy-2.4.19.ebuild
index 1ff5a7b10e0b..4d418328ed38 100644
--- a/net-proxy/haproxy/haproxy-2.4.19.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.19.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.4..ebuild 
b/net-proxy/haproxy/haproxy-2.4..ebuild
index 1ff5a7b10e0b..4d418328ed38 100644
--- a/net-proxy/haproxy/haproxy-2.4..ebuild
+++ b/net-proxy/haproxy/haproxy-2.4..ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.5.4.ebuild 
b/net-proxy/haproxy/haproxy-2.5.4.ebuild
index 177ad6df9650..72d321d72102 100644
--- a/net-proxy/haproxy/haproxy-2.5.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.4.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 LUA_COMPAT=( lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
+inherit toolchain-funcs lua-single systemd linux-info ${SCM}
 
 MY_P="${PN}-${PV/_beta/-dev}"
 

diff --git a/net-proxy/haproxy/haproxy-2.5.7.ebuild 
b/net-proxy/hapro

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-10-10 Thread Christian Ruppert

commit: da8474a902984832f1c48c5c32ec6292431e7f8f
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Oct 10 09:06:16 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Oct 10 09:06:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da8474a9

net-proxy/haproxy: Bump to 2.4.19

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.4.19.ebuild | 176 
 2 files changed, 177 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 46762f4bfdf5..88e68402e27a 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,6 +5,7 @@ DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
+DIST haproxy-2.4.19.tar.gz 67414 BLAKE2B 
5fcb3b582e6bfa52849f45a04360da7ccf7888e1a84ae7039a77ecf0f7f76be369941c6b81e9b3610416736c35c40d08f831ea8fd264b05874b376029267e660
 SHA512 
82b6e4d4f5a2170ac8399a69b5aa9cfe7c4d9df7aa611d087c5654730b593250b2c1af8113bad96e39c1953301f4b5e40311741bff1588f4360a019f06d8929b
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68

diff --git a/net-proxy/haproxy/haproxy-2.4.19.ebuild 
b/net-proxy/haproxy/haproxy-2.4.19.ebuild
new file mode 100644
index ..1ff5a7b10e0b
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.19.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBU

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-09-23 Thread Christian Ruppert

commit: 3bd35bd2acb4a3d31bbe8aee6b0ab9b16716b5dd
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Sep 23 08:25:44 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Sep 23 08:27:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bd35bd2

net-proxy/haproxy: Bump to 2.5.9

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.5.9.ebuild | 176 +
 2 files changed, 177 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 2c8928b326b1..46762f4bfdf5 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,4 +8,5 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
+DIST haproxy-2.5.9.tar.gz 3843788 BLAKE2B 
dcff2af4beba435abfcf13337f91575a19b13360f0a5abfeedfd214b7811f4d7324ca29476bdef06712dd2a89413450234735e7101f7a22ab4b1b45b3b3c482c
 SHA512 
b00756372f40de65b645cccecc11a835146d34588bd2c805f51c1bc3ab61b054af2a7cc62bbfa56607c26e42bbb791f2bbc191afb7ea992fe03b52e942112c3e
 DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2

diff --git a/net-proxy/haproxy/haproxy-2.5.9.ebuild 
b/net-proxy/haproxy/haproxy-2.5.9.ebuild
new file mode 100644
index ..ba2ff38efb00
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.5.9.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-09-22 Thread Christian Ruppert

commit: a4940f3a69c8b9ac9b4dc2511f2e6da8c3ed59ab
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Sep 22 15:30:13 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Sep 22 15:30:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4940f3a

net-proxy/haproxy: Remove ancient /usr/bin/haproxy links

Bug: https://bugs.gentoo.org/869974
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.2..ebuild | 1 -
 net-proxy/haproxy/haproxy-2.4..ebuild | 1 -
 net-proxy/haproxy/haproxy-2.5..ebuild | 1 -
 net-proxy/haproxy/haproxy-2.6.6.ebuild| 1 -
 net-proxy/haproxy/haproxy-2.6..ebuild | 1 -
 net-proxy/haproxy/haproxy-.ebuild | 1 -
 6 files changed, 6 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.2..ebuild 
b/net-proxy/haproxy/haproxy-2.2..ebuild
index 954368323612..c3fd5e9e2c2b 100644
--- a/net-proxy/haproxy/haproxy-2.2..ebuild
+++ b/net-proxy/haproxy/haproxy-2.2..ebuild
@@ -122,7 +122,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

diff --git a/net-proxy/haproxy/haproxy-2.4..ebuild 
b/net-proxy/haproxy/haproxy-2.4..ebuild
index 56ad7268073b..1ff5a7b10e0b 100644
--- a/net-proxy/haproxy/haproxy-2.4..ebuild
+++ b/net-proxy/haproxy/haproxy-2.4..ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

diff --git a/net-proxy/haproxy/haproxy-2.5..ebuild 
b/net-proxy/haproxy/haproxy-2.5..ebuild
index 853340e4fcb2..ba2ff38efb00 100644
--- a/net-proxy/haproxy/haproxy-2.5..ebuild
+++ b/net-proxy/haproxy/haproxy-2.5..ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

diff --git a/net-proxy/haproxy/haproxy-2.6.6.ebuild 
b/net-proxy/haproxy/haproxy-2.6.6.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6.6.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.6.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

diff --git a/net-proxy/haproxy/haproxy-2.6..ebuild 
b/net-proxy/haproxy/haproxy-2.6..ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6..ebuild
+++ b/net-proxy/haproxy/haproxy-2.6..ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

diff --git a/net-proxy/haproxy/haproxy-.ebuild 
b/net-proxy/haproxy/haproxy-.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-.ebuild
+++ b/net-proxy/haproxy/haproxy-.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
dosbin haproxy
-   dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-09-22 Thread Christian Ruppert

commit: 83908a56fd9d067329cfcee9023094d7a3dc40c5
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Sep 22 14:55:28 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Sep 22 14:55:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83908a56

net-proxy/haproxy: Bump to 2.6.6 + Cleanup

Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   4 +-
 net-proxy/haproxy/haproxy-2.6.4.ebuild | 177 -
 net-proxy/haproxy/haproxy-2.6.5.ebuild | 177 -
 ...aproxy-2.6.2-r1.ebuild => haproxy-2.6.6.ebuild} |   0
 4 files changed, 1 insertion(+), 357 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 63c9c0e16f95..2c8928b326b1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,6 +8,4 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
-DIST haproxy-2.6.4.tar.gz 3986583 BLAKE2B 
e4eb9c576aa1405bd07359488d4defaa765d7e802a62278f784de8fbf4fbca67da6cd4690917534c7a7e1e9979c727cbfc021f1a5676dec3f47b8f295d61a5d3
 SHA512 
f6e20e164ef3d6e81a85c272806ddae94c1d1cbd800dfeeaee3818ed7987ee6e59797c235c53efc51905da707d238026fbcb0a44f0de29e76f4eac7beeb8d035
-DIST haproxy-2.6.5.tar.gz 4010014 BLAKE2B 
310556ace0fc54537e7cd91f7055c46f172355ca6eb9bde92f2fac6bf3d0c6ee60036e5744f67421b6d910f5719d4b6ae91e0737d95312d2dfef1760f2c354dd
 SHA512 
b285345be866b25a645b8d417cac0f9b2c9ed473cd327a621f549e77cbf0600a94e39868bb83d24a5c2ac49fe94990e37030bf3ad6f5874fb6b150f16a701731
+DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 
36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7
 SHA512 
0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2

diff --git a/net-proxy/haproxy/haproxy-2.6.4.ebuild 
b/net-proxy/haproxy/haproxy-2.6.4.ebuild
deleted file mode 100644
index 6e17e38ddf96..
--- a/net-proxy/haproxy/haproxy-2.6.4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
-   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} ==  ]]; then
-   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
-   EGIT_BRANCH=master
-else
-   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-   lua? ( ${LUA_REQUIRED_USE} )
-   ?? ( slz zlib )"
-
-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 )
-

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-09-19 Thread Christian Ruppert

commit: 1079802049a4b57d9bd524fcd9286a7a88eddcb6
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Sep 19 08:30:08 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Sep 19 08:30:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10798020

net-proxy/haproxy: Bump to 2.6.5

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.6.5.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index f7c00c8607ad..63c9c0e16f95 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -10,3 +10,4 @@ DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abc
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
 DIST haproxy-2.6.4.tar.gz 3986583 BLAKE2B 
e4eb9c576aa1405bd07359488d4defaa765d7e802a62278f784de8fbf4fbca67da6cd4690917534c7a7e1e9979c727cbfc021f1a5676dec3f47b8f295d61a5d3
 SHA512 
f6e20e164ef3d6e81a85c272806ddae94c1d1cbd800dfeeaee3818ed7987ee6e59797c235c53efc51905da707d238026fbcb0a44f0de29e76f4eac7beeb8d035
+DIST haproxy-2.6.5.tar.gz 4010014 BLAKE2B 
310556ace0fc54537e7cd91f7055c46f172355ca6eb9bde92f2fac6bf3d0c6ee60036e5744f67421b6d910f5719d4b6ae91e0737d95312d2dfef1760f2c354dd
 SHA512 
b285345be866b25a645b8d417cac0f9b2c9ed473cd327a621f549e77cbf0600a94e39868bb83d24a5c2ac49fe94990e37030bf3ad6f5874fb6b150f16a701731

diff --git a/net-proxy/haproxy/haproxy-2.6.5.ebuild 
b/net-proxy/haproxy/haproxy-2.6.5.ebuild
new file mode 100644
index ..6e17e38ddf96
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   # 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+=( $(

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-08-22 Thread Christian Ruppert

commit: c95a35916f74e039d36b590c542f2ac7b31dac62
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Aug 22 13:52:48 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Aug 22 13:53:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c95a3591

net-proxy/haproxy: Bump to 2.6.4

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest   | 2 +-
 net-proxy/haproxy/{haproxy-2.6.3.ebuild => haproxy-2.6.4.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 59031c6e2903..f7c00c8607ad 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,4 +9,4 @@ DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49ad
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
-DIST haproxy-2.6.3.tar.gz 3986611 BLAKE2B 
812046689ea032e2dffac39e48b9ed642f2758e4b9b70f1d57abdd1b6e685bc9d96d282bb208f125f8153b9d8bc3e771b7d0318952aa301c7ce456753ee61997
 SHA512 
4698d1119026e6f4c628422a87fb2db438d426399ea7743830a14518e75f3e3252830f67bea64903c560912b459605d569142fcac68aa08f12745d4d6cbc26af
+DIST haproxy-2.6.4.tar.gz 3986583 BLAKE2B 
e4eb9c576aa1405bd07359488d4defaa765d7e802a62278f784de8fbf4fbca67da6cd4690917534c7a7e1e9979c727cbfc021f1a5676dec3f47b8f295d61a5d3
 SHA512 
f6e20e164ef3d6e81a85c272806ddae94c1d1cbd800dfeeaee3818ed7987ee6e59797c235c53efc51905da707d238026fbcb0a44f0de29e76f4eac7beeb8d035

diff --git a/net-proxy/haproxy/haproxy-2.6.3.ebuild 
b/net-proxy/haproxy/haproxy-2.6.4.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.6.3.ebuild
rename to net-proxy/haproxy/haproxy-2.6.4.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-08-22 Thread Christian Ruppert

commit: 7bb99b4807c3e1826ba15ccb8cc56ca6ce506c03
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Aug 22 08:50:28 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Aug 22 08:50:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb99b48

net-proxy/haproxy: Bump to 2.6.3

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.6.3.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 262b0af3957a..59031c6e2903 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -9,3 +9,4 @@ DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49ad
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
+DIST haproxy-2.6.3.tar.gz 3986611 BLAKE2B 
812046689ea032e2dffac39e48b9ed642f2758e4b9b70f1d57abdd1b6e685bc9d96d282bb208f125f8153b9d8bc3e771b7d0318952aa301c7ce456753ee61997
 SHA512 
4698d1119026e6f4c628422a87fb2db438d426399ea7743830a14518e75f3e3252830f67bea64903c560912b459605d569142fcac68aa08f12745d4d6cbc26af

diff --git a/net-proxy/haproxy/haproxy-2.6.3.ebuild 
b/net-proxy/haproxy/haproxy-2.6.3.ebuild
new file mode 100644
index ..6e17e38ddf96
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.3.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   # 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+=( $(

[gentoo-commits] repo/gentoo:master commit in: net-proxy/hatop/

2022-08-05 Thread Christian Ruppert

commit: ae837648e967c9c23b2bf63116da6a5898a34a51
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Aug  5 13:31:57 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Aug  5 13:32:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae837648

net-proxy/hatop: Bump to 0.8.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/hatop/Manifest   |  1 +
 net-proxy/hatop/hatop-0.8.2.ebuild | 31 +++
 2 files changed, 32 insertions(+)

diff --git a/net-proxy/hatop/Manifest b/net-proxy/hatop/Manifest
index a9cfc9193b75..4805ecabf813 100644
--- a/net-proxy/hatop/Manifest
+++ b/net-proxy/hatop/Manifest
@@ -1 +1,2 @@
 DIST hatop-0.8.1.tar.gz 136760 BLAKE2B 
3692e9dd307d5f098bd3a66a3a75be5184e17d246dc94b3581d2742c9629d558dc4768baaef1c1e290825e57a651dccc926f22b4ecc98074cc8309fdda4b4b57
 SHA512 
25026ddd62ef43f02cfb3ef41a815adf232c8a4b3053e925dcea69696c207ffbf22966ce1177ef460071e683f5a4ec8d011d2bb2b0aa06f4a9b3e5932aae93b6
+DIST hatop-0.8.2.tar.gz 138013 BLAKE2B 
c4a86952bf892ad989c6a28aa4bec503b24cbd11ec78cc9fb89625e30f7b1d39c0f8929018df03e7c8906d1b478f31be1003b0c37be0d09916787e1825780a60
 SHA512 
5e772394d72962bdd014f93ee94ea59814cee33e17c1864af5b3ec97a19c2c33a6ad13f24d0cf0baf78335d9a82cee28b60a03754430b0aa9132c1dd92753cdb

diff --git a/net-proxy/hatop/hatop-0.8.2.ebuild 
b/net-proxy/hatop/hatop-0.8.2.ebuild
new file mode 100644
index ..15c530c52d75
--- /dev/null
+++ b/net-proxy/hatop/hatop-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit python-r1
+
+DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy 
status"
+HOMEPAGE="https://github.com/jhunt/hatop;
+SRC_URI="https://github.com/jhunt/hatop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+
+src_install() {
+   python_foreach_impl python_doscript bin/hatop
+
+   doman man/hatop.1
+
+   dodoc CHANGES.rst KEYBINDS README.rst
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-07-28 Thread Christian Ruppert

commit: 2ddff8f08938ad70bbf11f81f71b4c5b1c97f38b
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu Jul 28 08:04:59 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu Jul 28 08:05:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddff8f0

net-proxy/haproxy: Bump to 2.2.25

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.2.25.ebuild | 181 
 2 files changed, 182 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1b1b4fbd15c0..262b0af3957a 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,7 @@
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
+DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 
58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c
 SHA512 
652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488

diff --git a/net-proxy/haproxy/haproxy-2.2.25.ebuild 
b/net-proxy/haproxy/haproxy-2.2.25.ebuild
new file mode 100644
index ..954368323612
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.25.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/libpcre2:=
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
+   )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? ( ${LUA_DEPS} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBU

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-07-27 Thread Christian Ruppert

commit: a64644dcbe78d4741383153f493136505f159248
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Jul 27 13:44:34 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Jul 27 13:45:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a64644dc

net-proxy/haproxy: Bump to 2.4.18

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.4.18.ebuild | 177 
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4ce4b3a70db1..1b1b4fbd15c0 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,6 +3,7 @@ DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209
 DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
+DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 
1ec312a5607634f7906cfcf5d4e22d829bdca9ee436d2364ff30552375b3acaf748a79dd8a67e215007786aa57ae305e9270d62a07397bfc34f72799e4870220
 SHA512 
4362ebf5eef6560adf558a4db596c2a0349dca05ee51e69c60f5e995d364e4f68d3422391fc5286dd8e2e65ce41a459dbbcba01e6f7b5918870b214683922488
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68

diff --git a/net-proxy/haproxy/haproxy-2.4.18.ebuild 
b/net-proxy/haproxy/haproxy-2.4.18.ebuild
new file mode 100644
index ..56ad7268073b
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.18.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-4 lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/, net-proxy/haproxy/files/

2022-07-26 Thread Christian Ruppert

commit: 3233b24b3e882edea9ad2752650baf1506b0ccc0
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jul 26 08:13:20 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jul 26 08:28:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3233b24b

net-proxy/haproxy: Fix reloading and use master-CLI

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy.confd-r1   | 14 
 net-proxy/haproxy/files/haproxy.initd-r8   | 85 ++
 net-proxy/haproxy/haproxy-2.2..ebuild  |  4 +-
 net-proxy/haproxy/haproxy-2.4..ebuild  |  4 +-
 net-proxy/haproxy/haproxy-2.5..ebuild  |  4 +-
 ...aproxy-2.6.2.ebuild => haproxy-2.6.2-r1.ebuild} |  4 +-
 net-proxy/haproxy/haproxy-2.6..ebuild  |  4 +-
 net-proxy/haproxy/haproxy-.ebuild  |  4 +-
 8 files changed, 111 insertions(+), 12 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy.confd-r1 
b/net-proxy/haproxy/files/haproxy.confd-r1
new file mode 100644
index ..b9bb84e3e833
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.confd-r1
@@ -0,0 +1,14 @@
+# HAProxy config file(s), space separated
+#CONFIGS="/etc/haproxy/haproxy.cfg"
+
+# Additional HAProxy command line options
+HAPROXY_OPTS="-S /run/haproxy-master.sock"
+
+# If you want to make use ot the new seamless reload you can just write your 
own
+# reload_seamless function here. It will be called by the init script.
+# For more information on how to use that feature please have a look at the
+# "seamless_reload.txt" documentation file (requires 
net-proxy/haproxy[examples])
+#reload_seamless() {
+#  checkpath -d -m 0700 haproxy:haproxy "/run/haproxy/"
+#  socat /run/haproxy/socket - <<< "show servers state" > 
/run/haproxy/global.state
+#}

diff --git a/net-proxy/haproxy/files/haproxy.initd-r8 
b/net-proxy/haproxy/files/haproxy.initd-r8
new file mode 100644
index ..4994c28b42d5
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r8
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/sbin/haproxy"
+
+pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
+
+configs=
+
+if [ -z "${CONFIGS}" ]; then
+   if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+   CONFIGS=/etc/haproxy/${SVCNAME}.cfg
+   elif [ -f "/etc/${SVCNAME}.cfg" ]; then
+   CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
+   fi
+fi
+
+for conf in $CONFIGS; do
+   configs="${configs} -f ${conf}"
+done
+
+command_args="-D -W -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
+
+depend() {
+   need net
+   use dns logger
+}
+
+checkconfig() {
+   if [ -z "${CONFIGS}" ]; then
+   eerror "No config(s) has been specified"
+   return 1
+   fi
+
+   for conf in $CONFIGS; do
+   if [ ! -f "${conf}" ]; then
+   eerror "${conf} does not exist!"
+   return 1
+   fi
+   done
+
+   ebegin "Checking ${CONFIGS}"
+   $command -q -c $configs $HAPROXY_OPTS
+   eend $?
+}
+
+start_pre() {
+   if [ "${RC_CMD}" != "restart" ]; then
+   checkconfig || return 1
+   fi
+}
+
+stop_pre() {
+   if [ "${RC_CMD}" = "restart" ]; then
+   checkconfig || return 1
+   fi
+}
+
+stop() {
+   local _t _pid
+
+   _t="$(mktemp)"
+   for _pid in $(cat ${pidfile}) ; do
+   echo "${_pid}" > "${_t}"
+   start-stop-daemon --stop --pidfile="${_t}"
+   done
+   rm -f "${_t}"
+}
+
+reload() {
+   checkconfig || { eerror "Reloading failed, please fix your config(s) 
first"; return 1; }
+
+   if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
+   einfo "Calling user-defined reload_seamless()"
+   reload_seamless || { eerror "reload_seamless() failed!"; return 
1; }
+   fi
+
+   ebegin "Reloading ${SVCNAME}"
+   $command $command_args -sf $(cat "${pidfile}")
+   eend $?
+}

diff --git a/net-proxy/haproxy/haproxy-2.2..ebuild 
b/net-proxy/haproxy/haproxy-2.2..ebuild
index 4ec0188ead43..954368323612 100644
--- a/net-proxy/haproxy/haproxy-2.2..ebuild
+++ b/net-proxy/haproxy/haproxy-2.2..ebuild
@@ -124,8 +124,8 @@ src_install() {
dosbin haproxy
dosym ../sbin/haproxy /usr/bin/haproxy
 
-   newconfd

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-07-26 Thread Christian Ruppert

commit: 244950f3d44eddfd996a3280993dcc303c477fb0
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jul 26 08:13:44 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jul 26 08:28:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244950f3

net-proxy/haproxy: Bump to 2.5.8

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.5.8.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ab916a6bac5c..4ce4b3a70db1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,4 +5,5 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
+DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B 
fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710
 SHA512 
99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
 DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55

diff --git a/net-proxy/haproxy/haproxy-2.5.8.ebuild 
b/net-proxy/haproxy/haproxy-2.5.8.ebuild
new file mode 100644
index ..853340e4fcb2
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.5.8.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by d

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-07-22 Thread Christian Ruppert

commit: 211dc2d371ba3d70a7cf637ed55763dea3f7b348
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Jul 22 19:23:38 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Jul 22 19:24:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=211dc2d3

net-proxy/haproxy: LUA Patches are no longer required

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.4..ebuild | 4 
 net-proxy/haproxy/haproxy-2.6.2.ebuild| 4 
 net-proxy/haproxy/haproxy-2.6..ebuild | 4 
 net-proxy/haproxy/haproxy-.ebuild | 4 
 4 files changed, 16 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.4..ebuild 
b/net-proxy/haproxy/haproxy-2.4..ebuild
index fe83c6a1fb10..a8f7f3e7ffd3 100644
--- a/net-proxy/haproxy/haproxy-2.4..ebuild
+++ b/net-proxy/haproxy/haproxy-2.4..ebuild
@@ -53,10 +53,6 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-lua54.patch
-)
-
 haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME}  "
 

diff --git a/net-proxy/haproxy/haproxy-2.6.2.ebuild 
b/net-proxy/haproxy/haproxy-2.6.2.ebuild
index dbf2cbf0aea1..5fc0953b5485 100644
--- a/net-proxy/haproxy/haproxy-2.6.2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.2.ebuild
@@ -53,10 +53,6 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-lua54.patch
-)
-
 haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME}  "
 

diff --git a/net-proxy/haproxy/haproxy-2.6..ebuild 
b/net-proxy/haproxy/haproxy-2.6..ebuild
index dbf2cbf0aea1..5fc0953b5485 100644
--- a/net-proxy/haproxy/haproxy-2.6..ebuild
+++ b/net-proxy/haproxy/haproxy-2.6..ebuild
@@ -53,10 +53,6 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-lua54.patch
-)
-
 haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME}  "
 

diff --git a/net-proxy/haproxy/haproxy-.ebuild 
b/net-proxy/haproxy/haproxy-.ebuild
index dbf2cbf0aea1..5fc0953b5485 100644
--- a/net-proxy/haproxy/haproxy-.ebuild
+++ b/net-proxy/haproxy/haproxy-.ebuild
@@ -53,10 +53,6 @@ S="${WORKDIR}/${MY_P}"
 DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
 EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
 
-PATCHES=(
-   "${FILESDIR}"/${PN}-lua54.patch
-)
-
 haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME}  "

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-07-22 Thread Christian Ruppert

commit: 1d7787733197156096dea6e40dbf1207378116c2
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri Jul 22 18:52:14 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri Jul 22 18:52:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d778773

net-proxy/haproxy: Bump to 2.6.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest   | 2 +-
 net-proxy/haproxy/{haproxy-2.6.1.ebuild => haproxy-2.6.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 65163b335ee6..ab916a6bac5c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,4 +5,4 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
-DIST haproxy-2.6.1.tar.gz 3976025 BLAKE2B 
0ddb100edce46b4d2ab80b6812f139657352464afab7187c7572e1c930230778fcb652f395c356f496b746d0aae17098604b1bc7f1db41b82522796f822e822c
 SHA512 
003c74cb7acfd5da71b8b3cdc2d75820fd7c354c411d2703c60824bd4babfd4a209f87f5a94b1488a1fb4c575db1f694209072cc99821553407b6a8ba4d2d9e5
+DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 
8d080b175f574718fac6c58b9681a50d40d8ea4a562a0548ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd
 SHA512 
8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55

diff --git a/net-proxy/haproxy/haproxy-2.6.1.ebuild 
b/net-proxy/haproxy/haproxy-2.6.2.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.6.1.ebuild
rename to net-proxy/haproxy/haproxy-2.6.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: profiles/base/

2022-06-28 Thread Christian Ruppert

commit: 100d68b7ff9007772ee9af67c1999d3c9d773525
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 28 09:10:31 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 28 09:27:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=100d68b7

profiles/base: Remove obsolte net-proxy/haproxy[lua] mask

Signed-off-by: Christian Ruppert  gentoo.org>

 profiles/base/package.use.mask | 2 --
 1 file changed, 2 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ecb4772b3a77..59b344453e19 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -566,8 +566,6 @@ net-fs/samba system-heimdal
 # Robin H. Johnson  (2016-12-04)
 # Additional HAProxy functionality waiting for related stuff to land in the
 # tree.
-# bug #541042 - lua 5.3
-net-proxy/haproxy lua
 # bug (none) - 51Degrees
 net-proxy/haproxy 51degrees
 # bug (none) - WURFL

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/

2022-06-28 Thread Christian Ruppert

commit: 1e135fe1d9b508e778de85d44f40382f2221f7ea
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 28 09:25:58 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 28 09:27:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e135fe1

net-proxy/haproxy: Add LUA 5.4 support, thanks to Mike Lothian

Bug: https://bugs.gentoo.org/852809
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy-lua54.patch | 63 +
 net-proxy/haproxy/haproxy-2.4.17.ebuild |  6 ++-
 net-proxy/haproxy/haproxy-2.4..ebuild   |  6 ++-
 net-proxy/haproxy/haproxy-2.6.1.ebuild  |  6 ++-
 net-proxy/haproxy/haproxy-2.6..ebuild   |  6 ++-
 net-proxy/haproxy/haproxy-.ebuild   |  6 ++-
 6 files changed, 88 insertions(+), 5 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy-lua54.patch 
b/net-proxy/haproxy/files/haproxy-lua54.patch
new file mode 100644
index ..c89310120ab8
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy-lua54.patch
@@ -0,0 +1,63 @@
+From 4634eb54a7dbfb38b0d2db8282ce281aa9ff5296 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert 
+Date: Tue, 28 Jun 2022 10:03:00 +0200
+Subject: [PATCH] Add Lua 5.4 autodetect
+
+This patch is based on:
+https://www.mail-archive.com/haproxy@formilux.org/msg39689.html
+Thanks to Callum Farmer!
+
+Signed-off-by: Christian Ruppert 
+---
+ INSTALL  | 6 +++---
+ Makefile | 8 
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/INSTALL b/INSTALL
+index 96936ea46..9269051af 100644
+--- a/INSTALL
 b/INSTALL
+@@ -324,9 +324,9 @@ Lua is an embedded programming language supported by 
HAProxy to provide more
+ advanced scripting capabilities. Only versions 5.3 and above are supported.
+ In order to enable Lua support, please specify "USE_LUA=1" on the command 
line.
+ Some systems provide this library under various names to avoid conflicts with
+-previous versions. By default, HAProxy looks for "lua5.3", "lua53", "lua". If
+-your system uses a different naming, you may need to set the library name in
+-the "LUA_LIB_NAME" variable.
++previous versions. By default, HAProxy looks for "lua5.4", "lua54", "lua5.3",
++"lua53", "lua". If your system uses a different naming, you may need to set 
the
++library name in the "LUA_LIB_NAME" variable.
+ 
+ If Lua is not provided on your system, it can be very simply built locally. It
+ can be downloaded from https://www.lua.org/, extracted and built, for example 
:
+diff --git a/Makefile b/Makefile
+index 814837133..85f6c632d 100644
+--- a/Makefile
 b/Makefile
+@@ -104,7 +104,7 @@
+ #   LUA_LIB: force the lib path to lua
+ #   LUA_INC: force the include path to lua
+ #   LUA_LIB_NAME   : force the lib name (or automatically evaluated, by order 
of
+-#priority : lua5.3, lua53, lua).
++#priority : lua5.4, lua54, lua5.3, 
lua53, lua).
+ #   OT_DEBUG   : compile the OpenTracing filter in debug mode
+ #   OT_INC : force the include path to libopentracing-c-wrapper
+ #   OT_LIB : force the lib path to libopentracing-c-wrapper
+@@ -648,11 +648,11 @@ OPTIONS_CFLAGS  += $(if $(LUA_INC),-I$(LUA_INC))
+ LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) 
$(if $(LUA_LIB),-L$(LUA_LIB))
+ ifeq ($(LUA_LIB_NAME),)
+ # Try to automatically detect the Lua library
+-LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call 
check_lua_lib,$(lib),$(LUA_LD_FLAGS
++LUA_LIB_NAME := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 
lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS
+ ifeq ($(LUA_LIB_NAME),)
+-$(error unable to automatically detect the Lua library name, you can enforce 
its name with LUA_LIB_NAME= (where  can be lua5.3, lua53, lua, ...))
++$(error unable to automatically detect the Lua library name, you can enforce 
its name with LUA_LIB_NAME= (where  can be lua5.4, lua54, lua, ...))
+ endif
+-LUA_INC := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call 
check_lua_inc,$(lib),"/usr/include/")))
++LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call 
check_lua_inc,$(lib),"/usr/include/")))
+ ifneq ($(LUA_INC),)
+ OPTIONS_CFLAGS  += -I$(LUA_INC)
+ endif
+-- 
+2.35.1
+

diff --git a/net-proxy/haproxy/haproxy-2.4.17.ebuild 
b/net-proxy/haproxy/haproxy-2.4.17.ebuild
index 2b772750ef60..fe83c6a1fb10 100644
--- a/net-proxy/haproxy/haproxy-2.4.17.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 lua5-3 )
 
 [[ ${PV} == * ]] && SCM="git-r3"
 inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-28 Thread Christian Ruppert

commit: 6dda196d446810c5a5b116f6353267b16c2f50e1
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 28 08:45:55 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 28 09:27:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dda196d

net-proxy/haproxy: Fix USE=doc installation

Bug: https://bugs.gentoo.org/854699
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.6.1.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.6..ebuild | 2 +-
 net-proxy/haproxy/haproxy-.ebuild | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.6.1.ebuild 
b/net-proxy/haproxy/haproxy-2.6.1.ebuild
index 2b772750ef60..daf0687ac086 100644
--- a/net-proxy/haproxy/haproxy-2.6.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.1.ebuild
@@ -133,7 +133,7 @@ src_install() {
doins examples/errorfiles/*
 
if use doc; then
-   dodoc ROADMAP doc/*.txt
+   dodoc doc/*.txt
#if use lua; then
# TODO: doc/lua-api/
#fi

diff --git a/net-proxy/haproxy/haproxy-2.6..ebuild 
b/net-proxy/haproxy/haproxy-2.6..ebuild
index 2b772750ef60..daf0687ac086 100644
--- a/net-proxy/haproxy/haproxy-2.6..ebuild
+++ b/net-proxy/haproxy/haproxy-2.6..ebuild
@@ -133,7 +133,7 @@ src_install() {
doins examples/errorfiles/*
 
if use doc; then
-   dodoc ROADMAP doc/*.txt
+   dodoc doc/*.txt
#if use lua; then
# TODO: doc/lua-api/
#fi

diff --git a/net-proxy/haproxy/haproxy-.ebuild 
b/net-proxy/haproxy/haproxy-.ebuild
index 2b772750ef60..daf0687ac086 100644
--- a/net-proxy/haproxy/haproxy-.ebuild
+++ b/net-proxy/haproxy/haproxy-.ebuild
@@ -133,7 +133,7 @@ src_install() {
doins examples/errorfiles/*
 
if use doc; then
-   dodoc ROADMAP doc/*.txt
+   dodoc doc/*.txt
#if use lua; then
# TODO: doc/lua-api/
#fi

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-21 Thread Christian Ruppert

commit: 33929f45e7434c593c8c21c6bb8ce7be1cd60ccb
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 21 15:03:39 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 21 15:03:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33929f45

net-proxy/haproxy: Quoting fix for 2.6.x as well

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.6.1.ebuild| 8 
 net-proxy/haproxy/haproxy-2.6..ebuild | 8 
 net-proxy/haproxy/haproxy-.ebuild | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.6.1.ebuild 
b/net-proxy/haproxy/haproxy-2.6.1.ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.6.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.1.ebuild
@@ -97,15 +97,15 @@ src_compile() {
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
+   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
+   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}
+   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} \

diff --git a/net-proxy/haproxy/haproxy-2.6..ebuild 
b/net-proxy/haproxy/haproxy-2.6..ebuild
index 959a7a9dac4f..2b772750ef60 100644
--- a/net-proxy/haproxy/haproxy-2.6..ebuild
+++ b/net-proxy/haproxy/haproxy-2.6..ebuild
@@ -97,15 +97,15 @@ src_compile() {
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
+   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=&qu

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-21 Thread Christian Ruppert

commit: 93868267b81e1f80f5f077c375991b0ebcff2347
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 21 15:00:55 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 21 15:01:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93868267

net-proxy/haproxy: Fix some slotting

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.6.1.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.6..ebuild | 2 +-
 net-proxy/haproxy/haproxy-.ebuild | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.6.1.ebuild 
b/net-proxy/haproxy/haproxy-2.6.1.ebuild
index 9b0bc07daa75..959a7a9dac4f 100644
--- a/net-proxy/haproxy/haproxy-2.6.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.1.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )

diff --git a/net-proxy/haproxy/haproxy-2.6..ebuild 
b/net-proxy/haproxy/haproxy-2.6..ebuild
index 9b0bc07daa75..959a7a9dac4f 100644
--- a/net-proxy/haproxy/haproxy-2.6..ebuild
+++ b/net-proxy/haproxy/haproxy-2.6..ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )

diff --git a/net-proxy/haproxy/haproxy-.ebuild 
b/net-proxy/haproxy/haproxy-.ebuild
index 53a61ef08341..8c47c8d88263 100644
--- a/net-proxy/haproxy/haproxy-.ebuild
+++ b/net-proxy/haproxy/haproxy-.ebuild
@@ -24,7 +24,7 @@ else
 fi
 
 LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
@@ -60,6 +60,7 @@ haproxy_use() {
 }
 
 pkg_setup() {
+   echo $SLOT
use lua && lua-single_pkg_setup
if use net_ns; then
CONFIG_CHECK="~NET_NS"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-21 Thread Christian Ruppert

commit: 75e0650077645488b263a63e56fd323b473b39ab
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Jun 21 14:57:47 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Jun 21 14:57:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e06500

net-proxy/haproxy: Bump to 2.6.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest   | 2 +-
 net-proxy/haproxy/{haproxy-2.6.0.ebuild => haproxy-2.6.1.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 9078acef4d09..65163b335ee6 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,4 +5,4 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
-DIST haproxy-2.6.0.tar.gz 3972772 BLAKE2B 
70124b3aef55a5a7c827450e57f6d46a17c1c508e5278a8101f06494097534cb1f30e0f33c3dc38072ae56268d10cc50df3b8d481b5edc6f3a2279986cf09cdd
 SHA512 
7bb70bfb5606bbdac61d712bc510c5e8d5a5126ed8827d699b14a2f4562b3bd57f8f21344d955041cee0812c661350cca8082078afe2f277ff1399e461ddb7bb
+DIST haproxy-2.6.1.tar.gz 3976025 BLAKE2B 
0ddb100edce46b4d2ab80b6812f139657352464afab7187c7572e1c930230778fcb652f395c356f496b746d0aae17098604b1bc7f1db41b82522796f822e822c
 SHA512 
003c74cb7acfd5da71b8b3cdc2d75820fd7c354c411d2703c60824bd4babfd4a209f87f5a94b1488a1fb4c575db1f694209072cc99821553407b6a8ba4d2d9e5

diff --git a/net-proxy/haproxy/haproxy-2.6.0.ebuild 
b/net-proxy/haproxy/haproxy-2.6.1.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.6.0.ebuild
rename to net-proxy/haproxy/haproxy-2.6.1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-01 Thread Christian Ruppert

commit: d1739a24d8c9cff4e1d2e76b2e56bcb212a0d4b9
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Jun  1 11:12:51 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Jun  1 11:35:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1739a24

net-proxy/haproxy: HAProxy 2.6

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|   1 +
 net-proxy/haproxy/haproxy-2.6.0.ebuild| 177 ++
 net-proxy/haproxy/haproxy-2.6..ebuild | 177 ++
 3 files changed, 355 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e1f2bf3c59e2..d309f058249a 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,3 +8,4 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b999
 SHA512 
98d46b6dbafd95977a32a6479266f3b9fe6e6ed57e39182a3d031add60dabfdaa7494083109a75eaa3e4b15d0293b11081f9b06556eee1777ede40ed6c002a7f
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 
6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c
 SHA512 
cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
+DIST haproxy-2.6.0.tar.gz 3972772 BLAKE2B 
70124b3aef55a5a7c827450e57f6d46a17c1c508e5278a8101f06494097534cb1f30e0f33c3dc38072ae56268d10cc50df3b8d481b5edc6f3a2279986cf09cdd
 SHA512 
7bb70bfb5606bbdac61d712bc510c5e8d5a5126ed8827d699b14a2f4562b3bd57f8f21344d955041cee0812c661350cca8082078afe2f277ff1399e461ddb7bb

diff --git a/net-proxy/haproxy/haproxy-2.6.0.ebuild 
b/net-proxy/haproxy/haproxy-2.6.0.ebuild
new file mode 100644
index ..9b0bc07daa75
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.6.0.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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/${PV}"
+IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   # TODO: PCRE2_WIDTH?
+   args+=( $(haproxy_use threads THREAD) )
+   args+=( $(haproxy_use crypt LIBCRYPT) )
+   args+=( $(haproxy_use net_ns

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-06-01 Thread Christian Ruppert

commit: 37dffd21ca217af7b98d19719fb09781d7238c84
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Jun  1 11:13:55 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Jun  1 11:35:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dffd21

net-proxy/haproxy: Get rid of 2.0.x

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest|   3 -
 net-proxy/haproxy/haproxy-2.0.25.ebuild   | 183 --
 net-proxy/haproxy/haproxy-2.0.27.ebuild   | 183 --
 net-proxy/haproxy/haproxy-2.0.29.ebuild   | 181 -
 net-proxy/haproxy/haproxy-2.0..ebuild | 181 -
 5 files changed, 731 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index d309f058249a..9078acef4d09 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,6 +1,3 @@
-DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790
 SHA512 
2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
-DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
-DIST haproxy-2.0.29.tar.gz 2722893 BLAKE2B 
1f4763ef87c32cb93fcba58ad428938bf08295236d6cc7b81f2098a2a74d26d41af2bac70d9994c1108815caf58e37bcf6c84518c41514a8c8cce5fae60383c4
 SHA512 
e635a522d62fea040e996f0a518419c7d4a49e3770b2fc15a5cbf1aa98ccf42b8d698a9bf260ae6658bc4896510a8b056487af8f2cf023a1fc97172cc110f553
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8

diff --git a/net-proxy/haproxy/haproxy-2.0.25.ebuild 
b/net-proxy/haproxy/haproxy-2.0.25.ebuild
deleted file mode 100644
index 6009c169081c..
--- a/net-proxy/haproxy/haproxy-2.0.25.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; 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="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 pcre2 pcre2-jit 
prometheus-exporter
-ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-   pcre2-jit? ( pcre2 )
-   pcre? ( !pcre2 )
-   lua? ( ${LUA_REQUIRED_USE} )
-   ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-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=
-   )
-   slz? ( dev-libs/libslz:= )
-   systemd? ( sys-apps/systemd )
-   zlib? ( sys-libs/zlib )
-   lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-   acct-group/haproxy
-   acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS RE

[gentoo-commits] repo/gentoo:master commit in: sys-firmware/nvidia-firmware/

2022-05-19 Thread Christian Ruppert

commit: 820927488ccbf9173d1ba681efa831c6e2042b4d
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu May 19 19:42:36 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu May 19 19:42:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82092748

sys-firmware/nvidia-firmware: Python 3.10 support, bug 846323

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild 
b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
index ed672abe0d29..4f27ee9ce90d 100644
--- a/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
+++ b/sys-firmware/nvidia-firmware/nvidia-firmware-340.32-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit python-any-r1 unpacker

[gentoo-commits] repo/gentoo:master commit in: net-proxy/hatop/

2022-05-19 Thread Christian Ruppert

commit: 2044ed519519f25d337b6688b91e361e411f6386
Author: Christian Ruppert  gentoo  org>
AuthorDate: Thu May 19 19:38:22 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Thu May 19 19:38:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2044ed51

net-proxy/hatop: Python 3.10 support, bug 846173

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/hatop/Manifest   |  1 -
 net-proxy/hatop/hatop-0.8.0.ebuild | 31 ---
 net-proxy/hatop/hatop-0.8.1.ebuild |  4 ++--
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/net-proxy/hatop/Manifest b/net-proxy/hatop/Manifest
index f11c21b3b15e..a9cfc9193b75 100644
--- a/net-proxy/hatop/Manifest
+++ b/net-proxy/hatop/Manifest
@@ -1,2 +1 @@
-DIST hatop-0.8.0.tar.gz 134737 BLAKE2B 
bc5b1f878dc3ff388c788b6f4a07d9a3076ca3c2c11de15ec6d1ad17d5b2295162568791e4dc9e3edf091a08c80662ceb4d5a6d276e69dd3c96132cb78d007ee
 SHA512 
1776da58a12835434d7b8f59582bad44fb3bf9479f05fedb45f84bc73792b331dda63f989c8b202436801a30600283ec782380e16aa75abf7643ffa5da029718
 DIST hatop-0.8.1.tar.gz 136760 BLAKE2B 
3692e9dd307d5f098bd3a66a3a75be5184e17d246dc94b3581d2742c9629d558dc4768baaef1c1e290825e57a651dccc926f22b4ecc98074cc8309fdda4b4b57
 SHA512 
25026ddd62ef43f02cfb3ef41a815adf232c8a4b3053e925dcea69696c207ffbf22966ce1177ef460071e683f5a4ec8d011d2bb2b0aa06f4a9b3e5932aae93b6

diff --git a/net-proxy/hatop/hatop-0.8.0.ebuild 
b/net-proxy/hatop/hatop-0.8.0.ebuild
deleted file mode 100644
index 2b54555e554b..
--- a/net-proxy/hatop/hatop-0.8.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses"
-
-inherit python-r1
-
-DESCRIPTION="Ncurses client and real-time monitoring and displaying of HAProxy 
status"
-HOMEPAGE="https://github.com/jhunt/hatop;
-SRC_URI="https://github.com/jhunt/hatop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_install() {
-   python_foreach_impl python_doscript bin/hatop
-
-   doman man/hatop.1
-
-   dodoc CHANGES.rst KEYBINDS README.rst
-}

diff --git a/net-proxy/hatop/hatop-0.8.1.ebuild 
b/net-proxy/hatop/hatop-0.8.1.ebuild
index 9b40160d20ed..15c530c52d75 100644
--- a/net-proxy/hatop/hatop-0.8.1.ebuild
+++ b/net-proxy/hatop/hatop-0.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-r1

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-05-13 Thread Christian Ruppert

commit: dea781823431cd4e3b2c5311b47a23a29f458b5d
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri May 13 15:55:03 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri May 13 15:56:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea78182

net-proxy/haproxy: Bumps

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   4 +
 net-proxy/haproxy/haproxy-2.0.29.ebuild | 181 
 net-proxy/haproxy/haproxy-2.2.24.ebuild | 181 
 net-proxy/haproxy/haproxy-2.4.17.ebuild | 177 +++
 net-proxy/haproxy/haproxy-2.5.7.ebuild  | 177 +++
 5 files changed, 720 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1ebe48233094..1098d614cf12 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,13 +1,17 @@
 DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790
 SHA512 
2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
 DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
 DIST haproxy-2.0.28.tar.gz 2721568 BLAKE2B 
c4c7db2836e6296b038825de2467144ec40995182363f7924638f0edb91bdbca383e2a2114f6973445aa2b5933a7c2014643cde66fec81dff562123f89525cfc
 SHA512 
77d1d6cc4a03476e2216568ff687163c98abe380063700fded384fec5bc217f2cfebe335b0c64b8f4adfb80e75eddb7a71b6217064daa73290756871514bf550
+DIST haproxy-2.0.29.tar.gz 2722893 BLAKE2B 
1f4763ef87c32cb93fcba58ad428938bf08295236d6cc7b81f2098a2a74d26d41af2bac70d9994c1108815caf58e37bcf6c84518c41514a8c8cce5fae60383c4
 SHA512 
e635a522d62fea040e996f0a518419c7d4a49e3770b2fc15a5cbf1aa98ccf42b8d698a9bf260ae6658bc4896510a8b056487af8f2cf023a1fc97172cc110f553
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
 DIST haproxy-2.2.23.tar.gz 2950408 BLAKE2B 
a718355c1ecaf4d5728b4464fee0b65bcd4c133929be315e17e8a782618031a7508c2172d7e66790b819b884df8d813d399af9aa12cd395079b8e035e37bb76a
 SHA512 
8e4f0e72fbeae0bf31533c74f9d518f4825702f1f7b36137a224a35ba08cbeefbbf587fa0b7ca11cb7306bf64eebc0d0e8aead505a1d53037148e1572c831ff4
+DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
 DIST haproxy-2.4.16.tar.gz 3621231 BLAKE2B 
6cce1d230b0e1068421968adaa75fbaf26b029a6d54eab21ddd1e0e378fbd0d9a39060d946ca676393951e0565d3587eee49fd3badddac11b48794134be87801
 SHA512 
98c52699fbfeef8699a0d007664ff5be023f02e3eb32ba4d05a71bb4b1bcfa7ff0cb9fbcdd3d863c053cf6d7041168f63ef3fa04d11ab9aa0753c9be6812c0d8
+DIST haproxy-2.4.17.tar.gz 3623854 BLAKE2B 
54797eb6a16a100951ee9e0bb972a7fbdd8ffd22bd1feccdf41743d86ff37b71de54109504ae339007533d41b507b1abb74d8219e4a06320a13e0fce3557b99

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-05-13 Thread Christian Ruppert

commit: f46947c1bbb234e7c905a2d41385d43a247e5e60
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri May 13 15:56:18 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri May 13 15:56:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46947c1

net-proxy/haproxy: Cleanup old versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   7 --
 net-proxy/haproxy/haproxy-2.0.28-r1.ebuild | 183 -
 net-proxy/haproxy/haproxy-2.2.22-r1.ebuild | 183 -
 net-proxy/haproxy/haproxy-2.2.23.ebuild| 181 
 net-proxy/haproxy/haproxy-2.4.15-r1.ebuild | 179 
 net-proxy/haproxy/haproxy-2.4.16.ebuild| 177 
 net-proxy/haproxy/haproxy-2.5.5-r1.ebuild  | 179 
 net-proxy/haproxy/haproxy-2.5.6.ebuild | 177 
 8 files changed, 1266 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 1098d614cf12..e1f2bf3c59e2 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,17 +1,10 @@
 DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790
 SHA512 
2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
 DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
-DIST haproxy-2.0.28.tar.gz 2721568 BLAKE2B 
c4c7db2836e6296b038825de2467144ec40995182363f7924638f0edb91bdbca383e2a2114f6973445aa2b5933a7c2014643cde66fec81dff562123f89525cfc
 SHA512 
77d1d6cc4a03476e2216568ff687163c98abe380063700fded384fec5bc217f2cfebe335b0c64b8f4adfb80e75eddb7a71b6217064daa73290756871514bf550
 DIST haproxy-2.0.29.tar.gz 2722893 BLAKE2B 
1f4763ef87c32cb93fcba58ad428938bf08295236d6cc7b81f2098a2a74d26d41af2bac70d9994c1108815caf58e37bcf6c84518c41514a8c8cce5fae60383c4
 SHA512 
e635a522d62fea040e996f0a518419c7d4a49e3770b2fc15a5cbf1aa98ccf42b8d698a9bf260ae6658bc4896510a8b056487af8f2cf023a1fc97172cc110f553
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
-DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
-DIST haproxy-2.2.23.tar.gz 2950408 BLAKE2B 
a718355c1ecaf4d5728b4464fee0b65bcd4c133929be315e17e8a782618031a7508c2172d7e66790b819b884df8d813d399af9aa12cd395079b8e035e37bb76a
 SHA512 
8e4f0e72fbeae0bf31533c74f9d518f4825702f1f7b36137a224a35ba08cbeefbbf587fa0b7ca11cb7306bf64eebc0d0e8aead505a1d53037148e1572c831ff4
 DIST haproxy-2.2.24.tar.gz 2952103 BLAKE2B 
4e795c06ed329619135d553210e70d1abf57e20a27e857ea26f003cd9fcebba2ea964581fa9d1f33067fb3faa7304806f3a598d2e2b0c08d6c1d4593ad01203c
 SHA512 
021d065e53503248de122fdd9431786b9f375a5f87aca76f870e17e44c8c4001a778bfb4e430b28af781a3f175f3643a549e363e964210c717f212c5966e68d8
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
-DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
-DIST haproxy-2.4.16.tar.gz 3621231 BLAKE2B 
6cce1d230b0e1068421968adaa75fbaf26b029a6d54eab21ddd1e0e378fbd0d9a39060d946ca676393951e0565d3587eee49fd3badddac11b48794134be8780

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-05-06 Thread Christian Ruppert

commit: a71dfea8dd4d6e86ea4c288fe614ddbfad71bfb6
Author: Christian Ruppert  gentoo  org>
AuthorDate: Fri May  6 15:37:17 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Fri May  6 15:37:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71dfea8

net-proxy/haproxy: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.2.23.ebuild | 181 
 2 files changed, 182 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 75965054e6e8..1ebe48233094 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -4,6 +4,7 @@ DIST haproxy-2.0.28.tar.gz 2721568 BLAKE2B 
c4c7db2836e6296b038825de2467144ec4099
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
+DIST haproxy-2.2.23.tar.gz 2950408 BLAKE2B 
a718355c1ecaf4d5728b4464fee0b65bcd4c133929be315e17e8a782618031a7508c2172d7e66790b819b884df8d813d399af9aa12cd395079b8e035e37bb76a
 SHA512 
8e4f0e72fbeae0bf31533c74f9d518f4825702f1f7b36137a224a35ba08cbeefbbf587fa0b7ca11cb7306bf64eebc0d0e8aead505a1d53037148e1572c831ff4
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
 DIST haproxy-2.4.16.tar.gz 3621231 BLAKE2B 
6cce1d230b0e1068421968adaa75fbaf26b029a6d54eab21ddd1e0e378fbd0d9a39060d946ca676393951e0565d3587eee49fd3badddac11b48794134be87801
 SHA512 
98c52699fbfeef8699a0d007664ff5be023f02e3eb32ba4d05a71bb4b1bcfa7ff0cb9fbcdd3d863c053cf6d7041168f63ef3fa04d11ab9aa0753c9be6812c0d8

diff --git a/net-proxy/haproxy/haproxy-2.2.23.ebuild 
b/net-proxy/haproxy/haproxy-2.2.23.ebuild
new file mode 100644
index ..4ec0188ead43
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.23.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax +zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+   crypt? ( virtual/libcrypt:= )
+   pcre? (
+   dev-libs/libpcre2:=
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
+   )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? ( ${LUA_DEPS} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-05-02 Thread Christian Ruppert

commit: 2d58379b74934e3f4e068aa9ce41caa6201ecc49
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon May  2 07:08:56 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon May  2 07:09:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d58379b

net-proxy/haproxy: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.4.16.ebuild | 177 
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index e7414543e774..75965054e6e8 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,6 +6,7 @@ DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
+DIST haproxy-2.4.16.tar.gz 3621231 BLAKE2B 
6cce1d230b0e1068421968adaa75fbaf26b029a6d54eab21ddd1e0e378fbd0d9a39060d946ca676393951e0565d3587eee49fd3badddac11b48794134be87801
 SHA512 
98c52699fbfeef8699a0d007664ff5be023f02e3eb32ba4d05a71bb4b1bcfa7ff0cb9fbcdd3d863c053cf6d7041168f63ef3fa04d11ab9aa0753c9be6812c0d8
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 
0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5
 SHA512 
f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821
 DIST haproxy-2.5.6.tar.gz 3826838 BLAKE2B 
571acbb5dd9fad6ee560a3db25e88815dad4278640730337257ac18ad670b1d69cd9669c7e6a60e03a784adc9c7d8aba8d4e035152d3c13072c1a05a1534facb
 SHA512 
e97f422379af0589edf5c1dea949e95f76a7d1ce05ece75580248607f6c05cfda4a430390aca74f4d37c35de8af6d73c9a0768a699c231e11c8bb4194cb98d41

diff --git a/net-proxy/haproxy/haproxy-2.4.16.ebuild 
b/net-proxy/haproxy/haproxy-2.4.16.ebuild
new file mode 100644
index ..959a7a9dac4f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.4.16.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+RDEPEND="${DEPEND}
+   acct-group/haproxy
+   acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}&qu

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-26 Thread Christian Ruppert

commit: 43be7f46ea7b36017eb98ef839a8f430f5b46030
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Apr 26 15:20:54 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Apr 26 15:28:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43be7f46

net-proxy/haproxy: Bump to 2.5.6 and default to PCRE2, bug 838013

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 +
 net-proxy/haproxy/haproxy-2.5.6.ebuild | 177 +
 2 files changed, 178 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 293f553dfde3..e7414543e774 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,3 +8,4 @@ DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 
0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5
 SHA512 
f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821
+DIST haproxy-2.5.6.tar.gz 3826838 BLAKE2B 
571acbb5dd9fad6ee560a3db25e88815dad4278640730337257ac18ad670b1d69cd9669c7e6a60e03a784adc9c7d8aba8d4e035152d3c13072c1a05a1534facb
 SHA512 
e97f422379af0589edf5c1dea949e95f76a7d1ce05ece75580248607f6c05cfda4a430390aca74f4d37c35de8af6d73c9a0768a699c231e11c8bb4194cb98d41

diff --git a/net-proxy/haproxy/haproxy-2.5.6.ebuild 
b/net-proxy/haproxy/haproxy-2.5.6.ebuild
new file mode 100644
index ..959a7a9dac4f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.5.6.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; then
+   SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 
1-2)/src/${MY_P}.tar.gz"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
+else
+   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 +threads tools vim-syntax zlib lua 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+   lua? ( ${LUA_REQUIRED_USE} )
+   ?? ( slz zlib )"
+
+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} )"
+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}  "
+
+   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_compile() {
+   local -a args=(
+   V=1
+   TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
+   )
+
+   # TODO: PCRE2_WIDTH?
+   args+=( $(haproxy_use threads THREAD) )
+   args+=( $(haproxy_use crypt LIBCRYPT) )
+   args+=( $(haproxy_use net_ns NS) )
+   args+=( $(haproxy_use pcre

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-26 Thread Christian Ruppert

commit: 42944642f12a758e2f602227ac2553e70b5330c5
Author: Christian Ruppert  gentoo  org>
AuthorDate: Tue Apr 26 15:25:07 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Tue Apr 26 15:28:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42944642

net-proxy/haproxy: Unify live ebuilds. Default to PCRE2, bug 838013

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.0..ebuild | 24 +++-
 net-proxy/haproxy/haproxy-2.2..ebuild | 24 +++-
 net-proxy/haproxy/haproxy-2.4..ebuild | 22 ++
 net-proxy/haproxy/haproxy-2.5..ebuild | 22 ++
 net-proxy/haproxy/haproxy-.ebuild | 24 +++-
 5 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.0..ebuild 
b/net-proxy/haproxy/haproxy-2.0..ebuild
index f85333d3df83..4ec0188ead43 100644
--- a/net-proxy/haproxy/haproxy-2.0..ebuild
+++ b/net-proxy/haproxy/haproxy-2.0..ebuild
@@ -14,7 +14,10 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability 
environments"
 HOMEPAGE="http://www.haproxy.org;
 if [[ ${PV} != * ]]; 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 ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
 else
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
@@ -22,11 +25,9 @@ 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
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
-   pcre2-jit? ( pcre2 )
-   pcre? ( !pcre2 )
lua? ( ${LUA_REQUIRED_USE} )
?? ( slz zlib )"
 
@@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
 DEPEND="
crypt? ( virtual/libcrypt:= )
pcre? (
-   dev-libs/libpcre
-   pcre-jit? ( dev-libs/libpcre[jit] )
-   )
-   pcre2? (
dev-libs/libpcre2:=
-   pcre2-jit? ( dev-libs/libpcre2:=[jit] )
+   pcre-jit? ( dev-libs/libpcre2:=[jit] )
)
ssl? (
dev-libs/openssl:0=
@@ -79,16 +76,17 @@ src_compile() {
local -a args=(
V=1
TARGET=linux-glibc
+   # Switching to PCRE2 by default, bug 838013
+   PCRE=
+   PCRE_JIT=
)
 
# 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 pcre PCRE2) )
+   args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
args+=( $(haproxy_use ssl OPENSSL) )
args+=( $(haproxy_use slz SLZ) )
args+=( $(haproxy_use zlib ZLIB) )

diff --git a/net-proxy/haproxy/haproxy-2.2..ebuild 
b/net-proxy/haproxy/haproxy-2.2..ebuild
index f85333d3df83..4ec0188ead43 100644
--- a/net-proxy/haproxy/haproxy-2.2..ebuild
+++ b/net-proxy/haproxy/haproxy-2.2..ebuild
@@ -14,7 +14,10 @@ DESCRIPTION="A TCP/HTTP reverse proxy for high availability 
environments"
 HOMEPAGE="http://www.haproxy.org;
 if [[ ${PV} != * ]]; 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 ~arm64 ~ppc ~x86"
+elif [[ ${PV} ==  ]]; then
+   EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/;
+   EGIT_BRANCH=master
 else
EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
@@ -22,11 +25,9 @@ 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
+IUSE="+crypt doc examples slz +net_ns +pcre pcre-jit prometheus-exporter
 ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
-   pcre2-jit? ( pcre2 )
-   pcre? ( !pcre2 )
lua? ( ${LUA_REQUIRED_USE} )
?? ( slz zlib )"
 
@@ -34,12 +35,8 @@ BDEPEND="virtual/pkgconfig"
 DEPEND="
crypt? ( virtual/libcrypt

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-11 Thread Christian Ruppert

commit: 15de79573b2946e18f395048604037f8eb1ace2a
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Apr 11 08:08:18 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Apr 11 08:08:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15de7957

net-proxy/haproxy: Cleanup re bug 808777

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest |   1 -
 net-proxy/haproxy/haproxy-2.4.4.ebuild | 179 -
 2 files changed, 180 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index eebce2291fff..293f553dfde3 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -6,6 +6,5 @@ DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
-DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 
983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8
 SHA512 
a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 
0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e49e1d431b5
 SHA512 
f68af2be330b0fa817f7611ff46e0d3e0cc52d024b20394a5f1eedf33e6774115ee6f35ecd82d33b9ecedea2fe5afcfa32270cee33a1f6ce1726d96cc8c0d821

diff --git a/net-proxy/haproxy/haproxy-2.4.4.ebuild 
b/net-proxy/haproxy/haproxy-2.4.4.ebuild
deleted file mode 100644
index 08d54556db63..
--- a/net-proxy/haproxy/haproxy-2.4.4.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-3 )
-
-[[ ${PV} == * ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; 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="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 pcre2 pcre2-jit 
prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-   pcre2-jit? ( pcre2 )
-   pcre? ( !pcre2 )
-   lua? ( ${LUA_REQUIRED_USE} )
-   ?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-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=
-   )
-   systemd? ( sys-apps/systemd )
-   zlib? ( sys-libs/zlib )
-   lua? ( ${LUA_DEPS} )"
-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}  "
-
-   usex "${1}"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-06 Thread Christian Ruppert

commit: 09ab4cdc8964ad81d08b6600924007a2ce1d6806
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Apr  6 13:44:31 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Apr  6 13:44:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ab4cdc

net-proxy/haproxy: device-atlas has been removed, bug 770499

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.0.25.ebuild| 7 ++-
 net-proxy/haproxy/haproxy-2.0.27.ebuild| 7 ++-
 net-proxy/haproxy/haproxy-2.0.28-r1.ebuild | 7 ++-
 net-proxy/haproxy/haproxy-2.0..ebuild  | 7 ++-
 net-proxy/haproxy/haproxy-2.2.17.ebuild| 7 ++-
 net-proxy/haproxy/haproxy-2.2.21.ebuild| 7 ++-
 net-proxy/haproxy/haproxy-2.2.22-r1.ebuild | 7 ++-
 net-proxy/haproxy/haproxy-2.2..ebuild  | 7 ++-
 net-proxy/haproxy/haproxy-2.4.14.ebuild| 7 ++-
 net-proxy/haproxy/haproxy-2.4.15-r1.ebuild | 7 ++-
 net-proxy/haproxy/haproxy-2.4.4.ebuild | 7 ++-
 net-proxy/haproxy/haproxy-2.4..ebuild  | 7 ++-
 net-proxy/haproxy/haproxy-2.5.4.ebuild | 7 ++-
 net-proxy/haproxy/haproxy-2.5.5-r1.ebuild  | 7 ++-
 net-proxy/haproxy/haproxy-2.5..ebuild  | 7 ++-
 net-proxy/haproxy/haproxy-.ebuild  | 7 ++-
 net-proxy/haproxy/metadata.xml | 1 -
 17 files changed, 32 insertions(+), 81 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.0.25.ebuild 
b/net-proxy/haproxy/haproxy-2.0.25.ebuild
index 6422a00accca..6009c169081c 100644
--- a/net-proxy/haproxy/haproxy-2.0.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.25.ebuild
@@ -23,12 +23,11 @@ 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"
+ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
pcre? ( !pcre2 )
lua? ( ${LUA_REQUIRED_USE} )
-   device-atlas? ( pcre )
?? ( slz zlib )"
 
 BDEPEND="virtual/pkgconfig"
@@ -48,8 +47,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
-   lua? ( ${LUA_DEPS} )
-   device-atlas? ( dev-libs/device-atlas-api-c )"
+   lua? ( ${LUA_DEPS} )"
 RDEPEND="${DEPEND}
acct-group/haproxy
acct-user/haproxy"
@@ -96,7 +94,6 @@ src_compile() {
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) )
 

diff --git a/net-proxy/haproxy/haproxy-2.0.27.ebuild 
b/net-proxy/haproxy/haproxy-2.0.27.ebuild
index eb949a9d68b7..75cceb7c91f7 100644
--- a/net-proxy/haproxy/haproxy-2.0.27.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.27.ebuild
@@ -23,12 +23,11 @@ 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"
+ssl systemd +threads tools vim-syntax +zlib lua 51degrees wurfl"
 REQUIRED_USE="pcre-jit? ( pcre )
pcre2-jit? ( pcre2 )
pcre? ( !pcre2 )
lua? ( ${LUA_REQUIRED_USE} )
-   device-atlas? ( pcre )
?? ( slz zlib )"
 
 BDEPEND="virtual/pkgconfig"
@@ -48,8 +47,7 @@ DEPEND="
slz? ( dev-libs/libslz:= )
systemd? ( sys-apps/systemd )
zlib? ( sys-libs/zlib )
-   lua? ( ${LUA_DEPS} )
-   device-atlas? ( dev-libs/device-atlas-api-c )"
+   lua? ( ${LUA_DEPS} )"
 RDEPEND="${DEPEND}
acct-group/haproxy
acct-user/haproxy"
@@ -96,7 +94,6 @@ src_compile() {
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) )
 

diff --git a/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild 
b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
index 4b054f13c306..f85333d3df83 100644
--- a/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
@@ -23,12 +23,11 @@ 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"
+ssl systemd +threads tools vim-syntax +zlib lua 51degrees

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-06 Thread Christian Ruppert

commit: 18f86115a82d51d953cc7423acb1774a47f13b11
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Apr  6 13:30:24 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Apr  6 13:32:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18f86115

net-proxy/haproxy: Use latest version

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-.ebuild 
b/net-proxy/haproxy/haproxy-.ebuild
index db1e3fcb7d17..f6a132af05b9 100644
--- a/net-proxy/haproxy/haproxy-.ebuild
+++ b/net-proxy/haproxy/haproxy-.ebuild
@@ -102,19 +102,19 @@ src_compile() {
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=${ERROT}/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=${ERROT}/usr/$(get_libdir) 
SBINDIR=/usr/sbin
+   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=${ERROT}/usr/$(get_libdir) 
${args[@]} admin/halog/halog
+   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=${ERROT}/usr/$(get_libdir) 
${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
+   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[@]}
+   CFLAGS="${CFLAGS} -I../../include/ 
-I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" 
${args[@]}
fi
done
fi

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-06 Thread Christian Ruppert

commit: a82d84c1ff4d86c7e05a5599c2414f11e83b1ad9
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Apr  6 13:30:46 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Apr  6 13:32:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82d84c1

net-proxy/haproxy: Whitespace

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.4.14.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4.15-r1.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.4.4.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.4..ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.5.4.ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5.5-r1.ebuild  | 2 +-
 net-proxy/haproxy/haproxy-2.5..ebuild  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.4.14.ebuild 
b/net-proxy/haproxy/haproxy-2.4.14.ebuild
index 7a4eb13e5f37..af56e6b7b686 100644
--- a/net-proxy/haproxy/haproxy-2.4.14.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.14.ebuild
@@ -102,7 +102,7 @@ src_compile() {
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 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

diff --git a/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild 
b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
index 0b3865f3f4f6..022f4a0f6281 100644
--- a/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
@@ -102,7 +102,7 @@ src_compile() {
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 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

diff --git a/net-proxy/haproxy/haproxy-2.4.4.ebuild 
b/net-proxy/haproxy/haproxy-2.4.4.ebuild
index 43eae9a82164..ad27330f3de5 100644
--- a/net-proxy/haproxy/haproxy-2.4.4.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.4.ebuild
@@ -102,7 +102,7 @@ src_compile() {
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 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

diff --git a/net-proxy/haproxy/haproxy-2.4..ebuild 
b/net-proxy/haproxy/haproxy-2.4..ebuild
index 0b3865f3f4f6..022f4a0f6281 100644
--- a/net-proxy/haproxy/haproxy-2.4..ebuild
+++ b/net-proxy/haproxy/haproxy-2.4..ebuild
@@ -102,7 +102,7 @@ src_compile() {
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="${TARG

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-04-06 Thread Christian Ruppert

commit: cf83fc649673e4bddc060ba93a2f59625eb14057
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Apr  6 13:16:18 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Apr  6 13:22:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf83fc64

net-proxy/haproxy: Fix EGIT_REPO_URI from http to https

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/haproxy-2.0.25.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.0.27.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.0.28.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.0..ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.2.17.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.2.21.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.2.22.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.2..ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.4.14.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.4.15.ebuild   | 2 +-
 net-proxy/haproxy/haproxy-2.4.4.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.4..ebuild | 2 +-
 net-proxy/haproxy/haproxy-2.5.4.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.5.5.ebuild| 2 +-
 net-proxy/haproxy/haproxy-2.5..ebuild | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/net-proxy/haproxy/haproxy-2.0.25.ebuild 
b/net-proxy/haproxy/haproxy-2.0.25.ebuild
index df8535c8e732..6422a00accca 100644
--- a/net-proxy/haproxy/haproxy-2.0.25.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.25.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
 fi
 

diff --git a/net-proxy/haproxy/haproxy-2.0.27.ebuild 
b/net-proxy/haproxy/haproxy-2.0.27.ebuild
index 7befecfd31b2..eb949a9d68b7 100644
--- a/net-proxy/haproxy/haproxy-2.0.27.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.27.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
 fi
 

diff --git a/net-proxy/haproxy/haproxy-2.0.28.ebuild 
b/net-proxy/haproxy/haproxy-2.0.28.ebuild
index c6b8f8086643..db0148b44e73 100644
--- a/net-proxy/haproxy/haproxy-2.0.28.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.28.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
 fi
 

diff --git a/net-proxy/haproxy/haproxy-2.0..ebuild 
b/net-proxy/haproxy/haproxy-2.0..ebuild
index c6b8f8086643..db0148b44e73 100644
--- a/net-proxy/haproxy/haproxy-2.0..ebuild
+++ b/net-proxy/haproxy/haproxy-2.0..ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
 fi
 

diff --git a/net-proxy/haproxy/haproxy-2.2.17.ebuild 
b/net-proxy/haproxy/haproxy-2.2.17.ebuild
index df8535c8e732..6422a00accca 100644
--- a/net-proxy/haproxy/haproxy-2.2.17.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.17.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
EGIT_BRANCH=master
 fi
 

diff --git a/net-proxy/haproxy/haproxy-2.2.21.ebuild 
b/net-proxy/haproxy/haproxy-2.2.21.ebuild
index 7befecfd31b2..eb949a9d68b7 100644
--- a/net-proxy/haproxy/haproxy-2.2.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.21.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} != * ]]; 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_REPO_UR

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/

2022-04-06 Thread Christian Ruppert

commit: f0c1f3a38f315e6b838aa1628ca2f69db33039ca
Author: Christian Ruppert  gentoo  org>
AuthorDate: Wed Apr  6 13:19:22 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Wed Apr  6 13:22:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c1f3a3

net-proxy/haproxy: Revbump: Use Master-Worker Mode by default

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/files/haproxy.initd-r7   | 85 ++
 ...roxy-2.0.28.ebuild => haproxy-2.0.28-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.0..ebuild  |  2 +-
 ...roxy-2.2.22.ebuild => haproxy-2.2.22-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.2..ebuild  |  2 +-
 ...roxy-2.4.15.ebuild => haproxy-2.4.15-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.4..ebuild  |  2 +-
 ...aproxy-2.5.5.ebuild => haproxy-2.5.5-r1.ebuild} |  2 +-
 net-proxy/haproxy/haproxy-2.5..ebuild  |  2 +-
 .../{haproxy-2.4.15.ebuild => haproxy-.ebuild} | 16 ++--
 10 files changed, 101 insertions(+), 16 deletions(-)

diff --git a/net-proxy/haproxy/files/haproxy.initd-r7 
b/net-proxy/haproxy/files/haproxy.initd-r7
new file mode 100644
index ..95f27d676b6c
--- /dev/null
+++ b/net-proxy/haproxy/files/haproxy.initd-r7
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+command="/usr/sbin/haproxy"
+
+pidfile="${HAPROXY_PIDFILE:-/run/${SVCNAME}.pid}"
+
+configs=
+
+if [ -z "${CONFIGS}" ]; then
+   if [ -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
+   CONFIGS=/etc/haproxy/${SVCNAME}.cfg
+   elif [ -f "/etc/${SVCNAME}.cfg" ]; then
+   CONFIGS=/etc/${SVCNAME}.cfg # Deprecated
+   fi
+fi
+
+for conf in $CONFIGS; do
+   configs="${configs} -f ${conf}"
+done
+
+command_args="-D -W -p ${pidfile} ${configs} ${HAPROXY_OPTS}"
+
+depend() {
+   need net
+   use dns logger
+}
+
+checkconfig() {
+   if [ -z "${CONFIGS}" ]; then
+   eerror "No config(s) has been specified"
+   return 1
+   fi
+
+   for conf in $CONFIGS; do
+   if [ ! -f "${conf}" ]; then
+   eerror "${conf} does not exist!"
+   return 1
+   fi
+   done
+
+   ebegin "Checking ${CONFIGS}"
+   $command -q -c $configs $HAPROXY_OPTS
+   eend $?
+}
+
+start_pre() {
+   if [ "${RC_CMD}" != "restart" ]; then
+   checkconfig || return 1
+   fi
+}
+
+stop_pre() {
+   if [ "${RC_CMD}" = "restart" ]; then
+   checkconfig || return 1
+   fi
+}
+
+stop() {
+   local _t _pid
+
+   _t="$(mktemp)"
+   for _pid in $(cat ${pidfile}) ; do
+   echo "${_pid}" > "${_t}"
+   start-stop-daemon --stop --pidfile="${_t}"
+   done
+   rm -f "${_t}"
+}
+
+reload() {
+   checkconfig || { eerror "Reloading failed, please fix your config(s) 
first"; return 1; }
+
+   if [ "$(command -v reload_seamless)" = "reload_seamless" ]; then
+   einfo "Calling user-defined reload_seamless()"
+   reload_seamless || { eerror "reload_seamless() failed!"; return 
1; }
+   fi
+
+   ebegin "Reloading ${SVCNAME}"
+   $command -D -p "${pidfile}" $configs $HAPROXY_OPTS -sf $(cat 
"${pidfile}")
+   eend $?
+}

diff --git a/net-proxy/haproxy/haproxy-2.0.28.ebuild 
b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.0.28.ebuild
rename to net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.0.28.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.28-r1.ebuild
@@ -130,7 +130,7 @@ src_install() {
dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd" ${PN}
-   newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+   newinitd "${FILESDIR}/${PN}.initd-r7" ${PN}
 
doman doc/haproxy.1
 

diff --git a/net-proxy/haproxy/haproxy-2.0..ebuild 
b/net-proxy/haproxy/haproxy-2.0..ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.0..ebuild
+++ b/net-proxy/haproxy/haproxy-2.0..ebuild
@@ -130,7 +130,7 @@ src_install() {
dosym ../sbin/haproxy /usr/bin/haproxy
 
newconfd "${FILESDIR}/${PN}.confd" ${PN}
-   newinitd "${FILESDIR}/${PN}.initd-r6" ${PN}
+   newinitd "${FILESDI

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-03-14 Thread Christian Ruppert

commit: 1c2fbc60178bfa445683ba89282e9d38de9169d8
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Mar 14 17:12:15 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Mar 14 17:12:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c2fbc60

net-proxy/haproxy: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.0.28.ebuild | 186 
 2 files changed, 187 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 2e1c63996cf4..eebce2291fff 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,6 @@
 DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790
 SHA512 
2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
 DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
+DIST haproxy-2.0.28.tar.gz 2721568 BLAKE2B 
c4c7db2836e6296b038825de2467144ec40995182363f7924638f0edb91bdbca383e2a2114f6973445aa2b5933a7c2014643cde66fec81dff562123f89525cfc
 SHA512 
77d1d6cc4a03476e2216568ff687163c98abe380063700fded384fec5bc217f2cfebe335b0c64b8f4adfb80e75eddb7a71b6217064daa73290756871514bf550
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615

diff --git a/net-proxy/haproxy/haproxy-2.0.28.ebuild 
b/net-proxy/haproxy/haproxy-2.0.28.ebuild
new file mode 100644
index ..3f411c90b78f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.28.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; 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 )
+   lua? ( ${LUA_REQUIRED_USE} )
+   device-atlas? ( pcre )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+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=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? ( ${LUA_DEPS} )
+   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

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-03-14 Thread Christian Ruppert

commit: 7698b87bbe4f54c0c51d64cecd2f2a23aaa62dbd
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Mar 14 16:58:16 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Mar 14 16:58:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7698b87b

net-proxy/haproxy: Cleanups and bumps

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest | 6 +++---
 net-proxy/haproxy/{haproxy-2.2.20.ebuild => haproxy-2.2.22.ebuild} | 0
 net-proxy/haproxy/{haproxy-2.4.13.ebuild => haproxy-2.4.15.ebuild} | 0
 net-proxy/haproxy/{haproxy-2.5.3.ebuild => haproxy-2.5.5.ebuild}   | 0
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 335bf3f58955..2e1c63996cf4 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,10 +1,10 @@
 DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e2c1fbccd45a6fd56b7cc0ae5904619b50849a23576f0a6d21ae2798166acd41692d0311bcf361355dc6ee0da790
 SHA512 
2c238844a8c82f877d3039b20b76fd22717f95a4e5d94a0bfd501c6e134042ef744d3731fc0ccced0a94e5cb1c1822d3272ed961e07bd9acc4d637eba0529155
 DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
-DIST haproxy-2.2.20.tar.gz 2945047 BLAKE2B 
d2462b3c43e75f86752bcc0edf3af173fba10f9d8191e715b15c926bffb6018b495a54e3f9883dfe6cc80f33cd5f362ac1e2db88f9d0e8b85be74c1fd28dc21a
 SHA512 
53b8466b3717dd5e4d167d48ae449da6e97b3a6d9a06951f040aec34685b961a7014137a5e4d285bd2b8b6eaacc3028f1939c66f450775a01802df085d70a098
 DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
-DIST haproxy-2.4.13.tar.gz 3611045 BLAKE2B 
7eda0293a766d48ef3d14891affa684500203437a81efece38f77d5e8006882d574083f0463cb5f39d31dc6b95c7df25d24c7d78bec1a2c3510f54c50207f28f
 SHA512 
f5e7e474252f2745adeec703ed101a6089f6e43c463d823b64430f4f32618db1f73647f0b1f7d1247e1750b49b18a300247aded29c780b0a615b0ac8d7373257
+DIST haproxy-2.2.22.tar.gz 2949092 BLAKE2B 
3dc7183f31cd0a95be516fbedab1eacae00761f8f2bee8478cd0c446f80c4f40c7012b64485bc598d124e3430611f6b9a748c68e1b6b379519af5308e3ed4c20
 SHA512 
4a99d196257fb3c99a1d76d6f9a714c673226821439b67f646fa04033f31af9ac8f783f5a984c143372d79d728476aa8b2b35d8a2f31b7fc86c09b8f9ad65615
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
+DIST haproxy-2.4.15.tar.gz 3616441 BLAKE2B 
425444a54e22cca8d15cb808283be3baefcd2ce56447d91bce3b4f4b7f6606e03d2eb8a242891c619cfd0fad9aba5bb84026c68d41f07cd55f083481df234899
 SHA512 
da6f6a4f021bfa719926f4c73dc559429357a77da2c560a4375d2edbb4f342a05548d39ce0a7e3346c305f1779e579a738d8442e8e9e01903f9c435a7b0b6d71
 DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 
983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8
 SHA512 
a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c
-DIST haproxy-2.5.3.tar.gz 3818959 BLAKE2B 
0e3d53eaf07b5320ccdefe1b3cd12799444bb2a2bbd4a4ca5cf78ae059f684df71667760033ed55e1b8b78fca2a16dcd77fd10969aee802d1e5f6257de33a65a
 SHA512 
691a65eae3912df655124b754ef72785776084c2376220e2ceeaa89c8c5c392eb7d2b2ab72ac06c638c3169bf59b2d83ce0caa42c19ba6ebf7a8c6036bc62280
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B 
fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50
 SHA512 
95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
+DIST haproxy-2.5.5.tar.gz 3821477 BLAKE2B 
0680925026edf56f4369c71092c39f4ff3956a8cf04320326623b3031f719d62077acdca457a6cfd82f6bcbf510920113a0328a2d8cd4a208c3d9e

[gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/

2022-03-05 Thread Christian Ruppert

commit: 17964e543c5361d803b030541d3db42a2ada02ac
Author: Christian Ruppert  gentoo  org>
AuthorDate: Sat Mar  5 08:53:49 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Sat Mar  5 08:53:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17964e54

net-proxy/haproxy: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-proxy/haproxy/Manifest  |   1 +
 net-proxy/haproxy/haproxy-2.2.21.ebuild | 186 
 2 files changed, 187 insertions(+)

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index ab8e73561193..335bf3f58955 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,6 +2,7 @@ DIST haproxy-2.0.25.tar.gz 2707840 BLAKE2B 
cd85d233623f2791bff8ada00d9ac4ea3743e
 DIST haproxy-2.0.27.tar.gz 2716937 BLAKE2B 
08ab2905b26b8e33068af77f3a153dc489f509436451d2711f9929100ecebfbec9edd14b449c48739b1d20990431fa6a8b49e4fc98d32ade5c1688f72d310f63
 SHA512 
339a013cb11778ed444370ff1887b4db121947784bda08f818a39b98261d02a5ebeb681ef7040cbb0e493d89c5b8e2c5a32f0cdccf9e89a6327e9d95cc6d5891
 DIST haproxy-2.2.17.tar.gz 2933836 BLAKE2B 
750d2c5048f994442d13c05ce6624731d296462951ee2e86110467d517a6708b498e98260a3f0770e110dc5c2cb2bdd746fb76f23ba7cebc1642b0b9c8124a67
 SHA512 
174197e1e0915a6ae6062b9a070f16102ac7f3429f991f36cdb2e2cce587bd26059bd1dc71a368f904bcdecd292ab5926715160400ae96d498d902aac356864f
 DIST haproxy-2.2.20.tar.gz 2945047 BLAKE2B 
d2462b3c43e75f86752bcc0edf3af173fba10f9d8191e715b15c926bffb6018b495a54e3f9883dfe6cc80f33cd5f362ac1e2db88f9d0e8b85be74c1fd28dc21a
 SHA512 
53b8466b3717dd5e4d167d48ae449da6e97b3a6d9a06951f040aec34685b961a7014137a5e4d285bd2b8b6eaacc3028f1939c66f450775a01802df085d70a098
+DIST haproxy-2.2.21.tar.gz 2947789 BLAKE2B 
3462f0a67070bd61266cc67d7d419dfb9e209314982f2035bdce6b905f9fe567780669adc09905598a6129152dbb77416790976249076935fcb90e7e03767284
 SHA512 
2404bf0938b88c3249668bef1f13195973c5b1db8dc056ed9d5b882b8cdabf71076b73de723e8d3d0d953193294edea4acac5edeee8ac472e93ae0bd917bf99b
 DIST haproxy-2.4.13.tar.gz 3611045 BLAKE2B 
7eda0293a766d48ef3d14891affa684500203437a81efece38f77d5e8006882d574083f0463cb5f39d31dc6b95c7df25d24c7d78bec1a2c3510f54c50207f28f
 SHA512 
f5e7e474252f2745adeec703ed101a6089f6e43c463d823b64430f4f32618db1f73647f0b1f7d1247e1750b49b18a300247aded29c780b0a615b0ac8d7373257
 DIST haproxy-2.4.14.tar.gz 3613642 BLAKE2B 
b45af8f62cefead1f471b0b61e9bc262dc25e0ca99898469d7702fb6e509cf2b9a9c201f8c6ecae948ef40c8fc8aec0351d8e10479752fdd5ccd66758f632799
 SHA512 
a4a5d449782dc2f1348d1f53ec266eef4ea4e1b0586e81730a01d818481c3a3cfb018ba1da5968d17bb6668e86017beccf7abefc563993b88a5af8cbd1da1943
 DIST haproxy-2.4.4.tar.gz 3587306 BLAKE2B 
983f5919b738419d616b35c1cad6aa2400b0b857160ecfac3bcdfcc14c15280283ae3f33036652a3a9b5bfff0fbb6a54912807ea7c83c828d2b5ba72274fe1a8
 SHA512 
a8987e8342fdbec7e48de09a4391a67e77e05493260e0e561e8c185b6457b8e1086cc45ce04ebf3365699c008dff81667490e2fe99c33c0ac3c7513df8ae025c

diff --git a/net-proxy/haproxy/haproxy-2.2.21.ebuild 
b/net-proxy/haproxy/haproxy-2.2.21.ebuild
new file mode 100644
index ..3f411c90b78f
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.21.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+LUA_COMPAT=( lua5-3 )
+
+[[ ${PV} == * ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic lua-single 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} != * ]]; 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 )
+   lua? ( ${LUA_REQUIRED_USE} )
+   device-atlas? ( pcre )
+   ?? ( slz zlib )"
+
+BDEPEND="virtual/pkgconfig"
+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=
+   )
+   slz? ( dev-libs/libslz:= )
+   systemd? ( sys-apps/systemd )
+   zlib? ( sys-libs/zlib )
+   lua? (

[gentoo-commits] repo/gentoo:master commit in: net-wireless/soapysdrplay/

2022-02-28 Thread Christian Ruppert

commit: 81e445b02601c65fabcdfd9bfba785f5fbe51932
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Feb 28 13:20:12 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Feb 28 13:21:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81e445b0

net-wireless/soapysdrplay: Cleanup old versions

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-wireless/soapysdrplay/Manifest |  2 --
 .../soapysdrplay/soapysdrplay-0.1.0.ebuild | 29 --
 .../soapysdrplay/soapysdrplay-0.2.0.ebuild | 29 --
 3 files changed, 60 deletions(-)

diff --git a/net-wireless/soapysdrplay/Manifest 
b/net-wireless/soapysdrplay/Manifest
index 2b44b67cca04..16728763a32c 100644
--- a/net-wireless/soapysdrplay/Manifest
+++ b/net-wireless/soapysdrplay/Manifest
@@ -1,3 +1 @@
-DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 
746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789
 SHA512 
28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
-DIST soapysdrplay-0.2.0.tar.gz 13570 BLAKE2B 
c77342b091a3510986e4388911dc2e45d7bc0e54dfef7ebe1fe774d564193bc773509d46238c0a3ea87458ab0c7ea2447a877f083a72a26f2ca5e592386b1ba1
 SHA512 
7ed6e34ee42416b4d2eec76b66cdc0e9b40835ab3299a2b3a906492cf342bbdef7c92dd3e9e63b12fdceb897ca4fb2bb574b23d4aee121cc32fbfcddbb7b060a
 DIST soapysdrplay-20220120.tar.gz 21089 BLAKE2B 
db8a8f7b20a57d637f69b45cab283419e46808ab95bfbcba96b155c696bb6673223347ef720c8556f4122a53659eb166edb15b48796b2e01ec3ee5bb10eafba1
 SHA512 
a0cd5e84da86ab9fc6ffae93e963a14091c0936bc93a0ab86d7c3cab15cf2e62e1382da9fff10b1f457d1fbf925dc3ea74683f0fa13e12394d994f9571e52334

diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild 
b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
deleted file mode 100644
index 935b6c269996..
--- a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay;
-
-if [ "${PV}" = "" ]; then
-   EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git;
-   EGIT_CLONE_TYPE="shallow"
-   inherit git-r3
-else
-   KEYWORDS="~amd64 ~x86"
-   
SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz
 -> ${P}.tar.gz"
-   S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE=""
-
-RDEPEND="net-wireless/soapysdr
-   net-wireless/sdrplay"
-DEPEND="${RDEPEND}"

diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild 
b/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
deleted file mode 100644
index 935b6c269996..
--- a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay;
-
-if [ "${PV}" = "" ]; then
-   EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git;
-   EGIT_CLONE_TYPE="shallow"
-   inherit git-r3
-else
-   KEYWORDS="~amd64 ~x86"
-   
SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz
 -> ${P}.tar.gz"
-   S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE=""
-
-RDEPEND="net-wireless/soapysdr
-   net-wireless/sdrplay"
-DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: net-wireless/soapyremote/

2022-02-28 Thread Christian Ruppert

commit: 5e47931737e31fde7f0582e4f94e33e17edbdc4f
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Feb 28 13:18:41 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Feb 28 13:18:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e479317

net-wireless/soapyremote: Bump, also fixes bug 834295

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-wireless/soapyremote/Manifest   | 2 +-
 .../{soapyremote-0.5.0.ebuild => soapyremote-0.5.2.ebuild}  | 6 +++---
 net-wireless/soapyremote/soapyremote-.ebuild| 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-wireless/soapyremote/Manifest 
b/net-wireless/soapyremote/Manifest
index 01919a221070..a9d65142b587 100644
--- a/net-wireless/soapyremote/Manifest
+++ b/net-wireless/soapyremote/Manifest
@@ -1 +1 @@
-DIST soapyremote-0.5.0.tar.gz 71881 BLAKE2B 
e81f2df8f513df329289404de8f1f5916379a824bb51b0aa0e3b1bfc6af953a367119293db80374ef6c2ba6e638228eb8ffb5f0c9eb70a7dd61e2ff4e5641ef8
 SHA512 
5c5ce76c90dfbfc3b6846902f5dbf0c0906d92ae193a50d79733ce47403f1ec27dcf78d07fc198e8099272431c313984eb32c26306fb2afee129339e6501f3d2
+DIST soapyremote-0.5.2.tar.gz 72929 BLAKE2B 
17b8a2f3f5400c4c6d88e726471d977aa27a263079690780dc91f93c0e30645a4e433f5406d694f5e3ba60bf0a73ce93fff616a21b0e4ac7e0b5d17cf8275711
 SHA512 
55841f248c796a870a81a508cec85962ed821c2abd40438eaee07135cb6dde0bd93e84a3ff709dfeaf26f7f79717197c80c3aad378d62b3e4b232f60c46b0151

diff --git a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild 
b/net-wireless/soapyremote/soapyremote-0.5.2.ebuild
similarity index 90%
rename from net-wireless/soapyremote/soapyremote-0.5.0.ebuild
rename to net-wireless/soapyremote/soapyremote-0.5.2.ebuild
index 0ad6fd2b4430..2e6d321d6176 100644
--- a/net-wireless/soapyremote/soapyremote-0.5.0.ebuild
+++ b/net-wireless/soapyremote/soapyremote-0.5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR remote module"
 HOMEPAGE="https://github.com/pothosware/SoapyRemote;

diff --git a/net-wireless/soapyremote/soapyremote-.ebuild 
b/net-wireless/soapyremote/soapyremote-.ebuild
index 0ad6fd2b4430..2e6d321d6176 100644
--- a/net-wireless/soapyremote/soapyremote-.ebuild
+++ b/net-wireless/soapyremote/soapyremote-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR remote module"
 HOMEPAGE="https://github.com/pothosware/SoapyRemote;

[gentoo-commits] repo/gentoo:master commit in: net-wireless/soapysdrplay/

2022-02-28 Thread Christian Ruppert

commit: 1e8eaccde8f0142c6530304e2437b6fa7d6203bc
Author: Christian Ruppert  gentoo  org>
AuthorDate: Mon Feb 28 13:15:18 2022 +
Commit:     Christian Ruppert  gentoo  org>
CommitDate: Mon Feb 28 13:15:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e8eaccd

net-wireless/soapysdrplay: Bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Christian Ruppert  gentoo.org>

 net-wireless/soapysdrplay/Manifest |  1 +
 .../soapysdrplay/soapysdrplay-20220120.ebuild  | 30 ++
 net-wireless/soapysdrplay/soapysdrplay-.ebuild | 17 ++--
 3 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/net-wireless/soapysdrplay/Manifest 
b/net-wireless/soapysdrplay/Manifest
index ee25bcdcc602..2b44b67cca04 100644
--- a/net-wireless/soapysdrplay/Manifest
+++ b/net-wireless/soapysdrplay/Manifest
@@ -1,2 +1,3 @@
 DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 
746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789
 SHA512 
28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
 DIST soapysdrplay-0.2.0.tar.gz 13570 BLAKE2B 
c77342b091a3510986e4388911dc2e45d7bc0e54dfef7ebe1fe774d564193bc773509d46238c0a3ea87458ab0c7ea2447a877f083a72a26f2ca5e592386b1ba1
 SHA512 
7ed6e34ee42416b4d2eec76b66cdc0e9b40835ab3299a2b3a906492cf342bbdef7c92dd3e9e63b12fdceb897ca4fb2bb574b23d4aee121cc32fbfcddbb7b060a
+DIST soapysdrplay-20220120.tar.gz 21089 BLAKE2B 
db8a8f7b20a57d637f69b45cab283419e46808ab95bfbcba96b155c696bb6673223347ef720c8556f4122a53659eb166edb15b48796b2e01ec3ee5bb10eafba1
 SHA512 
a0cd5e84da86ab9fc6ffae93e963a14091c0936bc93a0ab86d7c3cab15cf2e62e1382da9fff10b1f457d1fbf925dc3ea74683f0fa13e12394d994f9571e52334

diff --git a/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild 
b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild
new file mode 100644
index ..446b5336ed79
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Soapy SDR plugin for SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3;
+
+if [ "${PV}" = "" ]; then
+   EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git;
+   EGIT_CLONE_TYPE="shallow"
+   inherit git-r3
+else
+   KEYWORDS="~amd64 ~x86"
+   COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75"
+   
SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+   >=net-wireless/sdrplay-3.07"
+DEPEND="${RDEPEND}"

diff --git a/net-wireless/soapysdrplay/soapysdrplay-.ebuild 
b/net-wireless/soapysdrplay/soapysdrplay-.ebuild
index 935b6c269996..446b5336ed79 100644
--- a/net-wireless/soapysdrplay/soapysdrplay-.ebuild
+++ b/net-wireless/soapysdrplay/soapysdrplay-.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay;
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3;
 
 if [ "${PV}" = "" ]; then
-   EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git;
+   EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git;
EGIT_CLONE_TYPE="shallow"
inherit git-r3
 else
KEYWORDS="~amd64 ~x86"
-   
SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz
 -> ${P}.tar.gz"
-   S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+   COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75"
+   
SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz
 -> ${P}.tar.gz"
+   S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}"
 fi
 
 LICENSE="Boost-1.0"
@@ -25,5 +26,5 @@ IUSE=""
 REQUIRED_USE=""
 
 RDEPEND="net-wireless/soapysdr
-   net-wireless/sdrplay"
+   >=net-wireless/sdrplay-3.07"
 DEPEND="${RDEPEND}"

1 2 3 4 5 6 >

1 - 100 of 512 matches

Mail list logo