From 1b9d0c4fc0bf07bb279e84847523a38aaac1b3dc74a0cff17761869eefaa09a1 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 31 May 2022 16:03:09 +0000 Subject: [PATCH] - Update to version 2.6.0+git0.a1efc048b: https://www.mail-archive.com/haproxy@formilux.org/msg42371.html - refreshed patches - haproxy-1.6.0-makefile_lib.patch - haproxy-1.6.0-sec-options.patch - haproxy-1.6.0_config_haproxy_user.patch - lua54.patch OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=265 --- _service | 4 +- _servicedata | 4 +- haproxy-1.6.0-makefile_lib.patch | 10 +-- haproxy-1.6.0-sec-options.patch | 8 +-- haproxy-1.6.0_config_haproxy_user.patch | 90 ++++++++++++++++++------- haproxy-2.5.7+git0.2ef551d02.tar.gz | 3 - haproxy-2.6.0+git0.a1efc048b.tar.gz | 3 + haproxy.changes | 11 +++ haproxy.spec | 4 +- lua54.patch | 18 ++--- 10 files changed, 103 insertions(+), 52 deletions(-) delete mode 100644 haproxy-2.5.7+git0.2ef551d02.tar.gz create mode 100644 haproxy-2.6.0+git0.a1efc048b.tar.gz diff --git a/_service b/_service index 20dda61..d209180 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - http://git.haproxy.org/git/haproxy-2.5.git + http://git.haproxy.org/git/haproxy-2.6.git git haproxy @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - v2.5.7 + v2.6.0 enable diff --git a/_servicedata b/_servicedata index f5ac1e0..659f747 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,6 @@ http://git.haproxy.org/git/haproxy-2.5.git 2ef551d0284f385fb36b3b2e4b32a7adab4223ac - \ No newline at end of file + + http://git.haproxy.org/git/haproxy-2.6.git + a1efc048bf8a5e14466dbe7317e73117e8d66176 \ No newline at end of file diff --git a/haproxy-1.6.0-makefile_lib.patch b/haproxy-1.6.0-makefile_lib.patch index 555e2b1..f38049a 100644 --- a/haproxy-1.6.0-makefile_lib.patch +++ b/haproxy-1.6.0-makefile_lib.patch @@ -1,8 +1,8 @@ -Index: haproxy-2.4/Makefile +Index: haproxy-2.6/Makefile =================================================================== ---- haproxy-2.4.orig/Makefile -+++ haproxy-2.4/Makefile -@@ -716,7 +716,7 @@ PCRE_CONFIG := pcre-config +--- haproxy-2.6.orig/Makefile ++++ haproxy-2.6/Makefile +@@ -759,7 +759,7 @@ PCRE_CONFIG := pcre-config PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local) ifneq ($(PCREDIR),) PCRE_INC := $(PCREDIR)/include @@ -11,7 +11,7 @@ Index: haproxy-2.4/Makefile endif ifeq ($(USE_STATIC_PCRE),) -@@ -735,7 +735,7 @@ PCRE2_CONFIG := pcre2-config +@@ -778,7 +778,7 @@ PCRE2_CONFIG := pcre2-config PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local) ifneq ($(PCRE2DIR),) PCRE2_INC := $(PCRE2DIR)/include diff --git a/haproxy-1.6.0-sec-options.patch b/haproxy-1.6.0-sec-options.patch index 618ab71..4ba192b 100644 --- a/haproxy-1.6.0-sec-options.patch +++ b/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.5/Makefile +Index: haproxy-2.6/Makefile =================================================================== ---- haproxy-2.5.orig/Makefile -+++ haproxy-2.5/Makefile -@@ -803,6 +803,35 @@ ifneq ($(USE_LIBATOMIC),) +--- haproxy-2.6.orig/Makefile ++++ haproxy-2.6/Makefile +@@ -848,6 +848,35 @@ ifneq ($(USE_LIBATOMIC),) TARGET_LDFLAGS += -latomic endif diff --git a/haproxy-1.6.0_config_haproxy_user.patch b/haproxy-1.6.0_config_haproxy_user.patch index 77ecc96..49d1465 100644 --- a/haproxy-1.6.0_config_haproxy_user.patch +++ b/haproxy-1.6.0_config_haproxy_user.patch @@ -1,24 +1,7 @@ -Index: haproxy-2.5/examples/acl-content-sw.cfg +Index: haproxy-2.6/examples/content-sw-sample.cfg =================================================================== ---- haproxy-2.5.orig/examples/acl-content-sw.cfg -+++ haproxy-2.5/examples/acl-content-sw.cfg -@@ -5,9 +5,9 @@ global - log loghost local0 - log localhost local0 err - maxconn 250 -- uid 71 -- gid 71 -- chroot /var/empty -+ user haproxy -+ group haproxy -+ chroot /var/lib/haproxy - pidfile /var/run/haproxy.pid - daemon - quiet -Index: haproxy-2.5/examples/content-sw-sample.cfg -=================================================================== ---- haproxy-2.5.orig/examples/content-sw-sample.cfg -+++ haproxy-2.5/examples/content-sw-sample.cfg +--- haproxy-2.6.orig/examples/content-sw-sample.cfg ++++ haproxy-2.6/examples/content-sw-sample.cfg @@ -11,9 +11,9 @@ global maxconn 10000 stats socket /var/run/haproxy.stat mode 600 level admin @@ -32,10 +15,10 @@ Index: haproxy-2.5/examples/content-sw-sample.cfg daemon # The public 'www' address in the DMZ -Index: haproxy-2.5/examples/option-http_proxy.cfg +Index: haproxy-2.6/examples/option-http_proxy.cfg =================================================================== ---- haproxy-2.5.orig/examples/option-http_proxy.cfg -+++ haproxy-2.5/examples/option-http_proxy.cfg +--- haproxy-2.6.orig/examples/option-http_proxy.cfg ++++ haproxy-2.6/examples/option-http_proxy.cfg @@ -9,6 +9,9 @@ global uid 200 gid 200 @@ -46,10 +29,10 @@ Index: haproxy-2.5/examples/option-http_proxy.cfg daemon frontend test-proxy -Index: haproxy-2.5/examples/transparent_proxy.cfg +Index: haproxy-2.6/examples/transparent_proxy.cfg =================================================================== ---- haproxy-2.5.orig/examples/transparent_proxy.cfg -+++ haproxy-2.5/examples/transparent_proxy.cfg +--- haproxy-2.6.orig/examples/transparent_proxy.cfg ++++ haproxy-2.6/examples/transparent_proxy.cfg @@ -6,6 +6,10 @@ # @@ -61,3 +44,58 @@ Index: haproxy-2.5/examples/transparent_proxy.cfg defaults timeout client 30s timeout server 30s +Index: haproxy-2.6/examples/basic-config-edge.cfg +=================================================================== +--- haproxy-2.6.orig/examples/basic-config-edge.cfg ++++ haproxy-2.6/examples/basic-config-edge.cfg +@@ -15,7 +15,7 @@ global + zero-warning + + # Security hardening: isolate and drop privileges +- chroot /var/empty ++ chroot /var/lib/haproxy + user haproxy + group haproxy + +Index: haproxy-2.6/examples/quick-test.cfg +=================================================================== +--- haproxy-2.6.orig/examples/quick-test.cfg ++++ haproxy-2.6/examples/quick-test.cfg +@@ -3,6 +3,9 @@ + + global + strict-limits # refuse to start if insufficient FDs/memory ++ user haproxy ++ group haproxy ++ chroot /var/lib/haproxy + # add some process-wide tuning here if required + + # A stats socket may be added to check live metrics if the load generators +Index: haproxy-2.6/examples/socks4.cfg +=================================================================== +--- haproxy-2.6.orig/examples/socks4.cfg ++++ haproxy-2.6/examples/socks4.cfg +@@ -2,6 +2,9 @@ global + log /dev/log local0 + log /dev/log local1 notice + stats timeout 30s ++ user haproxy ++ group haproxy ++ chroot /var/lib/haproxy + + defaults + log global +Index: haproxy-2.6/examples/wurfl-example.cfg +=================================================================== +--- haproxy-2.6.orig/examples/wurfl-example.cfg ++++ haproxy-2.6/examples/wurfl-example.cfg +@@ -5,6 +5,9 @@ + # + + global ++ user haproxy ++ group haproxy ++ chroot /var/lib/haproxy + + # The WURFL data file + wurfl-data-file /usr/share/wurfl/wurfl.zip diff --git a/haproxy-2.5.7+git0.2ef551d02.tar.gz b/haproxy-2.5.7+git0.2ef551d02.tar.gz deleted file mode 100644 index fdfd228..0000000 --- a/haproxy-2.5.7+git0.2ef551d02.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75af37ce66025ac92f5c0308789d8e306a1b5a1243af066fbda256cb95bfb792 -size 3942307 diff --git a/haproxy-2.6.0+git0.a1efc048b.tar.gz b/haproxy-2.6.0+git0.a1efc048b.tar.gz new file mode 100644 index 0000000..709b3df --- /dev/null +++ b/haproxy-2.6.0+git0.a1efc048b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa2274973cbfadac3fc267e9725c83c62901ebb7d3379a0d92a5a068ffb393e4 +size 4090366 diff --git a/haproxy.changes b/haproxy.changes index aaf427d..b1b423d 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 31 15:54:35 UTC 2022 - mrueckert@suse.de + +- Update to version 2.6.0+git0.a1efc048b: + https://www.mail-archive.com/haproxy@formilux.org/msg42371.html +- refreshed patches + - haproxy-1.6.0-makefile_lib.patch + - haproxy-1.6.0-sec-options.patch + - haproxy-1.6.0_config_haproxy_user.patch + - lua54.patch + ------------------------------------------------------------------- Fri May 13 14:54:15 UTC 2022 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index ebd9305..d24df05 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -55,7 +55,7 @@ %endif Name: haproxy -Version: 2.5.7+git0.2ef551d02 +Version: 2.6.0+git0.a1efc048b Release: 0 # # @@ -268,7 +268,7 @@ getent passwd %{pkg_name} >/dev/null || \ %defattr(-,root,root,-) %license LICENSE %doc CHANGELOG README -%doc ROADMAP doc/* examples/ +%doc doc/* examples/ %doc admin/netsnmp-perl/ admin/selinux/ %dir %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name} %config(noreplace) %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}/* diff --git a/lua54.patch b/lua54.patch index 6b6d71f..818d042 100644 --- a/lua54.patch +++ b/lua54.patch @@ -1,8 +1,8 @@ -Index: haproxy-2.5/Makefile +Index: haproxy-2.6/Makefile =================================================================== ---- haproxy-2.5.orig/Makefile -+++ haproxy-2.5/Makefile -@@ -103,7 +103,7 @@ +--- 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 @@ -11,7 +11,7 @@ Index: haproxy-2.5/Makefile # 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 -@@ -606,11 +606,11 @@ OPTIONS_CFLAGS += $(if $(LUA_INC),-I$(L +@@ -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 @@ -26,11 +26,11 @@ Index: haproxy-2.5/Makefile ifneq ($(LUA_INC),) OPTIONS_CFLAGS += -I$(LUA_INC) endif -Index: haproxy-2.5/INSTALL +Index: haproxy-2.6/INSTALL =================================================================== ---- haproxy-2.5.orig/INSTALL -+++ haproxy-2.5/INSTALL -@@ -320,9 +320,9 @@ Lua is an embedded programming language +--- 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