Sync from SUSE:SLFO:Main haproxy revision 28379d9b4a73c00e20072dcb0725d48c

_service

@@ -1,12 +1,12 @@
 <services>
   <service name="tar_scm" mode="manual">
-    <param name="url">http://git.haproxy.org/git/haproxy-2.8.git</param>
+    <param name="url">http://git.haproxy.org/git/haproxy-3.1.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">v2.8.11</param>
+    <param name="revision">v3.1.5</param>
     <param name="changesgenerate">enable</param>
   </service>
 

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
-    <param name="url">http://git.haproxy.org/git/haproxy-2.8.git</param>
+    <param name="url">http://git.haproxy.org/git/haproxy-3.1.git/</param>
-    <param name="changesrevision">01c1056a44823c5ffb8f74660b32c099d9b5355b</param>
+    <param name="changesrevision">076df02923212eb5631dc58681d387d034090792</param>
   </service>
 </servicedata>

haproxy-1.6.0-makefile_lib.patch

@@ -1,8 +1,8 @@
-Index: haproxy-2.8/Makefile
+Index: haproxy-3.0/Makefile
 ===================================================================
---- haproxy-2.8.orig/Makefile
+--- haproxy-3.0.orig/Makefile
-+++ haproxy-2.8/Makefile
++++ haproxy-3.0/Makefile
-@@ -750,7 +750,7 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(US
+@@ -784,7 +784,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-2.8/Makefile
    endif
  
    PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
-@@ -768,7 +768,7 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(
+@@ -802,7 +802,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,11 +4,11 @@ Date:   Mon Jun 17 13:00:08 2019 +0000
 
     SUSE: Makefile sec options
 
-Index: haproxy-2.8/Makefile
+Index: haproxy-3.0/Makefile
 ===================================================================
---- haproxy-2.8.orig/Makefile
+--- haproxy-3.0.orig/Makefile
-+++ haproxy-2.8/Makefile
++++ haproxy-3.0/Makefile
-@@ -849,6 +849,35 @@ ifneq ($(TRACE),)
+@@ -887,6 +887,35 @@ ifneq ($(TRACE),)
    COPTS += -finstrument-functions
  endif
  

haproxy-service.patch

@@ -0,0 +1,11 @@
+--- a/admin/systemd/haproxy.service.in	2024-01-18 15:32:19.000000000 +0100
++++ b/admin/systemd/haproxy.service.in	2024-02-04 23:58:30.873980359 +0100
+@@ -6,7 +6,7 @@
+ [Service]
+ EnvironmentFile=-/etc/default/haproxy
+ EnvironmentFile=-/etc/sysconfig/haproxy
+-Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy.pid" "EXTRAOPTS=-S /run/haproxy-master.sock"
++Environment="CONFIG=/etc/haproxy/haproxy.cfg" "PIDFILE=/run/haproxy/pid" "EXTRAOPTS=-S /run/haproxy/master.sock"
+ ExecStart=@SBINDIR@/haproxy -Ws -f $CONFIG -p $PIDFILE $EXTRAOPTS
+ ExecReload=@SBINDIR@/haproxy -Ws -f $CONFIG -c $EXTRAOPTS
+ ExecReload=/bin/kill -USR2 $MAINPID

haproxy-tmpfiles.conf

@@ -0,0 +1 @@
+D /run/haproxy 0750 root haproxy

haproxy.cfg

@@ -5,7 +5,7 @@ global
   user haproxy
   group haproxy
   daemon
-  stats socket /var/lib/haproxy/stats user haproxy group haproxy mode 0640 level operator
+  stats socket /run/haproxy/stats.sock user haproxy group haproxy mode 0640 level operator
   tune.bufsize 32768
   tune.ssl.default-dh-param 2048
   ssl-default-bind-ciphers ALL:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@STRENGTH

haproxy.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package haproxy
 #
-# Copyright (c) 2019 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 
 %bcond_with quic
 %if 0%{?suse_version} >= 1230
@@ -46,12 +46,14 @@
 
 %if 0%{?suse_version} >= 1500
 %bcond_without sysusers
+%bcond_without tmpfiles
 %else
 %bcond_with sysusers
+%bcond_with tmpfiles
 %endif
 
 Name:           haproxy
-Version:        2.8.11+git0.01c1056a4
+Version:        3.1.5+git0.076df0292
 Release:        0
 #
 #
@@ -96,9 +98,11 @@ Source2:        usr.sbin.haproxy.apparmor
 Source3:        local.usr.sbin.haproxy.apparmor
 Source4:        haproxy.cfg
 Source5:        haproxy-user.conf
+Source6:        haproxy-tmpfiles.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:         haproxy-service.patch
 #
 Source98:       series
 Source99:       haproxy-rpmlintrc
@@ -195,6 +199,9 @@ ln -sf /sbin/service   %{buildroot}%{_sbindir}/rc%{pkg_name}
 %if %{with sysusers}
 install -D -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/haproxy-user.conf
 %endif
+%if %{with tmpfiles}
+install -D -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+%endif
 %else
 install -D -m 0755 %{S:1}                      %{buildroot}%{_sysconfdir}/init.d/%{pkg_name}
 ln -fs %{_sysconfdir}/init.d/%{pkg_name} %{buildroot}%{_sbindir}/rc%{pkg_name}
@@ -224,6 +231,11 @@ rm examples/*init*
 %if %{with apparmor} && %{with apparmor_reload}
 %apparmor_reload /etc/apparmor.d/usr.sbin.haproxy
 %endif
+%if %{with systemd}
+%if %{with tmpfiles}
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
+%endif
+%endif
 %service_add_post %{pkg_name}.service
 
 %preun
@@ -258,7 +270,7 @@ getent passwd %{pkg_name} >/dev/null || \
 %files
 %defattr(-,root,root,-)
 %license LICENSE
-%doc CHANGELOG README
+%doc CHANGELOG README.md
 %doc doc/* examples/
 %doc admin/netsnmp-perl/ admin/selinux/
 %dir               %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}
@@ -268,6 +280,10 @@ getent passwd %{pkg_name} >/dev/null || \
 %if %{with sysusers}
 %{_sysusersdir}/haproxy-user.conf
 %endif
+%if %{with tmpfiles}
+%{_tmpfilesdir}/%{name}.conf
+%dir %ghost %{_rundir}/%{name}
+%endif
 %else
 %config(noreplace) %{_sysconfdir}/init.d/%{pkg_name}
 %endif

series

@@ -1,3 +1,4 @@
 haproxy-1.6.0_config_haproxy_user.patch
 haproxy-1.6.0-makefile_lib.patch
 haproxy-1.6.0-sec-options.patch
+haproxy-service.patch

usr.sbin.haproxy.apparmor

@@ -28,13 +28,33 @@ profile haproxy /usr/sbin/haproxy {
 
   /dev/shm/haproxy_startup_logs_* rwlk,
 
+  # old stats socket location, for compatibility
   /var/lib/haproxy/stats rwl,
   /var/lib/haproxy/stats.*.bak rwl,
   /var/lib/haproxy/stats.*.tmp rwl,
-  /{,var/}run/haproxy.pid rw,
+  # new stats socket location
-  /{,var/}run/haproxy-master.sock* rwlk,
+  /run/haproxy/stats*.sock{,*.{bak,tmp}} rwl,
 
+  /{,var/}run/haproxy/pid rw,
+  /{,var/}run/haproxy/master.sock* rwlk,
+
+  # This is for the additional debug output in haproxy >= 2.9
+  # can be accessed with "p post_mortem" in gdb
   /sys/devices/system/node/ r,
+  /sys/devices/system/node/*/cpumap r,
+  /sys/devices/system/cpu/online r,
+  /sys/class/dmi/id/sys_vendor r,
+  /sys/devices/virtual/dmi/id/sys_vendor r,
+  /sys/class/dmi/id/product_family r,
+  /sys/devices/virtual/dmi/id/product_family r,
+  /sys/class/dmi/id/product_name r,
+  /sys/devices/virtual/dmi/id/product_name r,
+  /sys/class/dmi/id/board_vendor r,
+  /sys/firmware/devicetree/base/model r,
+  /sys/class/dmi/id/board_name r,
+  /proc/2/status r,
+  /proc/cpuinfo r,
+  # end of debug.c files
 
   # Site-specific additions and overrides. See local/README for details.
   #include if exists <local/haproxy>