From 4b2faccf62f472d614cfbe9af3810543fdc26a9d6efc471014e63e7528848a8d Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Thu, 5 Dec 2019 15:50:30 +0000 Subject: [PATCH 1/4] - Update to version 2.1.0+git21.67ff2112b: * BUG/MINOR: mux-h1: Fix conditions to know whether or not we may receive data * BUG/MINOR: mux-h1: Don't rely on CO_FL_SOCK_RD_SH to set H1C_F_CS_SHUTDOWN * BUG/MEDIUM: mux-h1: Never reuse H1 connection if a shutw is pending * BUG/MINOR: ssl: certificate choice can be unexpected with openssl >= 1.1.1 * BUG/MEDIUM: listener/thread: fix a race when pausing a listener * BUG/MINOR: ssl/cli: don't overwrite the filters variable * BUG/MINOR: stream-int: avoid calling rcv_buf() when splicing is still possible * BUG/MEDIUM: stream-int: don't subscribed for recv when we're trying to flush data * DOC: move the "group" keyword at the right place * DOC: Fix ordered list in summary - switch to the 2.1 branch https://www.haproxy.com/blog/haproxy-2-1/ https://www.mail-archive.com/haproxy@formilux.org/msg35491.html OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=206 --- _service | 4 ++-- _servicedata | 6 +++--- haproxy-2.0.10+git14.7caf150a.tar.gz | 3 --- haproxy-2.1.0+git21.67ff2112b.tar.gz | 3 +++ haproxy.changes | 22 ++++++++++++++++++++++ haproxy.spec | 2 +- 6 files changed, 31 insertions(+), 9 deletions(-) delete mode 100644 haproxy-2.0.10+git14.7caf150a.tar.gz create mode 100644 haproxy-2.1.0+git21.67ff2112b.tar.gz diff --git a/_service b/_service index dda71e7..da4a16d 100644 --- a/_service +++ b/_service @@ -1,12 +1,12 @@ - http://git.haproxy.org/git/haproxy-2.0.git + http://git.haproxy.org/git/haproxy-2.1.git git haproxy @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - 7caf150a + 67ff2112b enable diff --git a/_servicedata b/_servicedata index 2931028..59d34df 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ - http://git.haproxy.org/git/haproxy-2.0.git - 7caf150a6c5bcfcb3c6159790f651ba21ac97844 + http://git.haproxy.org/git/haproxy-2.1.git + 67ff2112bf139b2e92c4a3a5fd4cfc75791a127a - \ No newline at end of file + diff --git a/haproxy-2.0.10+git14.7caf150a.tar.gz b/haproxy-2.0.10+git14.7caf150a.tar.gz deleted file mode 100644 index d2605ae..0000000 --- a/haproxy-2.0.10+git14.7caf150a.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f72f1d362868809fa093a4d2e7be7fc4ee85ed84ea6116769fb2ff8779d96d95 -size 2635631 diff --git a/haproxy-2.1.0+git21.67ff2112b.tar.gz b/haproxy-2.1.0+git21.67ff2112b.tar.gz new file mode 100644 index 0000000..60d44ce --- /dev/null +++ b/haproxy-2.1.0+git21.67ff2112b.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d159cfb2c85256f01a699cd575af02680430b63fa532ec45e6b2f7b216713979 +size 2660927 diff --git a/haproxy.changes b/haproxy.changes index 965d403..2c2b58e 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Thu Dec 05 15:46:01 UTC 2019 - mrueckert@suse.de + +- Update to version 2.1.0+git21.67ff2112b: + * BUG/MINOR: mux-h1: Fix conditions to know whether or not we may receive data + * BUG/MINOR: mux-h1: Don't rely on CO_FL_SOCK_RD_SH to set H1C_F_CS_SHUTDOWN + * BUG/MEDIUM: mux-h1: Never reuse H1 connection if a shutw is pending + * BUG/MINOR: ssl: certificate choice can be unexpected with openssl >= 1.1.1 + * BUG/MEDIUM: listener/thread: fix a race when pausing a listener + * BUG/MINOR: ssl/cli: don't overwrite the filters variable + * BUG/MINOR: stream-int: avoid calling rcv_buf() when splicing is still possible + * BUG/MEDIUM: stream-int: don't subscribed for recv when we're trying to flush data + * DOC: move the "group" keyword at the right place + * DOC: Fix ordered list in summary + +------------------------------------------------------------------- +Thu Dec 5 15:46:00 UTC 2019 - Marcus Rueckert + +- switch to the 2.1 branch + https://www.haproxy.com/blog/haproxy-2-1/ + https://www.mail-archive.com/haproxy@formilux.org/msg35491.html + ------------------------------------------------------------------- Thu Dec 05 15:37:44 UTC 2019 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index a7a8104..d480c90 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -47,7 +47,7 @@ %endif Name: haproxy -Version: 2.0.10+git14.7caf150a +Version: 2.1.0+git21.67ff2112b Release: 0 # # From 3e55266962fb4bba3b26d491ba6a2fd6a80fd8a7694e026db3e68088303a0054 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 6 Dec 2019 15:44:20 +0000 Subject: [PATCH 2/4] - Update to version 2.1.0+git23.e77b108cd: * BUG/MEDIUM: checks: Make sure we set the task affinity just before connecting. * BUG/MEDIUM: tasks: Make sure we switch wait queues in task_set_affinity(). OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=207 --- _service | 2 +- _servicedata | 4 ++-- haproxy-2.1.0+git21.67ff2112b.tar.gz | 3 --- haproxy-2.1.0+git23.e77b108cd.tar.gz | 3 +++ haproxy.changes | 7 +++++++ haproxy.spec | 2 +- 6 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 haproxy-2.1.0+git21.67ff2112b.tar.gz create mode 100644 haproxy-2.1.0+git23.e77b108cd.tar.gz diff --git a/_service b/_service index da4a16d..d62e616 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - 67ff2112b + e77b108cd enable diff --git a/_servicedata b/_servicedata index 59d34df..ffe952e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ http://git.haproxy.org/git/haproxy-2.1.git - 67ff2112bf139b2e92c4a3a5fd4cfc75791a127a + e77b108cde2c9b47f4e7c6f932310e1a5ac674d7 - + \ No newline at end of file diff --git a/haproxy-2.1.0+git21.67ff2112b.tar.gz b/haproxy-2.1.0+git21.67ff2112b.tar.gz deleted file mode 100644 index 60d44ce..0000000 --- a/haproxy-2.1.0+git21.67ff2112b.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d159cfb2c85256f01a699cd575af02680430b63fa532ec45e6b2f7b216713979 -size 2660927 diff --git a/haproxy-2.1.0+git23.e77b108cd.tar.gz b/haproxy-2.1.0+git23.e77b108cd.tar.gz new file mode 100644 index 0000000..0ad4750 --- /dev/null +++ b/haproxy-2.1.0+git23.e77b108cd.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c3702b9c846cae2ef0a4525912198b4b01de7fedc44fdeb3529a80a3d37391b +size 2660832 diff --git a/haproxy.changes b/haproxy.changes index 2c2b58e..761f686 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 06 15:30:10 UTC 2019 - mrueckert@suse.de + +- Update to version 2.1.0+git23.e77b108cd: + * BUG/MEDIUM: checks: Make sure we set the task affinity just before connecting. + * BUG/MEDIUM: tasks: Make sure we switch wait queues in task_set_affinity(). + ------------------------------------------------------------------- Thu Dec 05 15:46:01 UTC 2019 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index d480c90..7da4151 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -47,7 +47,7 @@ %endif Name: haproxy -Version: 2.1.0+git21.67ff2112b +Version: 2.1.0+git23.e77b108cd Release: 0 # # From 9541e980ce5aec7d2360f91bca0e02fbf46f73a01d8865c6652261180137c389 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 10 Dec 2019 19:29:45 +0000 Subject: [PATCH 3/4] - Update to version 2.1.0+git33.8e4a62508: * BUG/MEDIUM: proto_udp/threads: recv() and send() must not be exclusive. * BUG/MAJOR: dns: add minimalist error processing on the Rx path * BUG/MEDIUM: kqueue: Make sure we report read events even when no data. * DOC: document the listener state transitions * BUG/MEDIUM: listener/threads: fix a remaining race in the listener's accept() * BUG/MINOR: listener: also clear the error flag on a paused listener * BUG/MINOR: listener/threads: always use atomic ops to clear the FD events * BUG/MINOR: proxy: make soft_stop() also close FDs in LI_PAUSED state * BUG/MEDIUM: mux-fcgi: Handle cases where the HTX EOM block cannot be inserted * BUG/MINOR: mux-h1: Be sure to set CS_FL_WANT_ROOM when EOM can't be added OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=208 --- _service | 2 +- _servicedata | 2 +- haproxy-2.1.0+git23.e77b108cd.tar.gz | 3 --- haproxy-2.1.0+git33.8e4a62508.tar.gz | 3 +++ haproxy.changes | 15 +++++++++++++++ haproxy.spec | 2 +- 6 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 haproxy-2.1.0+git23.e77b108cd.tar.gz create mode 100644 haproxy-2.1.0+git33.8e4a62508.tar.gz diff --git a/_service b/_service index d62e616..31eb8b1 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - e77b108cd + 8e4a62508 enable diff --git a/_servicedata b/_servicedata index ffe952e..3273f02 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ http://git.haproxy.org/git/haproxy-2.1.git - e77b108cde2c9b47f4e7c6f932310e1a5ac674d7 + 8e4a62508c4e2f6ba0ae01f552a13208a8018875 \ No newline at end of file diff --git a/haproxy-2.1.0+git23.e77b108cd.tar.gz b/haproxy-2.1.0+git23.e77b108cd.tar.gz deleted file mode 100644 index 0ad4750..0000000 --- a/haproxy-2.1.0+git23.e77b108cd.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c3702b9c846cae2ef0a4525912198b4b01de7fedc44fdeb3529a80a3d37391b -size 2660832 diff --git a/haproxy-2.1.0+git33.8e4a62508.tar.gz b/haproxy-2.1.0+git33.8e4a62508.tar.gz new file mode 100644 index 0000000..142afb4 --- /dev/null +++ b/haproxy-2.1.0+git33.8e4a62508.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e2871727845037a25918126337252b9633042cc449e31c63698ad48f57526a9 +size 2706846 diff --git a/haproxy.changes b/haproxy.changes index 761f686..66fc643 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Dec 10 19:29:31 UTC 2019 - mrueckert@suse.de + +- Update to version 2.1.0+git33.8e4a62508: + * BUG/MEDIUM: proto_udp/threads: recv() and send() must not be exclusive. + * BUG/MAJOR: dns: add minimalist error processing on the Rx path + * BUG/MEDIUM: kqueue: Make sure we report read events even when no data. + * DOC: document the listener state transitions + * BUG/MEDIUM: listener/threads: fix a remaining race in the listener's accept() + * BUG/MINOR: listener: also clear the error flag on a paused listener + * BUG/MINOR: listener/threads: always use atomic ops to clear the FD events + * BUG/MINOR: proxy: make soft_stop() also close FDs in LI_PAUSED state + * BUG/MEDIUM: mux-fcgi: Handle cases where the HTX EOM block cannot be inserted + * BUG/MINOR: mux-h1: Be sure to set CS_FL_WANT_ROOM when EOM can't be added + ------------------------------------------------------------------- Fri Dec 06 15:30:10 UTC 2019 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 7da4151..885648a 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -47,7 +47,7 @@ %endif Name: haproxy -Version: 2.1.0+git23.e77b108cd +Version: 2.1.0+git33.8e4a62508 Release: 0 # # From daef8935aeb90ccf1cd98200bfa56a01fe090ebd4d564012f8c40a12759eaae2 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 11 Dec 2019 17:08:16 +0000 Subject: [PATCH 4/4] - Update to version 2.1.1+git0.4ae521379: * [RELEASE] Released version 2.1.1 * BUILD/MINOR: unix sockets: silence an absurd gcc warning about strncpy() * BUG/MINOR: listener: fix off-by-one in state name check * BUG/MINOR: server: make "agent-addr" work on default-server line * BUG/MINOR: listener: do not immediately resume on transient error * BUG/MINOR: mworker: properly pass SIGTTOU/SIGTTIN to workers * BUG/MINOR: log: fix minor resource leaks on logformat error path * DOC: remove references to the outdated architecture.txt * DOC: proxies: HAProxy only supports 3 connection modes * BUG/MINOR: tasks: only requeue a task if it was already in the queue * DOC: listeners: add a few missing transitions OBS-URL: https://build.opensuse.org/package/show/server:http/haproxy?expand=0&rev=209 --- _service | 2 +- _servicedata | 2 +- haproxy-2.1.0+git33.8e4a62508.tar.gz | 3 --- haproxy-2.1.1+git0.4ae521379.tar.gz | 3 +++ haproxy.changes | 16 ++++++++++++++++ haproxy.spec | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 haproxy-2.1.0+git33.8e4a62508.tar.gz create mode 100644 haproxy-2.1.1+git0.4ae521379.tar.gz diff --git a/_service b/_service index 31eb8b1..be635a9 100644 --- a/_service +++ b/_service @@ -6,7 +6,7 @@ @PARENT_TAG@+git@TAG_OFFSET@.%h v(.*) \1 - 8e4a62508 + v2.1.1 enable diff --git a/_servicedata b/_servicedata index 3273f02..ebc60aa 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ http://git.haproxy.org/git/haproxy-2.1.git - 8e4a62508c4e2f6ba0ae01f552a13208a8018875 + 4ae521379e97fb23630fc60516e6f19c03a93b58 \ No newline at end of file diff --git a/haproxy-2.1.0+git33.8e4a62508.tar.gz b/haproxy-2.1.0+git33.8e4a62508.tar.gz deleted file mode 100644 index 142afb4..0000000 --- a/haproxy-2.1.0+git33.8e4a62508.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e2871727845037a25918126337252b9633042cc449e31c63698ad48f57526a9 -size 2706846 diff --git a/haproxy-2.1.1+git0.4ae521379.tar.gz b/haproxy-2.1.1+git0.4ae521379.tar.gz new file mode 100644 index 0000000..1ab6e0e --- /dev/null +++ b/haproxy-2.1.1+git0.4ae521379.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a23806a9d221107ae782b3d97e0163ab21d1dff62d147ebdd8d8e4f14a28e92 +size 2737454 diff --git a/haproxy.changes b/haproxy.changes index 66fc643..32622ab 100644 --- a/haproxy.changes +++ b/haproxy.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Dec 11 17:07:41 UTC 2019 - mrueckert@suse.de + +- Update to version 2.1.1+git0.4ae521379: + * [RELEASE] Released version 2.1.1 + * BUILD/MINOR: unix sockets: silence an absurd gcc warning about strncpy() + * BUG/MINOR: listener: fix off-by-one in state name check + * BUG/MINOR: server: make "agent-addr" work on default-server line + * BUG/MINOR: listener: do not immediately resume on transient error + * BUG/MINOR: mworker: properly pass SIGTTOU/SIGTTIN to workers + * BUG/MINOR: log: fix minor resource leaks on logformat error path + * DOC: remove references to the outdated architecture.txt + * DOC: proxies: HAProxy only supports 3 connection modes + * BUG/MINOR: tasks: only requeue a task if it was already in the queue + * DOC: listeners: add a few missing transitions + ------------------------------------------------------------------- Tue Dec 10 19:29:31 UTC 2019 - mrueckert@suse.de diff --git a/haproxy.spec b/haproxy.spec index 885648a..753d8ae 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -47,7 +47,7 @@ %endif Name: haproxy -Version: 2.1.0+git33.8e4a62508 +Version: 2.1.1+git0.4ae521379 Release: 0 # #