diff --git a/Add-support-for-the-Lua-5.4.patch b/Add-support-for-the-Lua-5.4.patch deleted file mode 100644 index 17c2621e2a8366cad0e5ba9a2789747993ba4a52..0000000000000000000000000000000000000000 --- a/Add-support-for-the-Lua-5.4.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 206999072ff408d2bbb8078e4dd4425b4bcfcfd9 Mon Sep 17 00:00:00 2001 -From: Christopher Faulet -Date: Tue, 28 Jul 2020 10:33:25 +0200 -Subject: [PATCH] MEDIUM: lua: Add support for the Lua 5.4 - -On Lua 5.4, some API changes make HAProxy compilation to fail. Among other -things, the lua_resume() function has changed and now takes an extra argument in -Lua 5.4 and the error LUA_ERRGCMM was removed. Thus the LUA_VERSION_NUM macro is -now tested to know the lua version is used and adapt the code accordingly. - -Here are listed the incompatibilities with the previous Lua versions : - - http://www.lua.org/manual/5.4/manual.html#8 - -This patch comes from the HAproxy's fedora RPM, committed by Tom Callaway : - - https://src.fedoraproject.org/rpms/haproxy/blob/db970613/f/haproxy-2.2.0-lua-5.4.patch - -This patch should fix the issue #730. It must be backported to 2.2 and probably -as far as 2.0. - -(cherry picked from commit 08ed98fd7963968de49593304fdd9234812845a4) -Signed-off-by: Christopher Faulet -(cherry picked from commit dc2e6f544fee393543cdeaae7bbb4fe57d49b409) -Signed-off-by: Christopher Faulet -(cherry picked from commit a500aee9f0d6e1fc17c65735944b4e5cb5c1165f) -Signed-off-by: Christopher Faulet ---- - src/hlua.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/hlua.c b/src/hlua.c -index 0b5eaafb9..c2d045ec2 100644 ---- a/src/hlua.c -+++ b/src/hlua.c -@@ -1080,6 +1080,9 @@ void hlua_hook(lua_State *L, lua_Debug *ar) - */ - static enum hlua_exec hlua_ctx_resume(struct hlua *lua, int yield_allowed) - { -+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 -+ int nres; -+#endif - int ret; - const char *msg; - const char *trace; -@@ -1110,7 +1113,11 @@ static enum hlua_exec hlua_ctx_resume(struct hlua *lua, int yield_allowed) - lua->start_time = now_ms; - - /* Call the function. */ -+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM >= 504 -+ ret = lua_resume(lua->T, gL.T, lua->nargs, &nres); -+#else - ret = lua_resume(lua->T, gL.T, lua->nargs); -+#endif - switch (ret) { - - case LUA_OK: -@@ -8278,10 +8285,12 @@ static int hlua_load(char **args, int section_type, struct proxy *curpx, - memprintf(err, "Lua message handler error: %s\n", lua_tostring(gL.T, -1)); - lua_pop(gL.T, 1); - return -1; -+#if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM <= 503 - case LUA_ERRGCMM: - memprintf(err, "Lua garbage collector error: %s\n", lua_tostring(gL.T, -1)); - lua_pop(gL.T, 1); - return -1; -+#endif - default: - memprintf(err, "Lua unknonwn error: %s\n", lua_tostring(gL.T, -1)); - lua_pop(gL.T, 1); diff --git a/haproxy-2.0.14.tar.gz b/haproxy-2.0.14.tar.gz deleted file mode 100644 index d6b6b3a7cc2a3fc8066a7b5fe4679c97e1cbc18b..0000000000000000000000000000000000000000 Binary files a/haproxy-2.0.14.tar.gz and /dev/null differ diff --git a/haproxy-2.2.1.tar.gz b/haproxy-2.2.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b3b81591baacda2d8e9b9160800c365f0e8e7cfa Binary files /dev/null and b/haproxy-2.2.1.tar.gz differ diff --git a/haproxy.spec b/haproxy.spec index 9f34264f37a9edf2e057b91a2242aef089c87083..881942b2c62e398cf92fb4d2814d506038e86646 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -4,19 +4,18 @@ %global _hardened_build 1 Name: haproxy -Version: 2.0.14 -Release: 2 +Version: 2.2.1 +Release: 1 Summary: The Reliable, High Performance TCP/HTTP Load Balancer License: GPLv2+ -URL: http://www.haproxy.org/ -Source0: http://www.haproxy.org/download/1.8/src/haproxy-%{version}.tar.gz +URL: https://www.haproxy.org/ +Source0: https://www.haproxy.org/download/2.0/src/%{name}-%{version}.tar.gz Source1: %{name}.service Source2: %{name}.cfg Source3: %{name}.logrotate Source4: %{name}.sysconfig -Patch0: Add-support-for-the-Lua-5.4.patch BuildRequires: gcc lua-devel pcre-devel zlib-devel openssl-devel systemd-devel systemd-units libatomic Requires: %{name}-help = %{version}-%{release} @@ -42,7 +41,7 @@ use_regparm_opt="USE_REGPARM=1" %make_build CPU="generic" TARGET="linux-glibc" USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 \ USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 ${use_regparm_opt} \ - ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" + ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" pushd contrib/halog %make_build ${halog} OPTIMIZE="%{optflags} %{build_ldflags}" @@ -124,6 +123,9 @@ exit 0 %{_mandir}/man1/* %changelog +* Thu Fri 13 2021 xu_ping - 2.2.1-1 +- update to 2.2.1 + * Thu Nov 05 2020 leiju - 2.0.14-2 - Add Requires haproxy-help into haproxy