Merge ~jessica-youjeong/ubuntu/+source/librabbitmq:020322-jammy-devel-librabbitmq into ubuntu/+source/librabbitmq:ubuntu/devel

[Jess Jang]

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

[Utkarsh Gupta (utkarsh)]

Hello,

This looks good. Thank you very much! Sponsored the upload:

$ dput ubuntu ../librabbitmq_0.10.0-1ubuntu2_source.changes
Checking signature on .changes
gpg: ../librabbitmq_0.10.0-1ubuntu2_source.changes: Valid signature from 823E967606C34B96
Checking signature on .dsc
gpg: ../librabbitmq_0.10.0-1ubuntu2.dsc: Valid signature from 823E967606C34B96
Package includes an .orig.tar.gz file although the debian revision suggests
that it might not be required. Multiple uploads of the .orig.tar.gz may be
rejected by the upload queue management software.
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading librabbitmq_0.10.0-1ubuntu2.dsc: done.
  Uploading librabbitmq_0.10.0.orig.tar.gz: done.
  Uploading librabbitmq_0.10.0-1ubuntu2.debian.tar.xz: done.
  Uploading librabbitmq_0.10.0-1ubuntu2_source.buildinfo: done.
  Uploading librabbitmq_0.10.0-1ubuntu2_source.changes: done.
Successfully uploaded packages.

review: Approve

Unmerged commits

587da76... by Jess Jang on 2022-03-17

changelog

ddfc942... 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)

54e739a... by Simon Chopin on 2021-11-17

0.10.0-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

1a940e6... by Matthias Klose on 2021-10-07

0.10.0-1build1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 8c9e075..34b90f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+librabbitmq (0.10.0-1ubuntu2) jammy; 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
diff --git a/debian/patches/series b/debian/patches/series
index 7d40e1f..3365953 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ 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