Re: lua: Add missed lua 5.4 references

2022-07-04 Thread William Lallemand
On Tue, Jun 28, 2022 at 10:11:32AM +0200, Christian Ruppert wrote:
> On 2022-06-22 04:54, Willy Tarreau wrote:
> > Hi Christian,
> > 
> > On Tue, Jun 21, 2022 at 11:05:09PM +0200, Christian Ruppert wrote:
> >> Hey guys,
> >> 
> >> is there any news on this or got this one just lost? I couldn't find a
> >> response to it so I assume it just got lost.
> >> Or is there anything against it?
> >> To bad forwarding doesn't work and since this mail is quite old 
> >> already:
> >> https://www.mail-archive.com/haproxy@formilux.org/msg39689.html
> > 
> > Oh it definitely got lost in the noise. Could someone please repost it
> > with a slightly clearer description and fixing wrapping issues so that
> > we can apply it ?
> > 
> > Thanks!
> > Willy
> 
> Not sure if he's still around so I think it's ok if we do that.
> Attached the patch, based on his one.
> Should be backported to at least 2.6, 2.5 and 2.4 IMHO.
> Perhaps even 2.2? IIRC it got 5.4 support as well.
> 
> Tested against the current 2.7 master:
> ./haproxy -vv | grep -i lua
>OPTIONS = USE_PCRE2=1 USE_PCRE2_JIT= USE_THREAD=1 USE_LIBCRYPT=1 
> USE_OPENSSL=1 USE_LUA=1 USE_ZLIB= USE_SLZ=1 USE_NS=1 USE_51DEGREES= 
> USE_WURFL= USE_SYSTEMD= USE_PROMEX=
> Feature list : +EPOLL -KQUEUE +NETFILTER -PCRE -PCRE_JIT +PCRE2 
> -PCRE2_JIT +POLL +THREAD +BACKTRACE -STATIC_PCRE -STATIC_PCRE2 +TPROXY 
> +LINUX_TPROXY +LINUX_SPLICE +LIBCRYPT +CRYPT_H -ENGINE +GETADDRINFO 
> +OPENSSL +LUA +ACCEPT4 -CLOSEFROM -ZLIB +SLZ +CPU_AFFINITY +TFO +NS +DL 
> +RT -DEVICEATLAS -51DEGREES -WURFL -SYSTEMD -OBSOLETE_LINKER +PRCTL 
> -PROCCTL +THREAD_DUMP -EVPORTS -OT -QUIC -PROMEX -MEMORY_PROFILING
> Built with Lua version : Lua 5.4.2
> 

Thanks, applied!

-- 
William Lallemand



Re: lua: Add missed lua 5.4 references

2022-06-21 Thread Willy Tarreau
Hi Christian,

On Tue, Jun 21, 2022 at 11:05:09PM +0200, Christian Ruppert wrote:
> Hey guys,
> 
> is there any news on this or got this one just lost? I couldn't find a
> response to it so I assume it just got lost.
> Or is there anything against it?
> To bad forwarding doesn't work and since this mail is quite old already:
> https://www.mail-archive.com/haproxy@formilux.org/msg39689.html

Oh it definitely got lost in the noise. Could someone please repost it
with a slightly clearer description and fixing wrapping issues so that
we can apply it ?

Thanks!
Willy



Re: lua: Add missed lua 5.4 references

2022-06-21 Thread Christian Ruppert

Hey guys,

is there any news on this or got this one just lost? I couldn't find a 
response to it so I assume it just got lost.

Or is there anything against it?
To bad forwarding doesn't work and since this mail is quite old already:
https://www.mail-archive.com/haproxy@formilux.org/msg39689.html

--
Regards,
Christian Ruppert



lua: Add missed lua 5.4 references

2021-02-01 Thread Callum Farmer
Add missed lua 5.4 references
Missed in INSTALL and Makefile
Lua 5.4 support has already been added (needs backport to 2.0)
--- a/INSTALL
+++ b/INSTALL
@@ -295,9 +295,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 :
--- a/Makefile
+++ b/Makefile
@@ -589,11 +589,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= (where  can be lua5.3,
lua53, lua, ...))
+$(error unable to automatically detect the Lua library name, you can
enforce its name with LUA_LIB_NAME= (where  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