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

[Jess Jang]

This MP contains a fix for LP: 1888313, which I intend to SRU as well, so this is a fix for Bionic 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

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

changelog

cd486b7... 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 8d4f34b..af492df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
-librabbitmq (0.8.0-1ubuntu0.18.04.2) bionic-security; urgency=medium
+librabbitmq (0.8.0-1ubuntu0.18.04.3) bionic; 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.8.0-1ubuntu0.18.04.2) bionic-security; urgency=medium
   * SECURITY UPDATE: Integer overflow
     - debian/patches/CVE-2019-18609.patch: check frame_size is >= INT32_MAX
       in librabbitmq/amqp_connection.c.
diff --git a/debian/patches/series b/debian/patches/series
index ee127a2..180be81 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,6 @@ cmake_with_ssl.patch
 use_cmake_package.patch
 fix-parameter-processing.patch
 CVE-2019-18609.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