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 <id...@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 <id...@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 $? -}
