Accepting request 1323692 from server:http

- Update to version 3.3.1+git0.9c24c11a6:

OBS-URL: https://build.opensuse.org/request/show/1323692
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/haproxy?expand=0&rev=173

_service

@@ -1,12 +1,12 @@
 <services>
   <service name="tar_scm" mode="manual">
-    <param name="url">http://git.haproxy.org/git/haproxy-3.2.git/</param>
+    <param name="url">http://git.haproxy.org/git/haproxy-3.3.git/</param>
     <param name="scm">git</param>
     <param name="filename">haproxy</param>
     <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="versionrewrite-replacement">\1</param>
-    <param name="revision">v3.2.9</param>
+    <param name="revision">v3.3.1</param>
     <param name="changesgenerate">enable</param>
   </service>
 

_servicedata

@@ -3,4 +3,8 @@
     <param name="url">http://git.haproxy.org/git/haproxy-3.2.git/</param>
     <param name="changesrevision">170436929ac78cfc4d1a43b3340535e1ac4d00d8</param>
   </service>
+  <service name="tar_scm">
+    <param name="url">http://git.haproxy.org/git/haproxy-3.3.git/</param>
+    <param name="changesrevision">9c24c11a6e54ab1c280b43c2756edcb49cf873b1</param>
+  </service>
 </servicedata>

haproxy-1.6.0-makefile_lib.patch

@@ -1,8 +1,8 @@
-Index: haproxy-3.2/Makefile
+Index: haproxy-3.3/Makefile
 ===================================================================
---- haproxy-3.2.orig/Makefile
+--- haproxy-3.3.orig/Makefile
-+++ haproxy-3.2/Makefile
++++ haproxy-3.3/Makefile
-@@ -794,7 +794,7 @@ ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0
+@@ -799,7 +799,7 @@ ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0
    PCREDIR     := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
    ifneq ($(PCREDIR),)
      PCRE_INC := $(PCREDIR)/include
@@ -11,7 +11,7 @@ Index: haproxy-3.2/Makefile
    endif
  
    PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
-@@ -812,7 +812,7 @@ ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2
+@@ -817,7 +817,7 @@ ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2
    PCRE2DIR     := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
    ifneq ($(PCRE2DIR),)
      PCRE2_INC := $(PCRE2DIR)/include

haproxy-1.6.0-sec-options.patch

@@ -4,21 +4,21 @@ Date:   Mon Jun 17 13:00:08 2019 +0000
 
     SUSE: Makefile sec options
 
-Index: haproxy-3.2/Makefile
+Index: haproxy-3.3/Makefile
 ===================================================================
---- haproxy-3.2.orig/Makefile
+--- haproxy-3.3.orig/Makefile
-+++ haproxy-3.2/Makefile
++++ haproxy-3.3/Makefile
-@@ -346,7 +346,8 @@ use_opts = USE_EPOLL USE_KQUEUE USE_NETF
+@@ -351,7 +351,8 @@ use_opts = USE_EPOLL USE_KQUEUE USE_NETF
-            USE_THREAD_DUMP USE_EVPORTS USE_OT USE_QUIC USE_PROMEX             \
+            USE_MEMORY_PROFILING USE_SHM_OPEN                                  \
-            USE_MEMORY_PROFILING                                               \
             USE_STATIC_PCRE USE_STATIC_PCRE2                                   \
--           USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT USE_QUIC_OPENSSL_COMPAT
+            USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT                      \
-+           USE_PCRE USE_PCRE_JIT USE_PCRE2 USE_PCRE2_JIT USE_QUIC_OPENSSL_COMPAT \
+-           USE_QUIC_OPENSSL_COMPAT USE_KTLS
++           USE_QUIC_OPENSSL_COMPAT USE_KTLS \
 +					 USE_PIE USE_STACKPROTECTOR USE_RELRO_NOW
  
  # preset all variables for all supported build options among use_opts
  $(reset_opts_vars)
-@@ -897,6 +898,35 @@ ifneq ($(TRACE),)
+@@ -902,6 +903,35 @@ ifneq ($(TRACE),)
    COPTS += -finstrument-functions
  endif
  

haproxy-3.2.9+git0.170436929.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d4a3d4b4c2ee192fc40dac87a43f5df07ee6f0bb3776bd276211cebffebd63a
-size 5277163

haproxy-3.3.1+git0.9c24c11a6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d2c7fb7e1279b50bb1e003b85f40169447e322ca0c61bb2c1e3add8986eb93b
+size 5401340

haproxy.changes

