diff --git a/haproxy-2.2.0-lua-5.4.patch b/haproxy-2.2.0-lua-5.4.patch deleted file mode 100644 index 183338d..0000000 --- a/haproxy-2.2.0-lua-5.4.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up haproxy-2.2.0/src/hlua.c.lua54 haproxy-2.2.0/src/hlua.c ---- haproxy-2.2.0/src/hlua.c.lua54 2020-07-07 10:33:14.000000000 -0400 -+++ haproxy-2.2.0/src/hlua.c 2020-07-10 15:21:50.415030526 -0400 -@@ -1069,6 +1069,9 @@ void hlua_hook(lua_State *L, lua_Debug * - */ - 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; -@@ -1100,7 +1103,11 @@ resume_execution: - lua->wake_time = TICK_ETERNITY; - - /* 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: -@@ -7844,10 +7851,12 @@ static int hlua_load(char **args, int se - 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 unknown error: %s\n", lua_tostring(gL.T, -1)); - lua_pop(gL.T, 1); diff --git a/haproxy.spec b/haproxy.spec index 8023ba8..6d57fc8 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -7,7 +7,7 @@ %global _hardened_build 1 Name: haproxy -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Summary: HAProxy reverse proxy for high availability environments @@ -21,8 +21,6 @@ Source3: %{name}.logrotate Source4: %{name}.sysconfig Source5: halog.1 -Patch0: haproxy-2.2.0-lua-5.4.patch - BuildRequires: gcc BuildRequires: lua-devel BuildRequires: pcre2-devel @@ -50,7 +48,6 @@ availability environments. Indeed, it can: %prep %setup -q -%patch0 -p1 -b .lua54 %build regparm_opts= @@ -135,6 +132,9 @@ exit 0 %{_mandir}/man1/* %changelog +* Fri Jul 31 2020 Ryan O'Hara - 2.2.2-1 +- Update to 2.2.2 (#1862400) + * Mon Jul 27 2020 Ryan O'Hara - 2.2.1-1 - Update to 2.2.1 (#1859846) diff --git a/sources b/sources index ac44bcb..e12db6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (haproxy-2.2.1.tar.gz) = 2a08003f55c1ec3bda5cad475ca6c3a62f6d6f87fbaaf42facd8bc5579548f8d972124283740e9728b832b38ea87e61a94d8b9685351a68e5ea1f1000deab32b +SHA512 (haproxy-2.2.2.tar.gz) = da76bd01c9b1c806145df133f6844798eecf6152b968e1739bcf5f9f87b41c1b0190484d033b310b2f0d4fddf48c036243ce8670a5668a9021f8496946094a39