Merge ~bryce/ubuntu/+source/librabbitmq:sru.1790657-xenial into ubuntu/+source/librabbitmq:ubuntu/xenial-devel

[Bryce Harrington]

Straightforward backport of an upstream fix for parameter handling.

    LP: #1790657

Please also review the SRU details in the bug description.

A PPA with fixes for xenial, bionic, and cosmic is available here:
    https://code.launchpad.net/~bryce/ubuntu/+source/librabbitmq/+git/librabbitmq

Red/green testing in lxc can be done via:

    $ sudo apt-get -y install librabbitmq-dev
    $ sudo apt-get -y install amqp-tools

    ### Broken behavior:
    $ sudo amqp-consume --server=foobar:5672 -q queue cat
    both --server and --url options specify server host

    ### Fixed behavior:
    $ sudo apt-add-repository -y ppa:bryce/librabbitmq-sru-1790657
    $ sudo apt-get -y install librabbitmq-dev
    $ sudo amqp-consume --server=foobar:5672 -q queue cat
    Specifying the port number with --server is deprecated
    opening socket to foobar:5672

[Christian Ehrhardt  (paelzer)]

As with Bionic (change is identical) ...
Tested against PPA - ok
Upstream references - ok
Patch headers - perfect
Check upstream bug discussions - ok
Check LP bug - ok
SRU template - ok

Given how long things are broken this seems rather unimportant, but OTOH a very low hanging fruit.
Thanks Bryce for prepping that.
+1 on the MP

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review Christian.

$ git ubuntu tag --upload
$ git push pkg upload/0.7.1-1ubuntu0.1
Counting objects: 11, done.
Delta compression using up to 6 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 2.62 KiB | 892.00 KiB/s, done.
Total 11 (delta 5), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/librabbitmq
 * [new tag] upload/0.7.1-1ubuntu0.1 -> upload/0.7.1-1ubuntu0.1
$ dput ubuntu ../librabbitmq_0.7.1-1ubuntu0.1_source.changes
Checking signature on .changes
gpg: ../librabbitmq_0.7.1-1ubuntu0.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../librabbitmq_0.7.1-1ubuntu0.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading librabbitmq_0.7.1-1ubuntu0.1.dsc: done.
  Uploading librabbitmq_0.7.1-1ubuntu0.1.debian.tar.xz: done.
  Uploading librabbitmq_0.7.1-1ubuntu0.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 8240ae7..9470e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+librabbitmq (0.7.1-1ubuntu0.1) xenial; urgency=medium
+
+  * d/patches: Add fix-parameter-processing.patch to correct handling of
+    --server, --url, and other options by reorganizing the logic flow.
+    (LP: #1790657)
+
+ -- Bryce Harrington <[e-mail]>  Mon, 08 Jul 2019 20:19:04 -0700
+
 librabbitmq (0.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix-parameter-processing.patch b/debian/patches/fix-parameter-processing.patch
new file mode 100644
index 0000000..4a49fc8
--- /dev/null
+++ b/debian/patches/fix-parameter-processing.patch
@@ -0,0 +1,117 @@
+From 5dfe5d2f2680a4639090a9c239a2b0018d90c789 Mon Sep 17 00:00:00 2001
+From: Alan Antonuk <[e-mail]>
+Date: Fri, 19 Aug 2016 23:22:44 -0700
+Subject: [PATCH] Tools: fix --url parameter processing issues.
+
+--url parameter should not be specified with the --server --port
+--username and --password parameters. Correct parameter processing
+routines to correctly enforce this.
+
+Fixes #364
+
+Author: Alan Antonuk <[e-mail]>
+Origin: upstream, https://github.com/alanxz/rabbitmq-c/commit/5dfe5d2f2680a4639090a9c239a2b0018d90c789
+Bug: https://github.com/alanxz/rabbitmq-c/issues/364
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/librabbitmq/+bug/1790657
+Acked-By: Bryce Harrington <[e-mail]>
+Applied-Upstream: 0.9.0, commit:5dfe5d2f2680a4639090a9c239a2b0018d90c789
+Last-Updated: 2019-06-27
+---
+ tools/common.c | 43 ++++++++++++++++++++-----------------------
+ 1 file changed, 20 insertions(+), 23 deletions(-)
+
+diff --git a/tools/common.c b/tools/common.c
+index c8b13e31..9c6b085f 100644
+--- a/tools/common.c
++++ b/tools/common.c
+@@ -247,9 +247,9 @@ static void init_connection_info(struct amqp_connection_info *ci)
+ 
+   if (amqp_server) {
+     char *colon;
+-    if (ci->host)
+-      die("both --server and --url options specify"
+-          " server host");
++    if (amqp_url) {
++      die("--server and --url options cannot be used at the same time");
++    }
+ 
+     /* parse the server string into a hostname and a port */
+     colon = strchr(amqp_server, ':');
+@@ -260,7 +260,7 @@ static void init_connection_info(struct amqp_connection_info *ci)
+       /* Deprecate specifying the port number with the
+          --server option, because it is not ipv6 friendly.
+          --url now allows connection options to be
+-         specificied concisely. */
++         specified concisely. */
+       fprintf(stderr, "Specifying the port number with"
+               " --server is deprecated\n");
+ 
+@@ -269,12 +269,9 @@ static void init_connection_info(struct amqp_connection_info *ci)
+       memcpy(ci->host, amqp_server, host_len);
+       ci->host[host_len] = 0;
+ 
+-      if (ci->port >= 0)
+-        die("both --server and --url options specify"
+-            " server port");
+-      if (amqp_port >= 0)
+-        die("both --server and --port options specify"
+-            " server port");
++      if (amqp_port >= 0) {
++        die("both --server and --port options specify server port");
++      }
+ 
+       ci->port = strtol(colon+1, &port_end, 10);
+       if (ci->port < 0
+@@ -288,39 +285,39 @@ static void init_connection_info(struct amqp_connection_info *ci)
+ #if WITH_SSL
+     if (amqp_ssl && !ci->ssl) {
+       die("the --ssl option specifies an SSL connection"
+-          " but the --server option does not");
++          " but the --url option does not");
+     }
+ #endif
+   }
+ 
+   if (amqp_port >= 0) {
+-    if (ci->port >= 0)
+-      die("both --port and --url options specify"
+-          " server port");
++    if (amqp_url) {
++      die("--port and --url options cannot be used at the same time");
++    }
+ 
+     ci->port = amqp_port;
+   }
+ 
+   if (amqp_username) {
+-    if (ci->user)
+-      die("both --username and --url options specify"
+-          " AMQP username");
++    if (amqp_url) {
++      die("--username and --url options cannot be used at the same time");
++    }
+ 
+     ci->user = amqp_username;
+   }
+ 
+   if (amqp_password) {
+-    if (ci->password)
+-      die("both --password and --url options specify"
+-          " AMQP password");
++    if (amqp_url) {
++      die("--password and --url options cannot be used at the same time");
++    }
+ 
+     ci->password = amqp_password;
+   }
+ 
+   if (amqp_vhost) {
+-    if (ci->vhost)
+-      die("both --vhost and --url options specify"
+-          " AMQP vhost");
++    if (amqp_url) {
++      die("--vhost and --url options cannot be used at the same time");
++    }
+ 
+     ci->vhost = amqp_vhost;
+   }
diff --git a/debian/patches/series b/debian/patches/series
index c717f5f..b596ba9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cmake_with_ssl.patch
 use_cmake_package.patch
+fix-parameter-processing.patch