Merge ~ahasenack/ubuntu/+source/haproxy:jammy-haproxy-2414-merge into ubuntu/+source/haproxy:debian/sid

[Andreas Hasenack]

New upstream release.

The upstream changelog[1] only mentions bugfixes and CI changes, so I think this does not need a feature freeze exception.

With this new upstream release, we are able to drop one of the delta bits we have, which was openssl3 compatibility.

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/haproxy-merge/+packages

1, http://www.haproxy.org/download/2.4/src/CHANGELOG

[Utkarsh Gupta (utkarsh)]

All looks good and I agree that the changelog mentions bug fixes and there are no new features. HAProxy has a reputation of doing good, stable, and solid releases. I am pretty sure there'll be no features added and hence no need of a FFe.

Just a quick fix needed in the d/ch entry and I think we're good to go.

review: Needs Fixing

1c08085... by Andreas Hasenack on 2022-02-28

merge-changelogs

9d512d8... by Andreas Hasenack on 2022-02-28

reconstruct-changelog

ed24e8d... by Andreas Hasenack on 2022-02-28

update-maintainer

[Andreas Hasenack (ahasenack)]

Thanks, I don't know why sometimes it feels like git-ubuntu takes care of this, and sometimes (like now) it doesn't. Fixed and force-pushed.

[Utkarsh Gupta (utkarsh)]

Woot, thank you!

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

$ dput ubuntu ../haproxy_2.4.14-1ubuntu1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../haproxy_2.4.14-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../haproxy_2.4.14-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading haproxy_2.4.14-1ubuntu1.dsc: done.
  Uploading haproxy_2.4.14-1ubuntu1.debian.tar.xz: done.
  Uploading haproxy_2.4.14-1ubuntu1_source.buildinfo: done.
  Uploading haproxy_2.4.14-1ubuntu1_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

This migrated a long time ago.

diff --git a/debian/changelog b/debian/changelog
index 1669c56..5c70b2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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 <[e-mail]>  Mon, 28 Feb 2022 13:48:21 -0300
+
 haproxy (2.4.14-1) unstable; urgency=medium
 
   * New upstream release.
@@ -5,18 +17,54 @@ haproxy (2.4.14-1) unstable; urgency=medium
 
  -- Vincent Bernat <[e-mail]>  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 <[e-mail]>  Fri, 18 Feb 2022 15:27:14 -0300
+
 haproxy (2.4.13-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Vincent Bernat <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 11 Jan 2022 14:40:07 -0300
+
 haproxy (2.4.12-1) unstable; urgency=medium
 
   * New upstream release.
 
  -- Vincent Bernat <[e-mail]>  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 <[e-mail]>  Sat, 08 Jan 2022 18:58:44 -0300
+
 haproxy (2.4.11-1) unstable; urgency=medium
 
   * New upstream release.
@@ -41,6 +89,27 @@ haproxy (2.4.8-3) unstable; urgency=medium
 
  -- Vincent Bernat <[e-mail]>  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 <[e-mail]>  Thu, 09 Dec 2021 11:57:06 +0100
+
+haproxy (2.4.8-2ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against libssl3
+
+ -- Steve Langasek <[e-mail]>  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 <[e-mail]>  Fri, 19 Nov 2021 18:36:04 -0300
+
 haproxy (2.4.8-2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 5ce2aef..22aa94c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: haproxy
 Section: net
 Priority: optional
-Maintainer: Debian HAProxy Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian HAProxy Maintainers <[e-mail]>
 Uploaders: Apollon Oikonomopoulos <[e-mail]>,
            Prach Pongpanich <[e-mail]>,
            Vincent Bernat <[e-mail]>
@@ -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 --git a/debian/rules b/debian/rules
index cc7ff8e..b341144 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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