* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2017-05-09 17:08 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2017-05-09 17:08 UTC (permalink / raw
To: gentoo-commits
commit: b9d1de111d7d110c24c83b7b0c60686bc9471f7e
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue May 9 12:30:55 2017 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue May 9 17:08:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9d1de11
net-proxy/haproxy: Fix contrib patch for 1.7.5
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-proxy/haproxy/files/haproxy-1.7-contrib.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch b/net-proxy/haproxy/files/haproxy-1.7-contrib.patch
index 836c4cf71de..9ecffe7e3c7 100644
--- a/net-proxy/haproxy/files/haproxy-1.7-contrib.patch
+++ b/net-proxy/haproxy/files/haproxy-1.7-contrib.patch
@@ -10,17 +10,6 @@ diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/tcploop/Makefile haproxy
clean:
rm -f $(OBJS) *.[oas] *~
-diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/tcploop/tcploop.c haproxy-1.7.9999/contrib/tcploop/tcploop.c
---- haproxy-1.7.9999.orig/contrib/tcploop/tcploop.c 2016-12-04 16:08:05.498256665 -0800
-+++ haproxy-1.7.9999/contrib/tcploop/tcploop.c 2016-12-04 16:11:13.877864378 -0800
-@@ -39,6 +39,7 @@
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <netdb.h>
- #include <poll.h>
- #include <signal.h>
diff -Nuar --exclude '*~' haproxy-1.7.9999.orig/contrib/spoa_example/Makefile haproxy-1.7.9999/contrib/spoa_example/Makefile
--- haproxy-1.7.9999.orig/contrib/spoa_example/Makefile 2016-12-04 15:56:49.068302156 -0800
+++ haproxy-1.7.9999/contrib/spoa_example/Makefile 2016-12-04 15:58:51.360644213 -0800
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2017-05-22 18:44 Robin H. Johnson
0 siblings, 0 replies; 8+ messages in thread
From: Robin H. Johnson @ 2017-05-22 18:44 UTC (permalink / raw
To: gentoo-commits
commit: dc8d1598df949105b59ad6d7fda54cc67dbb24e9
Author: Bertrand Jacquin <bertrand <AT> jacquin <DOT> bzh>
AuthorDate: Tue Dec 13 00:43:48 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 22 18:43:39 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc8d1598
net-proxy/haproxy: Handle stopping multiple proc
When haproxy is configured to use more than 1 proc, it creates a PID
file listing all PID, with 1 PID per line. Since start-stop-daemon only
handle 1 PID per pidfile, we need to had some magic in the init script in
order to stop every process haproxy previously started.
See: https://bugs.gentoo.org/show_bug.cgi?id=584410
Package-Manager: portage-2.3.0
(cherry picked from commit 551acd9853212fd0debf4563312af88908b7b497)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Fixes: https://github.com/gentoo/gentoo/pull/3104/
net-proxy/haproxy/files/haproxy.initd-r3 | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/net-proxy/haproxy/files/haproxy.initd-r3 b/net-proxy/haproxy/files/haproxy.initd-r3
index 2ad38fc9ebc..abba9f86534 100644
--- a/net-proxy/haproxy/files/haproxy.initd-r3
+++ b/net-proxy/haproxy/files/haproxy.initd-r3
@@ -60,6 +60,17 @@ stop_pre() {
fi
}
+stop() {
+ local _t _pid
+
+ _t="$(mktemp)"
+ for _pid in $(cat ${pidfile}) ; do
+ echo "${_pid}" > "${_t}"
+ pidfile="${_t}" openrc_default_stop
+ done
+ rm -f "${_t}"
+}
+
reload() {
checkconfig || { eerror "Reloading failed, please fix your config(s) first"; return 1; }
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2021-09-21 18:26 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-09-21 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 23411f7dc9810cf379414a43fbab00738af3417b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Sep 21 17:01:57 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Sep 21 18:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23411f7d
net-proxy/haproxy: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/22357
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/haproxy-2.3.0-hpack-VAR_ARRAY.patch | 37 ----------------------
1 file changed, 37 deletions(-)
diff --git a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch b/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
deleted file mode 100644
index 4f6bf4cf717..00000000000
--- a/net-proxy/haproxy/files/haproxy-2.3.0-hpack-VAR_ARRAY.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 759146f0de143939b841ba987aabb83aa178a4fc Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@qasl.de>
-Date: Mon, 9 Nov 2020 09:15:21 +0100
-Subject: [PATCH] hpack-tbl-t.h uses VAR_ARRAY and requires compiler.h to be
- included
-
-This fixes building hpack from contrib, which failed because of the
-undeclared VAR_ARRAY:
-
-make -C contrib/hpack
-...
-cc -O2 -Wall -g -I../../include -fwrapv -fno-strict-aliasing -c -o gen-enc.o gen-enc.c
-In file included from gen-enc.c:18:
-../../include/haproxy/hpack-tbl-t.h:105:23: error: 'VAR_ARRAY' undeclared here (not in a function)
- 105 | struct hpack_dte dte[VAR_ARRAY]; /* dynamic table entries */
-...
-
-Signed-off-by: Christian Ruppert <idl0r@qasl.de>
----
- include/haproxy/hpack-tbl-t.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/haproxy/hpack-tbl-t.h b/include/haproxy/hpack-tbl-t.h
-index 344f665dd..07f1ca9ea 100644
---- a/include/haproxy/hpack-tbl-t.h
-+++ b/include/haproxy/hpack-tbl-t.h
-@@ -28,6 +28,7 @@
- #define _HAPROXY_HPACK_TBL_T_H
-
- #include <inttypes.h>
-+#include "compiler.h"
-
- /* Dynamic Headers Table, usable for tables up to 4GB long and values of 64kB-1.
- * The model can be improved by using offsets relative to the table entry's end
---
-2.26.2
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2022-12-28 8:16 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2022-12-28 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 16a34069d260ef001af09be5625853c9917c01bd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 27 17:12:06 2022 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 08:16:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16a34069
net-proxy/haproxy: remove unused patch/file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28855
Signed-off-by: Christian Ruppert <idl0r <AT> 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..000000000000
--- 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 <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/files/haproxy.initd-r6 b/net-proxy/haproxy/files/haproxy.initd-r6
deleted file mode 100644
index 9b7c5fe973ba..000000000000
--- 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" ]; 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 -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 $?
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2023-02-13 9:02 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2023-02-13 9:02 UTC (permalink / raw
To: gentoo-commits
commit: fe7293b8570b8fdd206764ffa04e9f568b7fd010
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 10 18:47:45 2023 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 09:01:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7293b8
net-proxy/haproxy: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29538
Signed-off-by: Christian Ruppert <idl0r <AT> 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..000000000000
--- 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 $?
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2023-08-14 5:58 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2023-08-14 5:58 UTC (permalink / raw
To: gentoo-commits
commit: 631d2cd0f0c9ac835818da5434bd683edc86bbeb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:40:41 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Aug 14 05:58:07 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631d2cd0
net-proxy/haproxy: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32284
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch | 49 ----------------------
1 file changed, 49 deletions(-)
diff --git a/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch b/net-proxy/haproxy/files/haproxy-2.4.22-hpack.patch
deleted file mode 100644
index f744eccfaba9..000000000000
--- a/net-proxy/haproxy/files/haproxy-2.4.22-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
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2023-08-21 17:02 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2023-08-21 17:02 UTC (permalink / raw
To: gentoo-commits
commit: 031545bda42452b21874a77a8d939f7de9a0c134
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 21 17:02:17 2023 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Aug 21 17:02:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=031545bd
net-proxy/haproxy: Cleanup old confd
Signed-off-by: Christian Ruppert <idl0r <AT> 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..000000000000
--- 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
-#}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/
@ 2023-12-18 15:01 Christian Ruppert
0 siblings, 0 replies; 8+ messages in thread
From: Christian Ruppert @ 2023-12-18 15:01 UTC (permalink / raw
To: gentoo-commits
commit: f19cc4e0e26fdc341b85ee8921c25586e7c3af40
Author: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 15:01:04 2023 +0000
Commit: Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 15:01:33 2023 +0000
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 <idl0r <AT> 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 $?
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-18 15:01 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-18 15:01 [gentoo-commits] repo/gentoo:master commit in: net-proxy/haproxy/files/ Christian Ruppert
-- strict thread matches above, loose matches on Subject: below --
2023-08-21 17:02 Christian Ruppert
2023-08-14 5:58 Conrad Kostecki
2023-02-13 9:02 Christian Ruppert
2022-12-28 8:16 Christian Ruppert
2021-09-21 18:26 Conrad Kostecki
2017-05-22 18:44 Robin H. Johnson
2017-05-09 17: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