diff --git a/_service b/_service index 764cfac..62618cf 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - http://git.haproxy.org/git/haproxy-2.4.git + http://git.haproxy.org/git/haproxy-2.5.git git haproxy @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - v2.4.8 + v2.5.0 enable diff --git a/_servicedata b/_servicedata index 28c8e9c..c222f7c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,5 @@ - http://git.haproxy.org/git/haproxy-2.4.git - d1f8d41e0384a83d25becee5b8d9d9692454886d + http://git.haproxy.org/git/haproxy-2.5.git + f2e0833f16aa8c09e1c7001ff55aac4f13c643b7 - \ No newline at end of file diff --git a/haproxy-1.6.0-sec-options.patch b/haproxy-1.6.0-sec-options.patch index 0a5d4a6..618ab71 100644 --- a/haproxy-1.6.0-sec-options.patch +++ b/haproxy-1.6.0-sec-options.patch @@ -4,12 +4,12 @@ Date: Mon Jun 17 13:00:08 2019 +0000 SUSE: Makefile sec options -Index: haproxy-2.4/Makefile +Index: haproxy-2.5/Makefile =================================================================== ---- haproxy-2.4.orig/Makefile -+++ haproxy-2.4/Makefile -@@ -801,6 +801,35 @@ ifneq ($(USE_OT),) - include addons/ot/Makefile +--- haproxy-2.5.orig/Makefile ++++ haproxy-2.5/Makefile +@@ -803,6 +803,35 @@ ifneq ($(USE_LIBATOMIC),) + TARGET_LDFLAGS += -latomic endif +# PIE diff --git a/haproxy-1.6.0_config_haproxy_user.patch b/haproxy-1.6.0_config_haproxy_user.patch index 8b5fef5..77ecc96 100644 --- a/haproxy-1.6.0_config_haproxy_user.patch +++ b/haproxy-1.6.0_config_haproxy_user.patch @@ -1,7 +1,7 @@ -Index: haproxy-1.6.0/examples/acl-content-sw.cfg +Index: haproxy-2.5/examples/acl-content-sw.cfg =================================================================== ---- haproxy-1.6.0.orig/examples/acl-content-sw.cfg -+++ haproxy-1.6.0/examples/acl-content-sw.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 @@ -15,11 +15,10 @@ Index: haproxy-1.6.0/examples/acl-content-sw.cfg pidfile /var/run/haproxy.pid daemon quiet - -Index: haproxy-1.6.0/examples/content-sw-sample.cfg +Index: haproxy-2.5/examples/content-sw-sample.cfg =================================================================== ---- haproxy-1.6.0.orig/examples/content-sw-sample.cfg -+++ haproxy-1.6.0/examples/content-sw-sample.cfg +--- haproxy-2.5.orig/examples/content-sw-sample.cfg ++++ haproxy-2.5/examples/content-sw-sample.cfg @@ -11,9 +11,9 @@ global maxconn 10000 stats socket /var/run/haproxy.stat mode 600 level admin @@ -33,27 +32,24 @@ Index: haproxy-1.6.0/examples/content-sw-sample.cfg daemon # The public 'www' address in the DMZ -Index: haproxy-1.6.0/examples/option-http_proxy.cfg +Index: haproxy-2.5/examples/option-http_proxy.cfg =================================================================== ---- haproxy-1.6.0.orig/examples/option-http_proxy.cfg -+++ haproxy-1.6.0/examples/option-http_proxy.cfg -@@ -6,9 +6,9 @@ global - maxconn 20000 - ulimit-n 16384 - log 127.0.0.1 local0 -- uid 200 -- gid 200 -- chroot /var/empty -+ chroot /var/lib/haproxy -+ user haproxy -+ group haproxy - nbproc 4 +--- haproxy-2.5.orig/examples/option-http_proxy.cfg ++++ haproxy-2.5/examples/option-http_proxy.cfg +@@ -9,6 +9,9 @@ global + uid 200 + gid 200 + chroot /var/empty ++ chroot /var/lib/haproxy ++ user haproxy ++ group haproxy daemon -Index: haproxy-1.6.0/examples/transparent_proxy.cfg + frontend test-proxy +Index: haproxy-2.5/examples/transparent_proxy.cfg =================================================================== ---- haproxy-1.6.0.orig/examples/transparent_proxy.cfg -+++ haproxy-1.6.0/examples/transparent_proxy.cfg +--- haproxy-2.5.orig/examples/transparent_proxy.cfg ++++ haproxy-2.5/examples/transparent_proxy.cfg @@ -6,6 +6,10 @@ # diff --git a/haproxy-2.4.8+git0.d1f8d41e0.tar.gz b/haproxy-2.4.8+git0.d1f8d41e0.tar.gz deleted file mode 100644 index b6a5721..0000000 --- a/haproxy-2.4.8+git0.d1f8d41e0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c6dd5528c5978d4eaecc2e9de61dc56390a7cce5095326bf6aed20982634a560 -size 3699569 diff --git a/haproxy-2.5.0+git0.f2e0833f1.tar.gz b/haproxy-2.5.0+git0.f2e0833f1.tar.gz new file mode 100644 index 0000000..61fb74f --- /dev/null +++ b/haproxy-2.5.0+git0.f2e0833f1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85e22342cd31b8a29c42ae021549df9d643254ba3883c1ca7c348e941cf813de +size 3911408 diff --git a/haproxy.changes b/haproxy.changes index a86d9f4..f5ebdde 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 23 15:17:02 UTC 2021 - mrueckert@suse.de + +- Update to version 2.5.0+git0.f2e0833f1: + https://www.mail-archive.com/haproxy@formilux.org/msg41508.html +- refreshed patches to apply cleanly again + haproxy-1.6.0-sec-options.patch + haproxy-1.6.0_config_haproxy_user.patch + lua54.patch + ------------------------------------------------------------------- Wed Nov 03 16:31:38 UTC 2021 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 2aa59ff..4099d52 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -53,7 +53,7 @@ %endif Name: haproxy -Version: 2.4.8+git0.d1f8d41e0 +Version: 2.5.0+git0.f2e0833f1 Release: 0 # # @@ -147,7 +147,6 @@ make %{?_smp_mflags} \ %if %{with pcre_jit} USE_PCRE_JIT=1 \ %endif - USE_PTHREAD_PSHARED=1 \ %ifarch %ix86 USE_REGPARM=1 \ %endif diff --git a/lua54.patch b/lua54.patch index 32c05f8..6b6d71f 100644 --- a/lua54.patch +++ b/lua54.patch @@ -1,8 +1,8 @@ -Index: haproxy-2.4/Makefile +Index: haproxy-2.5/Makefile =================================================================== ---- haproxy-2.4.orig/Makefile -+++ haproxy-2.4/Makefile -@@ -104,7 +104,7 @@ +--- haproxy-2.5.orig/Makefile ++++ haproxy-2.5/Makefile +@@ -103,7 +103,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.4/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 -@@ -608,11 +608,11 @@ OPTIONS_CFLAGS += $(if $(LUA_INC),-I$(L +@@ -606,11 +606,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.4/Makefile ifneq ($(LUA_INC),) OPTIONS_CFLAGS += -I$(LUA_INC) endif -Index: haproxy-2.4/INSTALL +Index: haproxy-2.5/INSTALL =================================================================== ---- haproxy-2.4.orig/INSTALL -+++ haproxy-2.4/INSTALL -@@ -318,9 +318,9 @@ Lua is an embedded programming language +--- haproxy-2.5.orig/INSTALL ++++ haproxy-2.5/INSTALL +@@ -320,9 +320,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 diff --git a/series b/series index 1473afb..18374b4 100644 --- a/series +++ b/series @@ -1,4 +1,4 @@ -haproxy-1.6.0_config_haproxy_user.patch -p1 +haproxy-1.6.0_config_haproxy_user.patch haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch lua54.patch