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-05-23 23:30:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haproxy (Old) and /work/SRC/openSUSE:Factory/.haproxy.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "haproxy" Sun May 23 23:30:32 2021 rev:103 rq:894761 version:2.4.0+git0.6cbbecf09 Changes: -------- --- /work/SRC/openSUSE:Factory/haproxy/haproxy.changes 2021-05-02 18:35:30.817101828 +0200 +++ /work/SRC/openSUSE:Factory/.haproxy.new.2988/haproxy.changes 2021-05-23 23:30:35.908738833 +0200 @@ -1,0 +2,12 @@ +Fri May 14 08:31:04 UTC 2021 - mrueck...@suse.de + +- Update to version 2.4.0+git0.6cbbecf09: + https://www.haproxy.com/blog/announcing-haproxy-2-4/ + + for all the details see /usr/share/doc/packages/haproxy/CHANGELOG +- refreshed patches to apply cleanly again + haproxy-1.6.0-makefile_lib.patch + haproxy-1.6.0-sec-options.patch + lua54.patch + +------------------------------------------------------------------- Old: ---- haproxy-2.3.10+git0.4764f0e4e.tar.gz New: ---- haproxy-2.4.0+git0.6cbbecf09.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haproxy.spec ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:36.552736161 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:36.556736145 +0200 @@ -53,7 +53,7 @@ %endif Name: haproxy -Version: 2.3.10+git0.4764f0e4e +Version: 2.4.0+git0.6cbbecf09 Release: 0 # # @@ -171,26 +171,31 @@ USE_RELRO_NOW=1 \ LIB="%{_lib}" \ PREFIX="%{_prefix}" \ - EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" \ + USE_PROMEX=1 \ + %if %{with opentracing} + USE_OT=1 \ + %endif + %if %{with memory_profiling} + USE_MEMORY_PROFILING=1 \ + %endif DEBUG_CFLAGS="%{optflags}" V=1 %if %{with systemd} -make -C contrib/systemd PREFIX="%{_prefix}" +make -C admin/systemd PREFIX="%{_prefix}" %if %{with sysusers} %sysusers_generate_pre %{SOURCE5} haproxy %endif %endif -make -C contrib/halog PREFIX="%{_prefix}" \ - DEFINE="%{optflags} -pie -fpie -fstack-protector -Wl,-z,relro,-z,now" +make admin/halog/halog DEBUG_CFLAGS="%{optflags}" V=1 %install install -D -m 0755 %{pkg_name} %{buildroot}%{_sbindir}/%{pkg_name} install -d -m 0750 %{buildroot}%{_sysconfdir}/%{pkg_name}/ install -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/%{pkg_name}/%{pkg_name}.cfg -install -D -m 0755 contrib/halog/halog %{buildroot}%{_sbindir}/haproxy-halog +install -D -m 0755 admin/halog/halog %{buildroot}%{_sbindir}/haproxy-halog %if %{with systemd} -install -D -m 0644 contrib/systemd/%{pkg_name}.service %{buildroot}%{_unitdir}/%{pkg_name}.service +install -D -m 0644 admin/systemd/%{pkg_name}.service %{buildroot}%{_unitdir}/%{pkg_name}.service ln -sf /sbin/service %{buildroot}%{_sbindir}/rc%{pkg_name} %if %{with sysusers} install -D -m 644 %{SOURCE5} %{buildroot}%{_sysusersdir}/haproxy-user.conf @@ -201,7 +206,7 @@ %endif install -d -m 0750 %{buildroot}%{pkg_home} -install -D -m 0644 contrib/syntax-highlight/haproxy.vim %{buildroot}%{vim_data_dir}/syntax/%{pkg_name}.vim +install -D -m 0644 admin/syntax-highlight/haproxy.vim %{buildroot}%{vim_data_dir}/syntax/%{pkg_name}.vim install -D -m 0644 doc/%{pkg_name}.1 %{buildroot}%{_mandir}/man1/%{pkg_name}.1 %if %{with apparmor} install -D -m 0644 %{S:2} %{buildroot}/etc/apparmor.d/usr.sbin.haproxy @@ -260,7 +265,7 @@ %license LICENSE %doc CHANGELOG README %doc ROADMAP doc/* examples/ -%doc contrib/netsnmp-perl/ contrib/selinux/ +%doc admin/netsnmp-perl/ admin/selinux/ %dir %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name} %config(noreplace) %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name}/* %if %{with systemd} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:36.596735979 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:36.596735979 +0200 @@ -1,12 +1,12 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">http://git.haproxy.org/git/haproxy-2.3.git</param> + <param name="url">http://git.haproxy.org/git/haproxy-2.4.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.3.10</param> + <param name="revision">v2.4.0</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:36.616735896 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:36.620735879 +0200 @@ -1,10 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">http://git.haproxy.org/git/haproxy-2.1.git</param> - <param name="changesrevision">v2.2.0</param> + <param name="url">http://git.haproxy.org/git/haproxy-2.4.git</param> + <param name="changesrevision">6cbbecf09734aeb5fa8bb88f36f06a6f6d35e813</param> </service> -<service name="tar_scm"> - <param name="url">http://git.haproxy.org/git/haproxy-2.2.git</param> - <param name="changesrevision">34b2b106689c8a017eb5726193b199ea96f2c9f7</param></service><service name="tar_scm"> - <param name="url">http://git.haproxy.org/git/haproxy-2.3.git</param> - <param name="changesrevision">4764f0e4eac1a823331f59e2a2c68e96e303a112</param></service></servicedata> \ No newline at end of file +</servicedata> ++++++ haproxy-1.6.0-makefile_lib.patch ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:36.628735846 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:36.632735830 +0200 @@ -1,8 +1,8 @@ -Index: haproxy-2.2/Makefile +Index: haproxy-2.4/Makefile =================================================================== ---- haproxy-2.2.orig/Makefile -+++ haproxy-2.2/Makefile -@@ -660,7 +660,7 @@ PCRE_CONFIG := pcre-config +--- haproxy-2.4.orig/Makefile ++++ haproxy-2.4/Makefile +@@ -716,7 +716,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 @@ endif ifeq ($(USE_STATIC_PCRE),) -@@ -679,7 +679,7 @@ PCRE2_CONFIG := pcre2-config +@@ -735,7 +735,7 @@ PCRE2_CONFIG := pcre2-config PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local) ifneq ($(PCRE2DIR),) PCRE2_INC := $(PCRE2DIR)/include ++++++ haproxy-1.6.0-sec-options.patch ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:36.644735779 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:36.644735779 +0200 @@ -4,12 +4,12 @@ SUSE: Makefile sec options -Index: haproxy-2.2/Makefile +Index: haproxy-2.4/Makefile =================================================================== ---- haproxy-2.2.orig/Makefile -+++ haproxy-2.2/Makefile -@@ -741,6 +741,35 @@ ifneq ($(USE_NS),) - OPTIONS_OBJS += src/namespace.o +--- haproxy-2.4.orig/Makefile ++++ haproxy-2.4/Makefile +@@ -801,6 +801,35 @@ ifneq ($(USE_OT),) + include addons/ot/Makefile endif +# PIE ++++++ haproxy-2.3.10+git0.4764f0e4e.tar.gz -> haproxy-2.4.0+git0.6cbbecf09.tar.gz ++++++ ++++ 194515 lines of diff (skipped) ++++++ lua54.patch ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:37.264733207 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:37.264733207 +0200 @@ -1,15 +1,17 @@ ---- a/Makefile -+++ b/Makefile -@@ -101,7 +101,7 @@ +Index: haproxy-2.4/Makefile +=================================================================== +--- haproxy-2.4.orig/Makefile ++++ haproxy-2.4/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 -# priority : lua5.3, lua53, lua). -+# priority : lua5.4, lua54, lua5.3, lua53, lua). - # IGNOREGIT : ignore GIT commit versions if set. - # VERSION : force haproxy version reporting. - # SUBVERS : add a sub-version (eg: platform, model, ...). -@@ -579,11 +579,11 @@ ++# priority : lua5.4, lua5.3, lua53, lua). + # 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 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 @@ -24,9 +26,11 @@ ifneq ($(LUA_INC),) OPTIONS_CFLAGS += -I$(LUA_INC) endif ---- a/INSTALL -+++ b/INSTALL -@@ -295,9 +295,9 @@ +Index: haproxy-2.4/INSTALL +=================================================================== +--- haproxy-2.4.orig/INSTALL ++++ haproxy-2.4/INSTALL +@@ -318,9 +318,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 @@ -36,6 +40,6 @@ +previous versions. By default, HAProxy looks for "lua5.4", "lua54","lua5.3", +"lua53","lua". If your system uses a different naming, you may need to set +the library name in the "LUA_LIB_NAME" variable. - + If Lua is not provided on your system, it can be very simply built locally. It can be downloaded from https://www.lua.org/, extracted and built, for example : ++++++ series ++++++ --- /var/tmp/diff_new_pack.Ocj9iP/_old 2021-05-23 23:30:37.284733124 +0200 +++ /var/tmp/diff_new_pack.Ocj9iP/_new 2021-05-23 23:30:37.284733124 +0200 @@ -1,3 +1,4 @@ haproxy-1.6.0_config_haproxy_user.patch -p1 haproxy-1.6.0-makefile_lib.patch haproxy-1.6.0-sec-options.patch +lua54.patch
