* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2017-12-04 9:08 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2017-12-04 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 2df7fdcc546b4b8d9db9198771fae6f8278324c0
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 09:08:19 2017 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 09:08:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df7fdcc
net-proxy/haproxy: Version bump to 1.8.1
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-proxy/haproxy/Manifest | 2 +-
net-proxy/haproxy/files/haproxy-1.8-contrib.patch | 81 ----------------------
.../{haproxy-1.8.0.ebuild => haproxy-1.8.1.ebuild} | 2 -
3 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index a5314a77b67..82fd0ce0096 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -3,4 +3,4 @@ DIST haproxy-1.5.19.tar.gz 1362834 SHA256 e00ae2a633da614967f2e3ebebdb817ec537cb
DIST haproxy-1.6.11.tar.gz 1574029 SHA256 62fe982edb102a9f55205792bc14b0d05745cc7993cd6bee5d73cd3c5ae16ace SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434 WHIRLPOOL 4454c51da89bb089579aefcf54093fd4c09b42918e81e41772d263ebc19f243a37b42135a02c4012705e4cc31370f377cf0b429e81707f307cffe9ed23f5183b
DIST haproxy-1.6.13.tar.gz 1580214 SHA256 7d318583f3a1bf185e857bd40449004b29c95547c89bbb36718f284e29502a1b SHA512 ffed3b347e0cd9cefdc379c91890a3c104d6848b976a9f28984878a9c2d05ca7ddea678f7a93f75cb9d29ae2be921e5a5bd295b1a8771765b099d1c619ded7a3 WHIRLPOOL 70176ee090dacbbdc822c74bba137589f168482c560734c06b98dc23b4d957ed1e016309f11f25a0b486bc6917633455f1174dc6688d6aef53667c61b83a9ff3
DIST haproxy-1.7.9.tar.gz 1748159 BLAKE2B 6826ad3519ff300fb1c91992014834543f971fade8a8b89956d4cd1fc0000b1b3e259586a21ee9fa8ca0ee1f4520517dfc328d83d7a858f469f0366df6e3da43 SHA512 d1ed791bc9607dbeabcfc6a1853cf258e28b3a079923b63d3bf97504dd59e64a5f5f44f9da968c23c12b4279e8d45ff3bd39418942ca6f00d9d548c9a0ccfd73
-DIST haproxy-1.8.0.tar.gz 2036854 BLAKE2B c7cebcb3e27f61f8fd65e084c8557c6ecbde07a9517c5950330b315cc76a4ced86272ca7b75a292380a867229be5e2b4e65514d4daae276472fa4d6a7919798c SHA512 7461c49cc00e7d6baf08dad9aba77e2b5cbbb532a902131838b0cc670a9ea85232f2da7187c3463c3bb76ca6955e17ce7eeec57378c002aaac3cf1dfbaf6cceb
+DIST haproxy-1.8.1.tar.gz 2038215 BLAKE2B 85365fd581a665ec08eaf799a22cecdb95c59485f4846544aafdce38fce3819778d5adb3a652e9b5560973fef4acd348d13f1d545ccd7abf7c9bc67ce1c82049 SHA512 c59bbd144afae01a3802065bf507dc1ca70f09e7112a9f502474ec6758d3ccab084550372562d2906f1e0b9509464e316ca6f95e3575d7273aba49f350791caa
diff --git a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch b/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
deleted file mode 100644
index a3e336a5773..00000000000
--- a/net-proxy/haproxy/files/haproxy-1.8-contrib.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From c702537864f7e062d18f4ccce3e29d14d4ccf05f Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Thu, 30 Nov 2017 10:11:36 +0100
-Subject: [PATCH] Fix LDFLAGS vs. LIBS re linking order
-
-Signed-off-by: Christian Ruppert <idl0r@gentoo.org>
----
- contrib/mod_defender/Makefile | 5 ++---
- contrib/modsecurity/Makefile | 5 ++---
- contrib/spoa_example/Makefile | 5 ++---
- 3 files changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/contrib/mod_defender/Makefile b/contrib/mod_defender/Makefile
-index ac17774d..efc7d7f6 100644
---- a/contrib/mod_defender/Makefile
-+++ b/contrib/mod_defender/Makefile
-@@ -28,9 +28,8 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS += -g -Wall -pthread
--LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
- INCS += -I../../include -I../../ebtree -I$(MOD_DEFENDER_SRC) -I$(APACHE2_INC) -I$(APR_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lapr-1 -laprutil-1 -lstdc++ -lm
-
- CXXFLAGS = -g -std=gnu++11
- CXXINCS += -I$(MOD_DEFENDER_SRC) -I$(MOD_DEFENDER_SRC)/deps -I$(APACHE2_INC) -I$(APR_INC)
-@@ -43,7 +42,7 @@ CXXSRCS = $(wildcard $(MOD_DEFENDER_SRC)/*.cpp)
- CXXOBJS = $(patsubst %.cpp, %.o, $(CXXSRCS))
-
- defender: $(OBJS) $(CXXOBJS)
-- $(LD) -o $@ $^ $(LDFLAGS) $(LIBS)
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: defender
- install defender $(DESTDIR)$(BINDIR)
-diff --git a/contrib/modsecurity/Makefile b/contrib/modsecurity/Makefile
-index bb918c30..aa0d6e38 100644
---- a/contrib/modsecurity/Makefile
-+++ b/contrib/modsecurity/Makefile
-@@ -34,14 +34,13 @@ EVENT_INC := /usr/include
- endif
-
- CFLAGS += -g -Wall -pthread
--LDFLAGS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
- INCS += -I../../include -I../../ebtree -I$(MODSEC_INC) -I$(APACHE2_INC) -I$(APR_INC) -I$(LIBXML_INC) -I$(EVENT_INC)
--LIBS =
-+LIBS += -lpthread $(EVENT_LIB) -levent_pthreads -lcurl -lapr-1 -laprutil-1 -lxml2 -lpcre -lyajl
-
- OBJS = spoa.o modsec_wrapper.o
-
- modsecurity: $(OBJS)
-- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^ $(MODSEC_LIB)/standalone.a
-+ $(LD) $(LDFLAGS) -o $@ $^ $(MODSEC_LIB)/standalone.a $(LIBS)
-
- install: modsecurity
- install modsecurity $(DESTDIR)$(BINDIR)
-diff --git a/contrib/spoa_example/Makefile b/contrib/spoa_example/Makefile
-index d04a01e1..c44c2b87 100644
---- a/contrib/spoa_example/Makefile
-+++ b/contrib/spoa_example/Makefile
-@@ -6,15 +6,14 @@ CC = gcc
- LD = $(CC)
-
- CFLAGS = -g -O2 -Wall -Werror -pthread
--LDFLAGS = -lpthread -levent -levent_pthreads
- INCS += -I../../ebtree -I./include
--LIBS =
-+LIBS = -lpthread -levent -levent_pthreads
-
- OBJS = spoa.o
-
-
- spoa: $(OBJS)
-- $(LD) $(LDFLAGS) $(LIBS) -o $@ $^
-+ $(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- install: spoa
- install spoa $(DESTDIR)$(BINDIR)
---
-2.13.6
diff --git a/net-proxy/haproxy/haproxy-1.8.0.ebuild b/net-proxy/haproxy/haproxy-1.8.1.ebuild
similarity index 96%
rename from net-proxy/haproxy/haproxy-1.8.0.ebuild
rename to net-proxy/haproxy/haproxy-1.8.1.ebuild
index 80e41f24b2a..258b51e7e7d 100644
--- a/net-proxy/haproxy/haproxy-1.8.0.ebuild
+++ b/net-proxy/haproxy/haproxy-1.8.1.ebuild
@@ -50,8 +50,6 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-version_is_at_least 1.7.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.7-contrib.patch )
-version_is_at_least 1.8.0 $PV && PATCHES=( "${FILESDIR}"/haproxy-1.8-contrib.patch )
CONTRIBS=( halog iprange )
# ip6range is present in 1.6, but broken.
version_is_at_least 1.7.0 $PV && CONTRIBS+=( ip6range spoa_example tcploop )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2019-01-29 8:47 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2019-01-29 8:47 UTC (permalink / raw
To: gentoo-commits
commit: f67e1a08b47a6993b97d1d3e27666249e1cfaeb1
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 29 08:46:29 2019 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 08:47:23 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67e1a08
net-proxy/haproxy: Cleanup old versions
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Christian Ruppert <idl0r <AT> gentoo.org>
net-proxy/haproxy/Manifest | 2 -
net-proxy/haproxy/files/haproxy.initd-r2 | 46 ----------
net-proxy/haproxy/haproxy-1.5.14.ebuild | 134 ----------------------------
net-proxy/haproxy/haproxy-1.5.19-r2.ebuild | 135 -----------------------------
4 files changed, 317 deletions(-)
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 4bfa08e4930..1c0b0271536 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,5 +1,3 @@
-DIST haproxy-1.5.14.tar.gz 1345345 BLAKE2B b2971826c81716f126e3f9cef9861c425a44348fb0824ea65f55c82917f8b80441ee7752bff5e1c1c9cf22492577b0bf256b2955cba7c81f79e1e19616eb7a41 SHA512 83d6101fd402f37845ab3febc914335e4c6d9bdebbb0ff81c8e048d5252ffa5a1b77c4250a434fed5dd541ef1f1f2c47d969b59f7a51d6ab9aea38a8646a9798
-DIST haproxy-1.5.19.tar.gz 1362834 BLAKE2B 72543acf3e78b804e778746ae0dbd1a386e31c9f3f956d91da49e5c4c5f2ace8e46e99372148e7cb97f52a1812501c21319c06eb0230928522d674825b3b1e17 SHA512 3462458350d76fe5634428f7b443f21e2d8d4a171ab6254736db2d64587707d11d0df1d851d629c5a2cdfb2858e98cc9345d592859c6d6d8a352b57542dc465a
DIST haproxy-1.6.11.tar.gz 1574029 BLAKE2B 553f74c2c24a1b07cef2acc6fbc4def1bbe81e41a7b01ba44937c6ff2e14c1f1a4f1472dde229ecef1ed3170f4e89d356324cb2ce1e7d7064837f37fbd4c3b46 SHA512 73ff1c7301197b3bd75a3b1355787419676854d132ce2dcdacb2a296e297dcdfc52b0c571a4fb715e369f1126e1a58196fabb21f828c880f15904032da78e434
DIST haproxy-1.6.14.tar.gz 1583859 BLAKE2B 91695f0b3d901ba70b6bce6572c2f549479c28010ed391b20faae7cd1fd84cdb181e560353337eb9230e38ac2570673725884c131501820c3ef4559ef12f95f2 SHA512 389be3935d901af1fb3a748b5bf73a454578a3ca3e4cc0b881980c2f1e875c47feb2681b42f8d9244d70777261a965c8e47cf5175b7790ff995bff8333902a11
DIST haproxy-1.7.10.tar.gz 1750937 BLAKE2B 26d970862e415b079d4130fd00564677584a7aad74d6812cabed36de9a629321330434b7d4fdf7c2e8b2945b7f394ca33e444158e7fa9b49937db501ea33e78a SHA512 ca6c50848c559ee2ffb9af2d281c3931473dd90d1686d95d962cf604cd92d2feb2b63e006e217cf9078cf08fdd73dc523318c97e13400bc0ef325de47111394e
diff --git a/net-proxy/haproxy/files/haproxy.initd-r2 b/net-proxy/haproxy/files/haproxy.initd-r2
deleted file mode 100644
index e58c7c1fbfb..00000000000
--- a/net-proxy/haproxy/files/haproxy.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="checkconfig"
-extra_started_commands="reload"
-
-command="/usr/bin/haproxy"
-pidfile="/run/${SVCNAME}.pid"
-
-if [ -z "${CONFFILE}" -a -d "/etc/haproxy" -a -f "/etc/haproxy/${SVCNAME}.cfg" ]; then
- CONFFILE=/etc/haproxy/${SVCNAME}.cfg
-else
- CONFFILE=/etc/${SVCNAME}.cfg
-fi
-
-command_args="-D -p ${pidfile} -f ${CONFFILE}"
-
-depend() {
- need net
- use dns logger
-}
-
-checkconfig() {
- if [ ! -f "${CONFFILE}" ]; then
- eerror "${CONFFILE} does not exist!"
- return 1
- fi
-
- ebegin "Checking ${CONFFILE}"
- $command -q -c -f "${CONFFILE}"
- eend $?
-}
-
-stop_pre() {
- if [ "${RC_CMD}" = "restart" ]; then
- checkconfig || return 1
- fi
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME}"
- checkconfig || { eerror "Reloading failed, please fix your ${CONFFILE} first"; return 1; }
- $command -D -p "${pidfile}" -f "${CONFFILE}" -sf $(cat "${pidfile}")
- eend $?
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.14.ebuild b/net-proxy/haproxy/haproxy-1.5.14.ebuild
deleted file mode 100644
index 6a343de9ba8..00000000000
--- a/net-proxy/haproxy/haproxy-1.5.14.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic systemd
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="pcre? ( dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- ssl? ( dev-libs/openssl:0[zlib?] )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_prepare() {
- sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
- > contrib/systemd/haproxy.service || die
-
- sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
-}
-
-src_compile() {
- local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
- if use pcre ; then
- args="${args} USE_PCRE=1"
- if use pcre-jit; then
- args="${args} USE_PCRE_JIT=1"
- else
- args="${args} USE_PCRE_JIT="
- fi
- else
- args="${args} USE_PCRE= USE_PCRE_JIT="
- fi
-
-# if use kernel_linux; then
-# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-# else
-# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-# fi
-
- if use crypt ; then
- args="${args} USE_LIBCRYPT=1"
- else
- args="${args} USE_LIBCRYPT="
- fi
-
- if use ssl ; then
- args="${args} USE_OPENSSL=1"
- else
- args="${args} USE_OPENSSL="
- fi
-
- if use zlib ; then
- args="${args} USE_ZLIB=1"
- else
- args="${args} USE_ZLIB="
- fi
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
-
- if use tools ; then
- for contrib in halog iprange ; do
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
- done
- fi
-}
-
-src_install() {
- dobin haproxy
-
- newinitd "${FILESDIR}/haproxy.initd-r2" haproxy
-
- # Don't install useless files
-# rm examples/build.cfg doc/*gpl.txt
-
- dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
- doman doc/haproxy.1
-
- dobin haproxy-systemd-wrapper
- systemd_dounit contrib/systemd/haproxy.service
-
- if use tools ; then
- for contrib in halog iprange ; do
- dobin contrib/${contrib}/${contrib}
- done
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${ROOT}usr/share/doc/${PF}"
- fi
- fi
-}
diff --git a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild b/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
deleted file mode 100644
index 7b4655b91af..00000000000
--- a/net-proxy/haproxy/haproxy-1.5.19-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit user versionator toolchain-funcs flag-o-matic systemd
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://haproxy.1wt.eu"
-SRC_URI="http://haproxy.1wt.eu/download/$(get_version_component_range 1-2)/src/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+crypt examples libressl +pcre pcre-jit ssl tools vim-syntax +zlib"
-
-DEPEND="
- pcre? (
- dev-libs/libpcre
- pcre-jit? ( dev-libs/libpcre[jit] )
- )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[zlib?] )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup haproxy
- enewuser haproxy -1 -1 -1 haproxy
-}
-
-src_compile() {
- local args="TARGET=linux2628 USE_GETADDRINFO=1"
-
- if use pcre ; then
- args="${args} USE_PCRE=1"
- if use pcre-jit; then
- args="${args} USE_PCRE_JIT=1"
- else
- args="${args} USE_PCRE_JIT="
- fi
- else
- args="${args} USE_PCRE= USE_PCRE_JIT="
- fi
-
-# if use kernel_linux; then
-# args="${args} USE_LINUX_SPLICE=1 USE_LINUX_TPROXY=1"
-# else
-# args="${args} USE_LINUX_SPLICE= USE_LINUX_TPROXY="
-# fi
-
- if use crypt ; then
- args="${args} USE_LIBCRYPT=1"
- else
- args="${args} USE_LIBCRYPT="
- fi
-
- if use ssl ; then
- args="${args} USE_OPENSSL=1"
- else
- args="${args} USE_OPENSSL="
- fi
-
- if use zlib ; then
- args="${args} USE_ZLIB=1"
- else
- args="${args} USE_ZLIB="
- fi
-
- # For now, until the strict-aliasing breakage will be fixed
- append-cflags -fno-strict-aliasing
-
- emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
- emake -C contrib/systemd SBINDIR=/usr/sbin
-
- if use tools ; then
- for contrib in halog iprange ; do
- emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
- done
- fi
-}
-
-src_install() {
- dosbin haproxy
- dosym /usr/sbin/haproxy /usr/bin/haproxy
-
- newinitd "${FILESDIR}/haproxy.initd-r6" haproxy
-
- # Don't install useless files
-# rm examples/build.cfg doc/*gpl.txt
-
- dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
- doman doc/haproxy.1
-
- dosbin haproxy-systemd-wrapper
- dosym /usr/sbin/haproxy-systemd-wrapper /usr/bin/haproxy-systemd-wrapper
- systemd_dounit contrib/systemd/haproxy.service
-
- if use tools ; then
- for contrib in halog iprange ; do
- dobin contrib/${contrib}/${contrib}
- done
- fi
-
- if use examples ; then
- docinto examples
- dodoc examples/*.cfg
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins examples/haproxy.vim
- fi
-}
-
-pkg_postinst() {
- if [[ ! -f "${ROOT}/etc/haproxy.cfg" ]] ; then
- ewarn "You need to create /etc/haproxy.cfg before you start the haproxy service."
- ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
- ewarn "Make use of them with the \"user\" and \"group\" directives."
-
- if [[ -d "${ROOT}/usr/share/doc/${PF}" ]]; then
- einfo "Please consult the installed documentation for learning the configuration file's syntax."
- einfo "The documentation and sample configuration files are installed here:"
- einfo " ${ROOT}usr/share/doc/${PF}"
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2022-04-06 13:22 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2022-04-06 13:22 UTC (permalink / raw
To: gentoo-commits
commit: f0c1f3a38f315e6b838aa1628ca2f69db33039ca
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 6 13:19:22 2022 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Apr 6 13:22:49 2022 +0000
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 <idl0r <AT> 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.9999.ebuild | 2 +-
...roxy-2.2.22.ebuild => haproxy-2.2.22-r1.ebuild} | 2 +-
net-proxy/haproxy/haproxy-2.2.9999.ebuild | 2 +-
...roxy-2.4.15.ebuild => haproxy-2.4.15-r1.ebuild} | 2 +-
net-proxy/haproxy/haproxy-2.4.9999.ebuild | 2 +-
...aproxy-2.5.5.ebuild => haproxy-2.5.5-r1.ebuild} | 2 +-
net-proxy/haproxy/haproxy-2.5.9999.ebuild | 2 +-
.../{haproxy-2.4.15.ebuild => haproxy-9999.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 000000000000..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.9999.ebuild b/net-proxy/haproxy/haproxy-2.0.9999.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.0.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.0.9999.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.2.22.ebuild b/net-proxy/haproxy/haproxy-2.2.22-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.2.22.ebuild
rename to net-proxy/haproxy/haproxy-2.2.22-r1.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.2.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.22-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.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index db0148b44e73..4b054f13c306 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.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.4.15.ebuild b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
similarity index 99%
copy from net-proxy/haproxy/haproxy-2.4.15.ebuild
copy to net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.15-r1.ebuild
@@ -125,7 +125,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.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -125,7 +125,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.5.5.ebuild b/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.5.5.ebuild
rename to net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.5.5.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.5-r1.ebuild
@@ -125,7 +125,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.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index 22b2de178900..0b3865f3f4f6 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -125,7 +125,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.4.15.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
similarity index 86%
rename from net-proxy/haproxy/haproxy-2.4.15.ebuild
rename to net-proxy/haproxy/haproxy-9999.ebuild
index 22b2de178900..db1e3fcb7d17 100644
--- a/net-proxy/haproxy/haproxy-2.4.15.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -16,12 +16,12 @@ if [[ ${PV} != *9999 ]]; then
SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
else
- EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+ EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
EGIT_BRANCH=master
fi
LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
+SLOT="0/${PV}"
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 )
@@ -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=${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=${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
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=${ERROT}/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=${ERROT}/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
@@ -125,7 +125,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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2022-06-28 9:27 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2022-06-28 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 1e135fe1d9b508e778de85d44f40382f2221f7ea
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 09:25:58 2022 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 09:27:12 2022 +0000
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 <idl0r <AT> 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.9999.ebuild | 6 ++-
net-proxy/haproxy/haproxy-2.6.1.ebuild | 6 ++-
net-proxy/haproxy/haproxy-2.6.9999.ebuild | 6 ++-
net-proxy/haproxy/haproxy-9999.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 000000000000..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 <idl0r@qasl.de>
+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 <idl0r@qasl.de>
+---
+ 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=<name> (where <name> can be lua5.3, lua53, lua, ...))
++$(error unable to automatically detect the Lua library name, you can enforce its name with LUA_LIB_NAME=<name> (where <name> 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} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@ 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} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 2b772750ef60..fe83c6a1fb10 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@ 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} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-2.6.1.ebuild b/net-proxy/haproxy/haproxy-2.6.1.ebuild
index daf0687ac086..dbf2cbf0aea1 100644
--- a/net-proxy/haproxy/haproxy-2.6.1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@ 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} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index daf0687ac086..dbf2cbf0aea1 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@ 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} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index daf0687ac086..dbf2cbf0aea1 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-LUA_COMPAT=( lua5-3 )
+LUA_COMPAT=( lua5-4 lua5-3 )
[[ ${PV} == *9999 ]] && SCM="git-r3"
inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
@@ -53,6 +53,10 @@ 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} <USE flag> <make option>"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2023-02-14 16:13 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2023-02-14 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 8eceece0888e0788c3829c998d3ce7f1e2c72e83
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 16:05:33 2023 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 16:13:38 2023 +0000
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 <idl0r <AT> 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 b5c126c6e0249ebd461bd1a98c63f821392a665f0ae2c6cb1527becb5e1be6326121680f17b6f96785e9a7bd6b5bc6789091eb21cb70000c2fc7b88cd6a87b12
-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 2222e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77 SHA512 24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
+DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a SHA512 f9eeee2d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
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..000000000000
--- 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 <adarragon@haproxy.com>
-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 @@ uint8_t buf[MAX_RQ_SIZE];
- char trash_buf[MAX_RQ_SIZE];
- char tmp_buf[MAX_RQ_SIZE];
-
--struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
-+THREAD_LOCAL struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
- struct buffer tmp = { .area = tmp_buf, .data = 0, .size = sizeof(tmp_buf) };
-
- /* displays a <len> long memory block at <buf>, assuming first byte of <buf>
---
-2.34.1
-
diff --git a/net-proxy/haproxy/haproxy-2.2.28.ebuild b/net-proxy/haproxy/haproxy-2.2.29.ebuild
similarity index 100%
rename from net-proxy/haproxy/haproxy-2.2.28.ebuild
rename to net-proxy/haproxy/haproxy-2.2.29.ebuild
diff --git a/net-proxy/haproxy/haproxy-2.4.21.ebuild b/net-proxy/haproxy/haproxy-2.4.22.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.4.21.ebuild
rename to net-proxy/haproxy/haproxy-2.4.22.ebuild
index 66852a7eb802..41eaaee5bb19 100644
--- a/net-proxy/haproxy/haproxy-2.4.21.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.22.ebuild
@@ -52,7 +52,6 @@ S="${WORKDIR}/${MY_P}"
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-PATCHES=( "${FILESDIR}/${PN}-2.7.2-hpack.patch" )
haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-2.7.2.ebuild b/net-proxy/haproxy/haproxy-2.6.9.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.7.2.ebuild
rename to net-proxy/haproxy/haproxy-2.6.9.ebuild
index 62b7196b5198..83227697a6a5 100644
--- a/net-proxy/haproxy/haproxy-2.7.2.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9.ebuild
@@ -52,7 +52,6 @@ S="${WORKDIR}/${MY_P}"
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-PATCHES=( "${FILESDIR}/${P}-hpack.patch" )
haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
diff --git a/net-proxy/haproxy/haproxy-2.6.8.ebuild b/net-proxy/haproxy/haproxy-2.7.3.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.6.8.ebuild
rename to net-proxy/haproxy/haproxy-2.7.3.ebuild
index 484348984cb9..83227697a6a5 100644
--- a/net-proxy/haproxy/haproxy-2.6.8.ebuild
+++ b/net-proxy/haproxy/haproxy-2.7.3.ebuild
@@ -52,7 +52,6 @@ S="${WORKDIR}/${MY_P}"
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-PATCHES=( "${FILESDIR}/${PN}-2.7.2-hpack.patch" )
haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/
@ 2023-02-14 16:13 Christian Ruppert
0 siblings, 0 replies; 6+ messages in thread
From: Christian Ruppert @ 2023-02-14 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 5440524943be3eef14c2912ae789fa2b61e75380
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 16:13:14 2023 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 16:13:38 2023 +0000
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 <idl0r <AT> 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 2222e2265b57a252c596c066b2fed0de89669ac6b86e0c76b31ef2b73e2d8d090a51c46d34553aec6d70a2b61717df0d2ac2eb1053cae0364e3e84334ba35f77 SHA512 24d000a38d30502f09c3cd44425bf515382c0a7b1bc5a117a078a198f9c05d618a25148ddee0463458884fc566085d9847e5f89e3c7bda1758ccf5fddef7ebf5
DIST haproxy-2.7.3.tar.gz 4141275 BLAKE2B a72c3ee578c2a1fb1648779c4a7c692d136455f24c2e2afc2e3ce1dba651043b2e897a938bf1da9a790cb6f8c731c331301d085a953674f341fbedc1d8c0847a SHA512 f9eeee2d232fd2f4da1959e9265dd6abe6c6182109a0455d4f868a516e78cc6ea67e8456d5bc26e439385d17f52e4b179d7c615bacf15aeae901ab8e172dc758
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 000000000000..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 <adarragon@haproxy.com>
+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 @@ uint8_t buf[MAX_RQ_SIZE];
+ char trash_buf[MAX_RQ_SIZE];
+ char tmp_buf[MAX_RQ_SIZE];
+
+-struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
++THREAD_LOCAL struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
+ struct buffer tmp = { .area = tmp_buf, .data = 0, .size = sizeof(tmp_buf) };
+
+ /* displays a <len> long memory block at <buf>, assuming first byte of <buf>
+--
+2.34.1
+
diff --git a/net-proxy/haproxy/haproxy-2.4.22.ebuild b/net-proxy/haproxy/haproxy-2.4.22.ebuild
index 41eaaee5bb19..1dc2f69b3bad 100644
--- a/net-proxy/haproxy/haproxy-2.4.22.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.22.ebuild
@@ -52,6 +52,7 @@ S="${WORKDIR}/${MY_P}"
DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
+PATCHES=( "${FILESDIR}/${P}-hpack.patch" )
haproxy_use() {
(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-14 16:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-29 8:47 [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/, net-proxy/haproxy/ Christian Ruppert
-- strict thread matches above, loose matches on Subject: below --
2023-02-14 16:13 Christian Ruppert
2023-02-14 16:13 Christian Ruppert
2022-06-28 9:27 Christian Ruppert
2022-04-06 13:22 Christian Ruppert
2017-12-04 9:08 Christian Ruppert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox