Merge ~jessica-youjeong/ubuntu/+source/librabbitmq:031822-focal-devel-librabbitmq into ubuntu/+source/librabbitmq:ubuntu/focal-devel

[Jess Jang]

This MP contains a fix for LP: 1888313, which I intend to SRU as well, so this is a fix for Focal which is backported from link below. The package was successfully built using sbuild and I also ran the autopkgtest and all the tests are passing.

Requesting you to please review and sponsor the upload. Thank you!

[https://code.launchpad.net/~jessica-youjeong/ubuntu/+source/librabbitmq/+git/librabbitmq/+merge/417036]

Unmerged commits

a04b6e1... by Jess Jang on 2022-03-17

changelog

a54540f... by Jess Jang on 2022-02-03

  * d/p/server-flag-deprecation.patch:
    add patch to fix issue parsing hostname in --server flag.
    (LP: #1888313)

diff --git a/debian/changelog b/debian/changelog
index 9378ba2..f397bd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+librabbitmq (0.10.0-1ubuntu1.20.04.1) focal; urgency=medium
+
+  * d/p/server-flag-deprecation.patch:
+    add patch to fix issue parsing hostname in --server flag.
+    (LP: #1888313)
+
+ -- Jess Jang <[e-mail]>  Thu, 03 Feb 2022 14:30:36 -0600
+
+librabbitmq (0.10.0-1ubuntu1) jammy; urgency=medium
+
+  * d/p/ssl-remove-reference-to-FIPS_set_mode.patch: backported
+    to fix the build against OpenSSL 3.0 (LP: #1945812)
+
+ -- Simon Chopin <[e-mail]>  Wed, 17 Nov 2021 14:22:23 +0100
+
+librabbitmq (0.10.0-1build1) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:17:49 +0200
+
 librabbitmq (0.10.0-1) unstable; urgency=high
 
   * New upstream release, fixing CVE-2019-18609 (Closes: #946005).
diff --git a/debian/patches/series b/debian/patches/series
index f96d27b..3365953 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 cmake_with_ssl.patch
 use_cmake_package.patch
 disable-test-basic.patch
+ssl-remove-reference-to-FIPS_set_mode.patch
+server_flag_deprecation.patch
diff --git a/debian/patches/server_flag_deprecation.patch b/debian/patches/server_flag_deprecation.patch
new file mode 100644
index 0000000..de99b0b
--- /dev/null
+++ b/debian/patches/server_flag_deprecation.patch
@@ -0,0 +1,42 @@
+From 637f0275ffcc2bfb58c94f0bf6e290aa40c1695a Mon Sep 17 00:00:00 2001
+From: Alan Antonuk <[e-mail]>
+Date: Fri, 7 Aug 2020 05:07:50 +0000
+Subject: [PATCH] tool: set port when not specified in --server flag
+
+Set the port to 5672 and 5671 in SSL mode in the tools when the --server
+flag is used, but does not specify a port.
+
+From 54d00bee5cc4603dc96af5f86c899210689dfeeb Mon Sep 17 00:00:00 2001
+From: Alan Antonuk <[e-mail]>
+Date: Sun, 9 Aug 2020 06:44:28 +0000
+Subject: [PATCH] tool: fix issue parsing hostname in --server flag
+
+Set both the host and port when a ':' isn't found in in the --server
+flag.  The attempted fix in #622 was not complete as the host was not
+properly set.
+
+Fixes: #621
+
+Origin: upstream;
+        https://github.com/alanxz/rabbitmq-c/commit/637f0275ffcc2bfb58c94f0bf6e290aa40c1695a
+        https://github.com/alanxz/rabbitmq-c/commit/4d03c849868231dc217785c6f0e78eab9cd79fd5
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/librabbitmq/+bug/1888313
+Last-Updated: 2022-01-19
+
+--- a/tools/common.c
++++ b/tools/common.c
+@@ -240,6 +240,14 @@
+       if (ci->port < 0 || ci->port > 65535 || port_end == colon + 1 ||
+           *port_end != 0)
+         die("bad server port number in '%s'", amqp_server);
++    } else {
++      ci->host = amqp_server;
++      ci->port = 5672;
++#if WITH_SSL
++      if (amqp_ssl) {
++        ci->port = 5671;
++      }
++#endif
+     }
+ 
+ #if WITH_SSL