Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2021-02-04 20:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy" Thu Feb 4 20:23:49 2021 rev:97 rq:868970 version:2.3.4+git0.10189c965 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2021-01-15 19:45:29.425955912 +0100 +++ /work/SRC/openSUSE:Factory/.haproxy.new.28504/haproxy.changes 2021-02-04 20:24:25.498858307 +0100 @@ -1,0 +2,5 @@ +Wed Jan 27 16:19:26 UTC 2021 - Callum Farmer <[email protected]> + +- Add lua54.patch to fix building with lua 5.4 + +------------------------------------------------------------------- New: ---- lua54.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.UEhuIQ/_old 2021-02-04 20:24:26.530859878 +0100 +++ /var/tmp/diff_new_pack.UEhuIQ/_new 2021-02-04 20:24:26.534859884 +0100 @@ -101,6 +101,7 @@ Patch1: haproxy-1.6.0_config_haproxy_user.patch Patch2: haproxy-1.6.0-makefile_lib.patch Patch3: haproxy-1.6.0-sec-options.patch +Patch4: lua54.patch # Source98: series Source99: haproxy-rpmlintrc @@ -136,6 +137,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build make %{?_smp_mflags} \ ++++++ lua54.patch ++++++ --- a/Makefile +++ b/Makefile @@ -101,7 +101,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). # IGNOREGIT : ignore GIT commit versions if set. # VERSION : force haproxy version reporting. # SUBVERS : add a sub-version (eg: platform, model, ...). @@ -579,11 +579,11 @@ 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, lua5.3, lua53, 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 --- a/INSTALL +++ b/INSTALL @@ -295,9 +295,9 @@ 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 :
