Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package haproxy for openSUSE:Factory checked in at 2021-12-01 20:46:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.31177 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy" Wed Dec 1 20:46:26 2021 rev:110 rq:934760 version:2.5.0+git0.f2e0833f1 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2021-11-06 18:13:48.804752966 +0100 +++ /work/SRC/openSUSE:Factory/.haproxy.new.31177/haproxy.changes 2021-12-02 02:14:15.866843805 +0100 @@ -1,0 +2,10 @@ +Tue Nov 23 15:17:02 UTC 2021 - mrueck...@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 + +------------------------------------------------------------------- Old: ---- haproxy-2.4.8+git0.d1f8d41e0.tar.gz New: ---- haproxy-2.5.0+git0.f2e0833f1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:16.610841536 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:16.614841524 +0100 @@ -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 @@ %if %{with pcre_jit} USE_PCRE_JIT=1 \ %endif - USE_PTHREAD_PSHARED=1 \ %ifarch %ix86 USE_REGPARM=1 \ %endif ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:16.646841426 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:16.646841426 +0100 @@ -1,12 +1,12 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">http://git.haproxy.org/git/haproxy-2.4.git</param> + <param name="url">http://git.haproxy.org/git/haproxy-2.5.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.4.8</param> + <param name="revision">v2.5.0</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:16.666841365 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:16.666841365 +0100 @@ -1,6 +1,5 @@ <servicedata> <service name="tar_scm"> - <param name="url">http://git.haproxy.org/git/haproxy-2.4.git</param> - <param name="changesrevision">d1f8d41e0384a83d25becee5b8d9d9692454886d</param> + <param name="url">http://git.haproxy.org/git/haproxy-2.5.git</param> + <param name="changesrevision">f2e0833f16aa8c09e1c7001ff55aac4f13c643b7</param> </service> -</servicedata> \ No newline at end of file ++++++ haproxy-1.6.0-sec-options.patch ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:16.678841328 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:16.678841328 +0100 @@ -4,12 +4,12 @@ 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 ++++++ haproxy-1.6.0_config_haproxy_user.patch ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:16.690841293 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:16.690841293 +0100 @@ -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 @@ 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 @@ 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 @@ # ++++++ haproxy-2.4.8+git0.d1f8d41e0.tar.gz -> haproxy-2.5.0+git0.f2e0833f1.tar.gz ++++++ ++++ 81597 lines of diff (skipped) ++++++ lua54.patch ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:17.470838914 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:17.470838914 +0100 @@ -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 @@ # 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 @@ 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 ++++++ series ++++++ --- /var/tmp/diff_new_pack.RaNiU8/_old 2021-12-02 02:14:17.490838853 +0100 +++ /var/tmp/diff_new_pack.RaNiU8/_new 2021-12-02 02:14:17.490838853 +0100 @@ -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
