From: Peter Michael Green Date: Thu, 11 Nov 2021 20:47:55 +0000 (+0000) Subject: Manual merge of version 2.2.17-1+rpi1 and 2.4.8-1 to produce 2.4.8-1+rpi1 X-Git-Tag: archive/raspbian/2.4.8-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f549d7f1f52336f5714a104cdf95663c0e4b1133;p=haproxy.git Manual merge of version 2.2.17-1+rpi1 and 2.4.8-1 to produce 2.4.8-1+rpi1 --- f549d7f1f52336f5714a104cdf95663c0e4b1133 diff --cc debian/changelog index ac764fd,2d75f21..215f217 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,154 +1,161 @@@ - haproxy (2.2.17-1+rpi1) bookworm-staging; urgency=medium ++haproxy (2.4.8-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.8.19-1+rpi1 by Peter Michael Green at Thu, 14 Mar 2019 20:25:01 +0000] + * Link with libatomic on armhf too. + - -- Raspbian forward porter Wed, 22 Sep 2021 19:16:13 +0000 ++ -- Raspbian forward porter Thu, 11 Nov 2021 19:16:26 +0000 ++ + haproxy (2.4.8-1) unstable; urgency=medium + + * New upstream release. + + -- Vincent Bernat Thu, 04 Nov 2021 08:36:56 +0100 + + haproxy (2.4.7-2) unstable; urgency=medium + + * Upload to unstable. + + -- Vincent Bernat Sat, 16 Oct 2021 20:43:13 +0200 + + haproxy (2.4.7-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Thu, 07 Oct 2021 09:08:09 +0200 + + haproxy (2.4.4-1) experimental; urgency=medium + + * New upstream release. + * d/patches: remove patches applied upstream. + + -- Vincent Bernat Wed, 08 Sep 2021 08:38:05 +0200 + + haproxy (2.4.3-2) experimental; urgency=high + + * d/patches: fix missing header name length check in HTX (CVE-2021-40346). + + -- Vincent Bernat Sat, 04 Sep 2021 11:56:31 +0200 + + haproxy (2.4.3-1) experimental; urgency=medium + + * New upstream release. + * d/patches: remove patches applied upstream. + * d/patches: h2: match absolute-path not path-absolute for :path. + + -- Vincent Bernat Sat, 21 Aug 2021 16:32:25 +0200 + + haproxy (2.4.2-2) experimental; urgency=medium + + * Fix HTTP request smuggling via HTTP/2 desync attacks. + + -- Vincent Bernat Fri, 13 Aug 2021 16:12:31 +0200 + + haproxy (2.4.2-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Wed, 07 Jul 2021 21:47:17 +0200 + + haproxy (2.4.1-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Thu, 17 Jun 2021 13:57:57 +0200 + + haproxy (2.4.0-1) experimental; urgency=medium + + * New upstream release. + * d/rules: switch to SLZ instead of zlib + * d/rules: update build for contrib → admin + * d/rules: remove use of USE_REGPARM (outdated) + * d/rules: remove hack around gcc_s + * d/copyright: update + + -- Vincent Bernat Tue, 18 May 2021 22:00:05 +0200 + + haproxy (2.3.10-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Sat, 24 Apr 2021 18:22:41 +0200 + + haproxy (2.3.9-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Tue, 30 Mar 2021 19:50:42 +0200 + + haproxy (2.3.8-1) experimental; urgency=medium + + * New upstream release. + * d/logrotate: reduce log retention to 7 days. Closes: #985441. + + -- Vincent Bernat Thu, 25 Mar 2021 18:17:18 +0100 + + haproxy (2.3.7-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Tue, 16 Mar 2021 18:41:25 +0100 + + haproxy (2.3.6-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Thu, 04 Mar 2021 13:57:49 +0100 + + haproxy (2.3.5-1) experimental; urgency=medium + + * New upstream release. + + -- Vincent Bernat Sat, 06 Feb 2021 17:12:53 +0100 + + haproxy (2.3.4-1) experimental; urgency=medium + + * New upstream release: + - Revert "BUG/MINOR: dns: SRV records ignores duplicated AR records" + + -- Vincent Bernat Fri, 15 Jan 2021 14:13:28 +0100 + + haproxy (2.3.3-1) experimental; urgency=medium + + * d/tests: sleep before test to let Apache2 start. + Closes: #976997. + * New upstream release: + - BUG/MAJOR: ring: tcp forward on ring can break the reader counter. + - BUG/MAJOR: spoa/python: Fixing return None + - BUG/MEDIUM: local log format regression. Closes: #974977. + + -- Vincent Bernat Sat, 09 Jan 2021 15:18:10 +0100 + + haproxy (2.3.2-1) experimental; urgency=medium + + * New upstream release. + - BUG/MAJOR: connection: reset conn->owner when detaching from session + list + - BUG/MAJOR: filters: Always keep all offsets up to date during data + filtering + - BUG/MAJOR: peers: fix partial message decoding + - BUG/MAJOR: tcpcheck: Allocate input and output buffers from the buffer + pool + + -- Vincent Bernat Sat, 28 Nov 2020 20:25:34 +0100 + + haproxy (2.3.1-1) experimental; urgency=medium + + * New upstream release. + - BUG/MAJOR: spoe: Be sure to remove all references on a released spoe + applet + * d/patches: remove patches applied upstream. + + -- Vincent Bernat Sat, 14 Nov 2020 23:17:20 +0100 + + haproxy (2.3.0-1) experimental; urgency=medium + + * New upstream release. + * d/gbp, d/watch: prepare for 2.3.0 release + + -- Vincent Bernat Wed, 11 Nov 2020 16:30:10 +0100 haproxy (2.2.17-1) unstable; urgency=medium diff --cc debian/rules index 4149b75,b341144..01a9aa8 --- a/debian/rules +++ b/debian/rules @@@ -29,14 -30,8 +30,8 @@@ els MAKEARGS+= TARGET=generic endif - ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH_CPU)),) - MAKEARGS+= USE_REGPARM=1 - endif - -ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) +ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),) - MAKEARGS+= ADDLIB="-latomic -Wl,--no-as-needed -lgcc_s -Wl,--as-needed" - else - MAKEARGS+= ADDLIB="-Wl,--no-as-needed -lgcc_s -Wl,--as-needed" + MAKEARGS+= ADDLIB="-latomic" endif MAKEARGS += DEBUG_CFLAGS="$(CFLAGS) $(CPPFLAGS)"