From f2059c30e6476aedc54e34138af4e7a903d635093e717f0838cf27dcd2690623 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 19 Sep 2019 11:49:19 +0000 Subject: [PATCH 1/2] Accepting request 725263 from home:kukuk:branches:server:http - Use %license instead of %doc [bsc#1082318] - Recommend apparmor, it's not required to work (make haproxy useable in a container) OBS-URL: https://build.opensuse.org/request/show/725263 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=192 --- haproxy.changes | 7 +++++++ haproxy.spec | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/haproxy.changes b/haproxy.changes index 4482292..be8cce9 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 22 11:23:04 CEST 2019 - kukuk@suse.de + +- Use %license instead of %doc [bsc#1082318] +- Recommend apparmor, it's not required to work (make haproxy + useable in a container) + ------------------------------------------------------------------- Tue Aug 20 15:05:47 UTC 2019 - Marcus Rueckert diff --git a/haproxy.spec b/haproxy.spec index 0d50fbc..ccd4158 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -1,7 +1,7 @@ # # spec file for package haproxy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -55,10 +55,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with apparmor} %if 0%{?suse_version} <= 1315 BuildRequires: apparmor-profiles -Requires: apparmor-profiles +Recommends: apparmor-profiles %else BuildRequires: apparmor-abstractions -Requires: apparmor-abstractions +Recommends: apparmor-abstractions %endif %if %{with apparmor_reload} BuildRequires: apparmor-rpm-macros @@ -230,7 +230,8 @@ getent passwd %{pkg_name} >/dev/null || \ %files %defattr(-,root,root,-) -%doc CHANGELOG README LICENSE +%license LICENSE +%doc CHANGELOG README %doc ROADMAP doc/* examples/ %doc contrib/netsnmp-perl/ contrib/selinux/ %dir %attr(-,root,haproxy) %{_sysconfdir}/%{pkg_name} From 04b5e98275cada61167288c47aa96638d1a346b9e87969a2422dc79e413ab702 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 19 Sep 2019 12:20:44 +0000 Subject: [PATCH 2/2] Accepting request 731948 from home:KGronlund:branches:server:http - Update to version 2.0.6+git0.58706ab4: * [RELEASE] Released version 2.0.6 * MINOR: sample: Add UUID-fetch * BUG/MINOR: Missing stat_field_names (since f21d17bb) * BUG/MINOR: backend: Fix a possible null pointer dereference * BUG/MINOR: acl: Fix memory leaks when an ACL expression is parsed * BUG/MINOR: filters: Properly set the HTTP status code on analysis error * BUG/MEDIUM: http: also reject messages where "chunked" is missing from transfer-enoding * BUG/MINOR: ssl: always check for ssl connection before getting its XPRT context * BUG/MINOR: listener: Fix a possible null pointer dereference * MINOR: stats: report the number of idle connections for each server * BUG/MEDIUM: connection: don't keep more idle connections than ever needed * BUG/MAJOR: ssl: ssl_sock was not fully initialized. * BUG/MINOR: lb/leastconn: ignore the server weights for empty servers * MINOR: contrib/prometheus-exporter: Report DRAIN/MAINT/NOLB status for servers * BUG/MINOR: checks: do not uselessly poll for reads before the connection is up * BUG/MINOR: checks: make __event_chk_srv_r() report success before closing * BUG/MINOR: checks: start sending the request right after connect() * BUG/MINOR: checks: stop polling for write when we have nothing left to send * BUG/MEDIUM: cache: Don't cache objects if the size of headers is too big * BUG/MEDIUM: cache: Properly copy headers splitted on several shctx blocks * BUG/MINOR: mux-h1: Be sure to update the count before adding EOM after trailers * BUG/MINOR: mux-h1: Don't stop anymore input processing when the max is reached * BUG/MINOR: mux-h1: Fix size evaluation of HTX messages after headers parsing * BUG/MINOR: h1: Properly reset h1m when parsing is restarted * BUG/MINOR: http-ana: Reset response flags when 1xx messages are handled * BUG/MEDIUM: peers: local peer socket not bound. * BUG/MEDIUM: proto-http: Always start the parsing if there is no outgoing data * BUG/MEDIUM: url32 does not take the path part into account in the returned hash. * BUG/MEDIUM: listener/threads: fix an AB/BA locking issue in delete_listener() OBS-URL: https://build.opensuse.org/request/show/731948 OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=193 --- _service | 2 +- _servicedata | 2 +- haproxy-2.0.5+git0.d905f49a.tar.gz | 3 --- haproxy-2.0.6+git0.58706ab4.tar.gz | 3 +++ haproxy.changes | 42 ++++++++++++++++++++++++++++++ haproxy.spec | 2 +- 6 files changed, 48 insertions(+), 6 deletions(-) delete mode 100644 haproxy-2.0.5+git0.d905f49a.tar.gz create mode 100644 haproxy-2.0.6+git0.58706ab4.tar.gz diff --git a/_service b/_service index 919ddfa..bd88871 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - v2.0.5 + v2.0.6 enable diff --git a/_servicedata b/_servicedata index cd5645f..bc749f2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ http://git.haproxy.org/git/haproxy-2.0.git - d905f49a0dbf78b69f24ee69df10b873680b92ea + 58706ab4bdbea3468253eddf07f2d58db43bfcb4 \ No newline at end of file diff --git a/haproxy-2.0.5+git0.d905f49a.tar.gz b/haproxy-2.0.5+git0.d905f49a.tar.gz deleted file mode 100644 index 7d81217..0000000 --- a/haproxy-2.0.5+git0.d905f49a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30714ac57a09925282f1dd8aa6b3d9883c147c8a486cb32629009af699159fd3 -size 2616681 diff --git a/haproxy-2.0.6+git0.58706ab4.tar.gz b/haproxy-2.0.6+git0.58706ab4.tar.gz new file mode 100644 index 0000000..55a7f7e --- /dev/null +++ b/haproxy-2.0.6+git0.58706ab4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19693941cb1e83871b5d8a5d9afd2bc592ed20da6e093fcd46d07f94d0b8bb52 +size 2618003 diff --git a/haproxy.changes b/haproxy.changes index be8cce9..68c9998 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Tue Sep 17 15:41:39 UTC 2019 - kgronlund@suse.com + +- Update to version 2.0.6+git0.58706ab4: + * [RELEASE] Released version 2.0.6 + * MINOR: sample: Add UUID-fetch + * BUG/MINOR: Missing stat_field_names (since f21d17bb) + * BUG/MINOR: backend: Fix a possible null pointer dereference + * BUG/MINOR: acl: Fix memory leaks when an ACL expression is parsed + * BUG/MINOR: filters: Properly set the HTTP status code on analysis error + * BUG/MEDIUM: http: also reject messages where "chunked" is missing from transfer-enoding + * BUG/MINOR: ssl: always check for ssl connection before getting its XPRT context + * BUG/MINOR: listener: Fix a possible null pointer dereference + * MINOR: stats: report the number of idle connections for each server + * BUG/MEDIUM: connection: don't keep more idle connections than ever needed + * BUG/MAJOR: ssl: ssl_sock was not fully initialized. + * BUG/MINOR: lb/leastconn: ignore the server weights for empty servers + * MINOR: contrib/prometheus-exporter: Report DRAIN/MAINT/NOLB status for servers + * BUG/MINOR: checks: do not uselessly poll for reads before the connection is up + * BUG/MINOR: checks: make __event_chk_srv_r() report success before closing + * BUG/MINOR: checks: start sending the request right after connect() + * BUG/MINOR: checks: stop polling for write when we have nothing left to send + * BUG/MEDIUM: cache: Don't cache objects if the size of headers is too big + * BUG/MEDIUM: cache: Properly copy headers splitted on several shctx blocks + * BUG/MINOR: mux-h1: Be sure to update the count before adding EOM after trailers + * BUG/MINOR: mux-h1: Don't stop anymore input processing when the max is reached + * BUG/MINOR: mux-h1: Fix size evaluation of HTX messages after headers parsing + * BUG/MINOR: h1: Properly reset h1m when parsing is restarted + * BUG/MINOR: http-ana: Reset response flags when 1xx messages are handled + * BUG/MEDIUM: peers: local peer socket not bound. + * BUG/MEDIUM: proto-http: Always start the parsing if there is no outgoing data + * BUG/MEDIUM: url32 does not take the path part into account in the returned hash. + * BUG/MEDIUM: listener/threads: fix an AB/BA locking issue in delete_listener() + * BUG/MINOR: mworker: disable SIGPROF on re-exec + * DOC: fixed typo in management.txt + * BUG/MEDIUM: mux-h1: do not report errors on transfers ending on buffer full + * BUG/MEDIUM: mux-h1: do not truncate trailing 0CRLF on buffer boundary + * MEDIUM: debug: make the thread dump code show Lua backtraces + * MINOR: lua: export applet and task handlers + * MINOR: tools: add append_prefixed_str() + * MINOR: debug: indicate the applet name when the task is task_run_applet() + ------------------------------------------------------------------- Thu Aug 22 11:23:04 CEST 2019 - kukuk@suse.de diff --git a/haproxy.spec b/haproxy.spec index ccd4158..6fb3923 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -47,7 +47,7 @@ %endif Name: haproxy -Version: 2.0.5+git0.d905f49a +Version: 2.0.6+git0.58706ab4 Release: 0 # #