From: Peter Michael Green Date: Tue, 17 Nov 2020 23:35:00 +0000 (+0000) Subject: Manual merge of version 2.0.19-1+rpi1 and 2.2.5-2 to produce 2.2.5-2+rpi1 X-Git-Tag: archive/raspbian/2.2.5-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5f41c7f61dcdf38ce3cd1946eeb16ac82c7a2574;p=haproxy.git Manual merge of version 2.0.19-1+rpi1 and 2.2.5-2 to produce 2.2.5-2+rpi1 --- 5f41c7f61dcdf38ce3cd1946eeb16ac82c7a2574 diff --cc debian/changelog index 1767f1e,a5c5571..72acb49 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,158 +1,165 @@@ - haproxy (2.0.19-1+rpi1) bullseye-staging; urgency=medium ++haproxy (2.2.5-2+rpi1) bullseye-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 Mon, 09 Nov 2020 18:25:27 +0000 ++ -- Peter Michael Green Tue, 17 Nov 2020 23:34:32 +0000 ++ + haproxy (2.2.5-2) unstable; urgency=medium + + * Upload to unstable. + + -- Vincent Bernat Wed, 11 Nov 2020 16:21:12 +0100 + + haproxy (2.2.5-1) experimental; urgency=medium + + * New upstream release. + - BUG/MAJOR: mux-h2: Don't try to send data if we know it is no longer + possible + * d/patches: warn if payload of an errorfile doesn't match the C-L + + -- Vincent Bernat Sun, 08 Nov 2020 19:12:02 +0100 + + haproxy (2.2.4-1) experimental; urgency=medium + + * New upstream release. + * d/patches: drop patch for ARM32 + + -- Vincent Bernat Fri, 02 Oct 2020 21:29:56 +0200 + + haproxy (2.2.3-2) experimental; urgency=medium + + * d/patches: add upstream patch to fix build on ARM32 + + -- Vincent Bernat Wed, 09 Sep 2020 19:38:52 +0200 + + haproxy (2.2.3-1) experimental; urgency=medium + + * New upstream version. + - BUG/MAJOR: dns: disabled servers through SRV records never recover + + -- Vincent Bernat Tue, 08 Sep 2020 23:12:05 +0200 + + haproxy (2.2.2-1) experimental; urgency=medium + + * New upstream version. + - BUG/MAJOR: dns: don't treat Authority records as an error + - BUG/MAJOR: dns: fix null pointer dereference in + snr_update_srv_status + + -- Vincent Bernat Sat, 01 Aug 2020 17:06:42 +0200 + + haproxy (2.2.1-1) experimental; urgency=medium + + * New upstream version. + - BUG/MAJOR: tasks: don't requeue global tasks into the local + queue + - BUG/MAJOR: dns: Make the do-resolve action thread-safe + + -- Vincent Bernat Thu, 23 Jul 2020 13:39:14 +0200 + + haproxy (2.2.0-1) experimental; urgency=medium + + * New upstream version. + * Upload to experimental + * Update d/watch to look for 2.2 stable releases + * d/gbp.conf: set branch names for 2.2 + * d/patches: refresh patches + + -- Vincent Bernat Tue, 14 Jul 2020 16:53:23 +0200 + + haproxy (2.1.7-1) experimental; urgency=medium + + * New upstream version. + + -- Vincent Bernat Fri, 12 Jun 2020 07:50:48 +0200 + + haproxy (2.1.5-1) experimental; urgency=medium + + * New upstream version. + - BUG/MAJOR: mux-fcgi: Stop sending loop if FCGI stream is blocked for + any reason + - Revert "BUG/MINOR: connection: always send address-less LOCAL PROXY + connections" + - Revert "BUG/MINOR: connection: make sure to correctly tag local + PROXY connections" + + -- Vincent Bernat Mon, 01 Jun 2020 08:52:56 +0200 + + haproxy (2.1.4-1) experimental; urgency=medium + + * New upstream version. + - BUG/CRITICAL: hpack: never index a header into the headroom after + wrapping + - BUG/MAJOR: http-ana: Always abort the request when a tarpit is + triggered + - BUG/MAJOR: list: fix invalid element address calculation + - BUG/MAJOR: proxy_protocol: Properly validate TLV lengths + * d/control: fix maintainer address. Closes: #955553. + + -- Vincent Bernat Sun, 12 Apr 2020 13:29:54 +0200 + + haproxy (2.1.3-3) experimental; urgency=medium + + * d/copryight: document OpenSSL exception. Closes: #951782. + * d/haproxy.cfg: use "ssl-min-ver" to set minimum version. + * d/patches: fix an overflow in HTTP/2 header handling. + Fix CVE-2020-11100. + + -- Vincent Bernat Wed, 01 Apr 2020 21:18:57 +0200 + + haproxy (2.1.3-2) experimental; urgency=medium + + * d/dconv: use Python 3 to build the documentation. + Closes: #948296, #950435. + * d/dconv: replace cgi.escape by html.escape. Closes: #951416. + + -- Vincent Bernat Wed, 19 Feb 2020 07:53:53 +0100 + + haproxy (2.1.3-1) experimental; urgency=medium + + * New upstream version. + - BUG/MAJOR: hashes: fix the signedness of the hash inputs + - BUG/MAJOR: memory: Don't forget to unlock the rwlock if the pool is + empty. + + -- Vincent Bernat Mon, 20 Jan 2020 06:53:23 +0100 + + haproxy (2.1.2-1) experimental; urgency=medium + + * New upstream version 2.1.2. + - BUG/MAJOR: task: add a new TASK_SHARED_WQ flag to fix foreign requeuing + * d/logrotate.conf: use rsyslog helper instead of SysV init script. + Closes: #946973. + + -- Vincent Bernat Fri, 20 Dec 2019 08:20:33 +0100 + + haproxy (2.1.1-1) experimental; urgency=medium + + * New upstream version 2.1.1. + - BUG/MAJOR: dns: add minimalist error processing on the Rx path + + -- Vincent Bernat Sat, 14 Dec 2019 11:20:32 +0100 + + haproxy (2.1.0-2) experimental; urgency=medium + + * Link against libatomic on riscv64 + + -- Apollon Oikonomopoulos Fri, 29 Nov 2019 14:03:49 +0200 + + haproxy (2.1.0-1) experimental; urgency=medium + + * New upstream version 2.1.0 + * Upload to experimental + * Update d/watch to look for 2.1 stable releases + * d/gbp.conf: set branch names for 2.1 + * Bump Standards-Version to 4.4.1; no changes needed + * Bump dh compat level to 12 + + B-D on debhelper-compat and remove debian/compat + + Override dh_installsystemd with the same args as dh_installinit + + Add ${misc:Pre-Depends} to haproxy's Pre-Depends + + -- Apollon Oikonomopoulos Wed, 27 Nov 2019 23:30:30 +0200 haproxy (2.0.19-1) unstable; urgency=medium diff --cc debian/rules index 81ecb27,746759c..4149b75 --- a/debian/rules +++ b/debian/rules @@@ -33,7 -33,7 +33,7 @@@ ifneq ($(filter amd64 i386,$(DEB_HOST_A MAKEARGS+= USE_REGPARM=1 endif - ifneq ($(filter armel armhf mips mipsel m68k powerpc powerpcspe sh4,$(DEB_HOST_ARCH)),) -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"