@@ -1,3 +1,66 @@
+-------------------------------------------------------------------
+Fri Dec 19 16:04:39 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.3.1+git0.9c24c11a6:
+  * [RELEASE] Released version 3.3.1
+  * BUG/MEDIUM: mux-h2: synchronize all conditions to create a new backend stream
+  * BUG/MEDIUM: backend: Do not remove CO_FL_SESS_IDLE in assign_server()
+  * BUG/MEDIUM: quic: Don't try to use hystart if not implemented
+  * BUG/MINOR: quic-be: Missing keywords array NULL termination
+  * MINOR: quic: implement cc-algo server keyword
+  * MINOR: quic: extract cc-algo parsing in a dedicated function
+  * MINOR: quic: define quic_cc_algo as const
+  * Revert "MINOR: quic: use dynamic cc_algo on bind_conf"
+  * BUG/MEDIUM: stconn: Don't report abort from SC if read0 was already received
+  * BUG/MEDIUM: http-ana: Properly detect client abort when forwarding response (v2)
+  * MINOR: h2/trace: emit a trace of the received RST_STREAM type
+  * BUG/MEDIUM: h3: fix access to QCS <sd> definitely
+  * BUG/MEDIUM: ssl: Don't resume session for check connections
+  * BUG/MEDIUM: ssl: Don't store the ALPN for check connections
+  * MINOR: connections: Add a new CO_FL_SSL_NO_CACHED_INFO flag
+  * BUG/MEDIUM: ssl: Always check the ALPN after handshake
+  * MEDIUM: ssl/server: No longer store the SNI of cached TLS sessions
+  * BUG/MEDIUM: ssl: Don't reuse TLS session if the connection's SNI differs
+  * MEDIUM: tcpcheck/backend: Get the connection SNI before initializing SSL ctx
+  * MINOR: connection/ssl: Store the SNI hash value in the connection itself
+  * MINOR: ssl: Compare hashes instead of SNIs when a session is cached
+  * MINOR: ssl: Store hash of the SNI for cached TLS sessions
+  * MINOR: ssl: Add a function to hash SNIs
+  * MEDIUM: quic: Add connection as argument when qc_new_conn() is called
+  * BUG/MINOR: mworker/cli: 'show proc' is limited by buffer size
+  * CLEANUP: mworker/cli: remove useless variable
+  * BUG/MEDIUM: h3: do not access QCS <sd> if not allocated
+  * DOC: config: Improve spop mode documentation
+  * DOC: config: Fix description of the spop mode
+  * BUG/MEDIUM: http-ana: Don't close server connection on read0 in TUNNEL mode
+  * BUG/MINOR: log: Dump good %B and %U values in logs
+  * BUG/MINOR: ssl: Don't allow to set NULL sni
+  * BUG/MINOR: quic: do not set first the default QUIC curves
+  * BUG/MINOR: quic-be: missing connection stream closure upon TLS alert to send
+  * MINOR: quic: avoid code duplication in TLS alert callback
+  * MINOR: quic: Add useful debugging traces in qc_idle_timer_do_rearm()
+  * BUG/MINOR: quic-be: handshake errors without connection stream closure
+  * BUG/MINOR: quic/ssl: crash in ClientHello callback ssl traces
+  * DOC: config: reorder the cache section's keywords
+  * DOC: config: mention clearer that the cache's total-max-size is mandatory
+  * BUG/MEDIUM: config: ignore empty args in skipped blocks
+  * BUG/MEDIUM: connection: fix "bc_settings_streams_limit" typo
+  * DOC: configuration: ECH support details
+  * BUG/MINOR: jwt: Missing "case" in switch statement
+  * BUG/MEDIUM: mworker/listener: ambiguous use of RX_F_INHERITED with shards
+
+-------------------------------------------------------------------
+Wed Nov 26 15:48:38 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to version 3.3.0+git0.7832fb21f:
+  https://www.haproxy.com/blog/announcing-haproxy-3-3
+  https://www.mail-archive.com/haproxy@formilux.org/msg46300.html
+- refresh patches:
+  haproxy-1.6.0-makefile_lib.patch
+  haproxy-1.6.0-sec-options.patch
+- enable USE_KTLS
+- prepare ech/quic support
+
 -------------------------------------------------------------------
 Fri Nov 21 10:27:18 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
 

haproxy.spec

@@ -46,8 +46,10 @@
 %bcond_with tmpfiles
 %endif
 
+%bcond_with ech
+
 Name:           haproxy
-Version:        3.2.9+git0.170436929
+Version:        3.3.1+git0.9c24c11a6
 Release:        0
 #
 Summary:        The Reliable, High Performance TCP/HTTP Load Balancer
@@ -121,6 +123,7 @@ cp %{SOURCE7} .
     USE_RELRO_NOW=1 \
     USE_STACKPROTECTOR=1 \
     USE_PIE=1 \
+    USE_KTLS=1 \
     USE_PCRE2=1 \
     %if %{with pcre2_jit}
     USE_PCRE2_JIT=1 \
@@ -133,6 +136,10 @@ cp %{SOURCE7} .
     USE_OPENSSL_AWSLC=1 \
 %else
     USE_OPENSSL=1 \
+%if %{with ech}
+    USE_QUIC_OPENSSL_COMPAT=1 \
+    USE_ECH=1 \
+%endif
 %endif
     USE_LUA=1 \
     USE_ZLIB=1 \