gentoo auto-resync : 28:12:2022 - 14:12:52

3 files changed, 0 insertions, 150 deletions

diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index b193db47d60e..34213acd1e98 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -1,7 +1,5 @@
-AUX haproxy-lua54.patch 3224 BLAKE2B 104a5406ff2fdf0ca031e19acccfa7cbec34bbb3431f36d9160a55a4279420a1e55d9677b37aa3dcca3c968a0ce8aa78961afe10b4becafb6f3d6957d566771c SHA512 b455640c7f40db99f408c2f12b6196ef41aaa1d46cd40206a000ee1c34cf9fa0dcc063501342f7c2e398f99e3600be07d287936abd17beb8d8e16e805d59f5a6
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.confd-r1 637 BLAKE2B 5b79a652f0cd124ab9349ceee026c7b54de10c5c4ceccba189c856204fb149b2be667f1bcbd73cb438848d7b34f1ce15812c4fd0e3445b5a6d8c3bd77bdfeda4 SHA512 19cd0dad0fabf579b86c4de74f291e6caf6f5b91d9ae37da2315169dbb75fd35337a7a3e07f4d9e424cfe9776f39952c91f69abd6580c2df16b0d2cc8f3f099a
-AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 AUX haproxy.initd-r7 1705 BLAKE2B 6592a149144680d0a0fe124a1c87f26d4a5ef222d1b80bc940f6c8eeaca4cb24c6eb1766b75e1334d3331955c1b7bc65bddc337d7f1ab01813e70ca77e046313 SHA512 1acdd4806539656daf32277d66b1596de4c91ece34a8ec43b4948cf8c95b65ccdea58b152717596659db2c14d63602653e3858a108927fa6091ffae1a5a08d7e
 AUX haproxy.initd-r8 1677 BLAKE2B 2bc1d95f5718fd674dbac7f41df07f3d36f83667ffa91de7dea73878af368251ede94b0aed97074b6459a44d2867a69d10b4e4a26ca8a1a4c3e58f68078bbebf SHA512 164fbafeba8475085b7c3c3356f6a39a8c7ae9ed7d602391bd78185a55ed3aa342d5e4d0aa4c4e8f07581ea4299b50614b30808dff6e1f5beec834c55b3bf8a2
 DIST haproxy-2.2.25.tar.gz 2957420 BLAKE2B 58f85c063bada9c943415ff8a8e51232dec0f4c5b09d43c6a5437ff83bd2cb753bb81f67ad2c4b808cd1995ea6d4b2b2b70017a3f940007637fa398c5bb6884c SHA512 652a0d2eef0706ec506a949c560d7b99d111a75519daaa9a31ab53d99d7fdfc584c52d8401f257bb8f8ac58fc51f1403467749438fde684f064d616a2b4485a2
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 $?
-}