diff -pruN 2.6.9-1/debian/changelog 2.6.9-1ubuntu1/debian/changelog --- 2.6.9-1/debian/changelog 2023-02-15 20:45:50.000000000 +0000 +++ 2.6.9-1ubuntu1/debian/changelog 2023-02-17 13:07:41.000000000 +0000 @@ -1,3 +1,13 @@ +haproxy (2.6.9-1ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/{control,rules}: Remove support for OpenTracing due to it is + in universe. + * Dropped changes: + - debian/patches/CVE-2023-0056.patch: removed, included in new version. + + -- Marc Deslauriers Fri, 17 Feb 2023 08:07:41 -0500 + haproxy (2.6.9-1) unstable; urgency=medium * New upstream version. @@ -19,6 +29,23 @@ haproxy (2.6.8-1) unstable; urgency=medi -- Vincent Bernat Tue, 24 Jan 2023 11:57:14 +0100 +haproxy (2.6.7-1ubuntu2) lunar; urgency=medium + + * SECURITY UPDATE: DoS via certain interim responses + - debian/patches/CVE-2023-0056.patch: refuse interim responses with + end-stream flag set in src/mux_h2.c. + - CVE-2023-0056 + + -- Marc Deslauriers Thu, 19 Jan 2023 10:33:43 -0500 + +haproxy (2.6.7-1ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable (LP: #1993402). Remaining changes: + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + + -- Lucas Kanashiro Wed, 14 Dec 2022 11:49:52 -0300 + haproxy (2.6.7-1) unstable; urgency=medium * New upstream release. @@ -135,6 +162,20 @@ haproxy (2.4.19-1) unstable; urgency=med -- Vincent Bernat Fri, 30 Sep 2022 09:07:13 +0200 +haproxy (2.4.18-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + * Dropped (in 2.4.18-1): + - d/t/utils: add helper functions to be re-used in tests. + - d/t/proxy-localhost: refactor to use the check_index_file helper function. + - d/t/proxy-ssl-termination: add test for the SSL termination proxy feature. + - d/t/proxy-ssl-pass-through: add test for the SSL Pass-Through proxy feature. + - d/t/control: add both SSL related tests. + + -- Andreas Hasenack Mon, 15 Aug 2022 09:46:33 -0300 + haproxy (2.4.18-1) unstable; urgency=medium [ Lucas Kanashiro ] @@ -148,6 +189,24 @@ haproxy (2.4.18-1) unstable; urgency=med -- Vincent Bernat Wed, 27 Jul 2022 15:59:36 +0200 +haproxy (2.4.17-1ubuntu2) kinetic; urgency=medium + + * d/t/utils: add helper functions to be re-used in tests. + * d/t/proxy-localhost: refactor to use the check_index_file helper function. + * d/t/proxy-ssl-termination: add test for the SSL termination proxy feature. + * d/t/proxy-ssl-pass-through: add test for the SSL Pass-Through proxy feature. + * d/t/control: add both SSL related tests. + + -- Lucas Kanashiro Wed, 15 Jun 2022 17:34:52 -0300 + +haproxy (2.4.17-1ubuntu1) kinetic; urgency=medium + + * Merge with Debian unstable (LP: #1971279). Remaining changes: + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + + -- Andreas Hasenack Mon, 16 May 2022 10:41:37 -0300 + haproxy (2.4.17-1) unstable; urgency=medium * New upstream release. @@ -167,6 +226,18 @@ haproxy (2.4.15-1) unstable; urgency=med -- Vincent Bernat Mon, 14 Mar 2022 20:17:04 +0100 +haproxy (2.4.14-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + * Dropped: + - d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix + the build against OpenSSL3 (LP #1945773) + [Fixed upstream] + + -- Andreas Hasenack Mon, 28 Feb 2022 13:48:21 -0300 + haproxy (2.4.14-1) unstable; urgency=medium * New upstream release. @@ -174,18 +245,54 @@ haproxy (2.4.14-1) unstable; urgency=med -- Vincent Bernat Fri, 25 Feb 2022 18:38:27 +0100 +haproxy (2.4.13-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1961195). Remaining changes: + - d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix + the build against OpenSSL3 (LP #1945773) + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + + -- Andreas Hasenack Fri, 18 Feb 2022 15:27:14 -0300 + haproxy (2.4.13-1) unstable; urgency=medium * New upstream release. -- Vincent Bernat Thu, 17 Feb 2022 10:03:46 +0100 +haproxy (2.4.12-1ubuntu2) jammy; urgency=medium + + * No-change rebuild to update maintainer scripts, see LP: 1959054 + + -- Dave Jones Wed, 16 Feb 2022 17:01:23 +0000 + +haproxy (2.4.12-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1957099). Remaining changes: + - d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix + the build against OpenSSL3 (LP #1945773) + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + + -- Andreas Hasenack Tue, 11 Jan 2022 14:40:07 -0300 + haproxy (2.4.12-1) unstable; urgency=medium * New upstream release. -- Vincent Bernat Tue, 11 Jan 2022 12:06:17 +0100 +haproxy (2.4.11-1ubuntu1) jammy; urgency=medium + + * Merge with Debian unstable (LP: #1946859). Remaining changes: + - d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix + the build against OpenSSL3 (LP #1945773) + - d/{control,rules}: Removing support for OpenTracing due to it is + in universe. + + -- Andreas Hasenack Sat, 08 Jan 2022 18:58:44 -0300 + haproxy (2.4.11-1) unstable; urgency=medium * New upstream release. @@ -210,6 +317,27 @@ haproxy (2.4.8-3) unstable; urgency=medi -- Vincent Bernat Wed, 24 Nov 2021 09:29:54 +0100 +haproxy (2.4.8-2ubuntu3) jammy; urgency=medium + + * d/{control,rules}: Remove support for OpenTracing because it is + in universe. + + -- Miriam España Acebal Thu, 09 Dec 2021 11:57:06 +0100 + +haproxy (2.4.8-2ubuntu2) jammy; urgency=medium + + * No-change rebuild against libssl3 + + -- Steve Langasek Wed, 08 Dec 2021 23:32:48 +0000 + +haproxy (2.4.8-2ubuntu1) jammy; urgency=medium + + [ Simon Chopin ] + * d/p/fix-ftbfs-openssl3.patch: Cherry-picked from upstream to fix the build + against OpenSSL3 (LP: #1945773) + + -- Lucas Kanashiro Fri, 19 Nov 2021 18:36:04 -0300 + haproxy (2.4.8-2) unstable; urgency=medium * Non-maintainer upload. diff -pruN 2.6.9-1/debian/control 2.6.9-1ubuntu1/debian/control --- 2.6.9-1/debian/control 2023-02-15 20:45:50.000000000 +0000 +++ 2.6.9-1ubuntu1/debian/control 2023-02-17 13:07:41.000000000 +0000 @@ -1,7 +1,8 @@ Source: haproxy Section: net Priority: optional -Maintainer: Debian HAProxy Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HAProxy Maintainers Uploaders: Apollon Oikonomopoulos , Prach Pongpanich , Vincent Bernat @@ -12,7 +13,6 @@ Build-Depends: debhelper-compat (= 12), liblua5.3-dev, libsystemd-dev [linux-any], python3-sphinx, - libopentracing-c-wrapper-dev, pkg-config Build-Depends-Indep: python3, python3-mako Homepage: http://www.haproxy.org/ diff -pruN 2.6.9-1/debian/rules 2.6.9-1ubuntu1/debian/rules --- 2.6.9-1/debian/rules 2023-02-15 20:45:50.000000000 +0000 +++ 2.6.9-1ubuntu1/debian/rules 2023-02-17 13:07:41.000000000 +0000 @@ -19,7 +19,6 @@ MAKEARGS=V=1 \ USE_SLZ=1 \ USE_LUA=1 \ USE_PROMEX=1 \ - USE_OT=1 \ LUA_INC=/usr/include/lua5.3 \ EXTRA=admin/halog/halog