diff --git a/_service b/_service
index cb83ed5..c468c22 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
@PARENT_TAG@+git@TAG_OFFSET@.%h
v(.*)
\1
- v2.6.1
+ v2.6.2
enable
diff --git a/_servicedata b/_servicedata
index 2d1d406..9862d20 100644
--- a/_servicedata
+++ b/_servicedata
@@ -5,4 +5,4 @@
http://git.haproxy.org/git/haproxy-2.6.git
- f6ca66d4495020969e1e9462ee2b2bc89695ca8e
\ No newline at end of file
+ 16a3646fdff7315802913184a4e12c2a32344aed
\ No newline at end of file
diff --git a/haproxy-2.6.1+git0.f6ca66d44.tar.gz b/haproxy-2.6.1+git0.f6ca66d44.tar.gz
deleted file mode 100644
index 85476c0..0000000
--- a/haproxy-2.6.1+git0.f6ca66d44.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e56de389fe65ad88ee56bc63974d206b1040436be4ac913a8938d44f0ad62778
-size 4092021
diff --git a/haproxy-2.6.2+git0.16a3646fd.tar.gz b/haproxy-2.6.2+git0.16a3646fd.tar.gz
new file mode 100644
index 0000000..13c9da6
--- /dev/null
+++ b/haproxy-2.6.2+git0.16a3646fd.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3716d5077fbe90672015f41e646766188dca5bcbb0ffe75da4130cc5cb1b76bc
+size 4098290
diff --git a/haproxy.changes b/haproxy.changes
index 30b3924..aa63b46 100644
--- a/haproxy.changes
+++ b/haproxy.changes
@@ -1,3 +1,70 @@
+-------------------------------------------------------------------
+Thu Jul 28 20:04:58 UTC 2022 - dmueller@suse.com
+
+- Update to version 2.6.2+git0.16a3646fd:
+ * [RELEASE] Released version 2.6.2
+ * BUG/MINOR: backend: Fallback on RR algo if balance on source is impossible
+ * BUILD: quic: fix anonymous union for gcc-4.4
+ * BUG/MEDIUM: stconn: Only reset connect expiration when processing backend side
+ * BUILD: add detection for unsupported compiler models
+ * BUG/MEDIUM: mworker: proc_self incorrectly set crashes upon reload
+ * BUG/MAJOR: mux_quic: fix invalid PROTOCOL_VIOLATION on POST data overlap
+ * BUG/MINOR: mworker/cli: relative pid prefix not validated anymore
+ * BUG/MINOR: quic: do not send CONNECTION_CLOSE_APP in initial/handshake
+ * BUG/MINOR: tools: fix statistical_prng_range()'s output range
+ * BUG/MINOR: ssl: allow duplicate certificates in ca-file directories
+ * BUG/MINOR: resolvers: shut off the warning for the default resolvers
+ * MINOR: resolvers: resolvers_destroy() deinit and free a resolver
+ * BUG/MEDIUM: tools: avoid calling dlsym() in static builds (try 2)
+ * BUILD: makefile: Fix install(1) handling for OpenBSD/NetBSD/Solaris/AIX
+ * BUG/MEDIUM: tools: avoid calling dlsym() in static builds
+ * BUG/MINOR: debug: enter ha_panic() only once
+ * BUG/MEDIUM: cli/threads: make "show threads" more robust on applets
+ * BUG/MINOR: quic: fix closing state on NO_ERROR code sent
+ * BUG/MEDIUM: mux-quic: fix server chunked encoding response
+ * CLEANUP: h2: Typo fix in h2_unsubcribe() traces
+ * MINOR: qpack: properly handle invalid dynamic table references
+ * MINOR: h3: handle errors on HEADERS parsing/QPACK decoding
+ * MINOR: h3: add h3c pointer into h3s instance
+ * BUG/MINOR: mux-quic: do not signal FIN if gap in buffer
+ * MINOR: ncbuf: implement ncb_is_fragmented()
+ * MINOR: quic: Increase the QUIC connections RX buffer size (upto 64Kb)
+ * MINOR: quic: Improvements for the datagrams receipt
+ * MINOR: task: Add tasklet_wakeup_after()
+ * MINOR: quic: Duplicated QUIC_RX_BUFSZ definition
+ * MINOR: quic: Add new stats counter to diagnose RX buffer overrun
+ * BUG/MINOR: quic: Dropped packets not counted (with RX buffers full)
+ * BUILD: quic+h3: 32-bit compilation errors fixes
+ * BUG/MAJOR: quic: Big RX dgrams leak with POST requests
+ * BUG/MAJOR: quic: Big RX dgrams leak when fulfilling a buffer
+ * BUG/MINOR: quic: Wrong reuse of fulfilled dgram RX buffer
+ * BUG/MINOR: quic: Missing acknowledgments for trailing packets
+ * MEDIUM: mworker: set the iocb of the socketpair without using fd_insert()
+ * BUG/MEDIUM: mux-h1: Handle connection error after a synchronous send
+ * BUG/MEDIUM: http-ana: Don't wait to have an empty buf to switch in TUNNEL state
+ * BUG/MINOR: mux-h1: Be sure to commit htx changes in the demux buffer
+ * REGTEESTS: filters: Fix CONNECT request in random-forwarding script
+ * BUG/MEDIUM: http-fetch: Don't fetch the method if there is no stream
+ * MINOR: http-htx: Use new HTTP functions for the scheme based normalization
+ * BUG/MEDIUM: h1: Improve authority validation for CONNCET request
+ * MINOR: http: Add function to detect default port
+ * MINOR: http: Add function to get port part of a host
+ * BUG/MINOR: http-htx: Fix scheme based normalization for URIs wih userinfo
+ * BUG/MINOR: peers: fix possible NULL dereferences at config parsing
+ * BUG/MINOR: http-act: Properly generate 103 responses when several rules are used
+ * BUG/MINOR: http-check: Preserve headers if not redefined by an implicit rule
+ * BUG/MINOR: peers/config: always fill the bind_conf's argument
+ * MINOR: fd: Add BUG_ON checks on fd_insert()
+ * CI: re-enable gcc asan builds
+ * BUILD: Makefile: Add Lua 5.4 autodetect
+ * BUG/MEDIUM: ssl/fd: unexpected fd close using async engine
+ * MINOR: fd: add a new FD_DISOWN flag to prevent from closing a deleted FD
+ * BUG/MINOR: http-fetch: Use integer value when possible in "method" sample fetch
+ * BUG/MINOR: http-ana: Set method to HTTP_METH_OTHER when an HTTP txn is created
+ * BUG/MINOR: ssl: Do not look for key in extra files if already in pem
+ * MEDIUM: mux-h2: try to coalesce outgoing WINDOW_UPDATE frames
+- drop lua54.patch (upstream)
+
-------------------------------------------------------------------
Sat Jul 09 20:13:15 UTC 2022 - elimat@opensuse.org
diff --git a/haproxy.spec b/haproxy.spec
index 9de85ca..f6dce0f 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -55,7 +55,7 @@
%endif
Name: haproxy
-Version: 2.6.1+git0.f6ca66d44
+Version: 2.6.2+git0.16a3646fd
Release: 0
#
#
@@ -103,7 +103,6 @@ Source5: haproxy-user.conf
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
@@ -139,7 +138,6 @@ the most work done from every CPU cycle.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
make %{?_smp_mflags} \
diff --git a/lua54.patch b/lua54.patch
deleted file mode 100644
index 818d042..0000000
--- a/lua54.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: haproxy-2.6/Makefile
-===================================================================
---- haproxy-2.6.orig/Makefile
-+++ haproxy-2.6/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, 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$(L
- 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
-Index: haproxy-2.6/INSTALL
-===================================================================
---- haproxy-2.6.orig/INSTALL
-+++ haproxy-2.6/INSTALL
-@@ -329,9 +329,9 @@ Lua is an embedded programming language
- 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 :