Merge ~bryce/ubuntu/+source/rabbitmq-server:sru.1773324-bionic into ubuntu/+source/rabbitmq-server:ubuntu/bionic-devel

[Bryce Harrington]

Pretty straightforward fix, as suggested by Alvin Joseph Tang (alvintang3)

PPA with the change, for testing, is at
https://launchpad.net/~bryce/+archive/ubuntu/sru.1773324

To test, verify that rabbitmqadmin --version prints an actual version string.

[Christian Ehrhardt  (paelzer)]

See comments on eoan MP.

In additon for B/C MPs we need to make sure they upgrade as both are on 3.6.10-1
So to de-duplicate you'd need something like
 3.6.10-1ubuntu0~18.04.1
 3.6.10-1ubuntu0~18.10.1

[Christian Ehrhardt  (paelzer)]

review: Needs Fixing

[Bryce Harrington (bryce)]

Thanks, I've corrected the patch metadata as per the bionic review, and updated the version number on this to 3.6.10-1ubuntu0~18.04.1

[Christian Ehrhardt  (paelzer)]

see bionic MP

[Bryce Harrington (bryce)]

Thanks, I've corrected the errors from the bionic MP, please review updates.

[Christian Ehrhardt  (paelzer)]

FYI waiting on the open question by Andreas in the Eoan-MP

review: Needs Information

Unmerged commits

ceba562... by Bryce Harrington on 2019-06-11

changelog

94b3eb7... by Bryce Harrington on 2019-06-11

* d/patch: Add fix-string-version.patch to update rabbitmq_management version string during build. (LP: #1773324)

be2ea2d... by Thomas Goirand <email address hidden> on 2017-06-28

Import patches-unapplied version 3.6.10-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: f4262f1d8d1515da39ae2aa8f6f6c8d48ae1e362

New changelog entries:
  * New upstream release (Closes: #863586), fixing multiple issues:
    - CVE-2017-4965: XSS vulnerabilities in management UI
    - CVE-2017-4966: authentication details are stored in browser-local storage
      without expiration
    - CVE-2017-4967: XSS vulnerabilities in management UI

f4262f1... by =?utf-8?b?T25kxZllaiBLb2JsacW+ZWs=?= <email address hidden> on 2017-01-02

Import patches-unapplied version 3.6.6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 87c099d7057d521bc8abe4f7694f86342b30923a

New changelog entries:
  [ Ondřej Nový ]
  * Team upload.
  * New upstream release (Closes: #849849, CVE-2016-9877)
  * d/copyright: Fixed for new release
  * d/ocf: Removed, use upstream one

87c099d... by Thomas Goirand <email address hidden> on 2016-02-14

Import patches-unapplied version 3.6.5-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 7d92c4d1ca870197fce919faa2dfd1b9fba09620

New changelog entries:
  [ James Page ]
  * New upstream release (Closes: #812377):
    - Builds fine with the new erlang (Closes: #837241).
  * [fa2d29e] Update watch file for upstream xz compression. (Closes: #813628).
  * [b008e08] Imported Upstream version 3.6.0.
  * [d0dc477] Update gbp configuration for dch use.
  [ Thomas Goirand ]
  * Also packaging the rabbitmqadmin cli.
  * Do not do dh_auto_clean, as it removes all the deps folder.
  * Disabled tests, as they download from github.
  * Replaced git-core transition package by git in build-depends.
  * Added rsync as build-depends-indep.
  * Fix DESTDIR=$(DEB_DESTDIR) PREFIX=/usr as upstream Makefile changed.
  * Added python-all and dh-python as build-depends.
  * Update of debian/copyright for the new deps/* path from upstream, updated
    debian/* info and fixed order.
  * Copy some stuff from the upstream pacakging in debian/rules.
  * Runtime depends on lsb-base.
  * Overrides lintian false positive error js source missing.
  [ Ondřej Nový ]
  * Fixed VCS URLs (https).
  * Fixed python shebang.
  * Standards-Version is 3.9.8 now (no change).

7d92c4d... by James Page on 2016-01-18

Import patches-unapplied version 3.5.7-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b342a3083370307dc784d23072e2707aebbbc17f

New changelog entries:
  * New upstream release.

b342a30... by Antonio Terceiro on 2015-10-31

Import patches-unapplied version 3.5.4-3.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: a787f1d74fbb9f9c75173c1f5d33951f0d9a4424

New changelog entries:
  * Non-maintainer upload.
  * Make the default configuration file, which is read unconditionally on
    startup, readable by others. This makes it possible to run rabbitmq-server
    as users other than rabbitmq, e.g. when running test suites as part of
    package builds (Closes: #801917)

a787f1d... by Thomas Goirand <email address hidden> on 2015-10-06

Import patches-unapplied version 3.5.4-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 695ecd07142a4f31981c2d266dccff8201bc3f96

New changelog entries:
  * Fix /etc/rabbitmq creation (adding -p to mkdir for upgrades). Thanks to
    Frederic Peters for the bug report (Closes: #801088).

695ecd0... by Thomas Goirand <email address hidden> on 2015-10-05

Import patches-unapplied version 3.5.4-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ff888edb218da9f2eb1ca79a822d30c6b4a1d716

New changelog entries:
  * Cosmetic clean-up in debian/rabbitmq-server.postinst and .init.
  * Fix the user / group of /etc/rabbitmq folder and conf files.
  * Also fix user / group of an eventual /etc/rabbitmq/enabled_plugins when
    upgrading the package.

ff888ed... by James Page on 2015-08-04

Import patches-unapplied version 3.5.4-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 06e7602349d29a626465db6d970caa6a44eb6a75

New changelog entries:
  * New upstream release.

diff --git a/debian/changelog b/debian/changelog
index 08e3b69..0aab8c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rabbitmq-server (3.6.10-1ubuntu0~18.04.1) bionic; urgency=medium
+
+  * d/patch: Add fix-string-version.patch to update rabbitmq_management
+    version string during build.  (LP: #1773324)
+
+ -- Alvin Joseph Tang <[e-mail]>  Sun, 09 Jun 2019 15:51:54 +0800
+
 rabbitmq-server (3.6.10-1) unstable; urgency=medium
 
   * New upstream release (Closes: #863586), fixing multiple issues:
diff --git a/debian/patches/fix-string-version.patch b/debian/patches/fix-string-version.patch
new file mode 100644
index 0000000..4cadf7a
--- /dev/null
+++ b/debian/patches/fix-string-version.patch
@@ -0,0 +1,23 @@
+Description: Replace %%VSN%% in rabbitmqadmin with version number
+Author: Alvin Joseph Tang, [e-mail]
+Origin: other, https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1773324/+attachment/5269746/+files/3-1.0-1ubuntu2.debdiff
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1773324
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908690
+Reviewed-by: Bryce Harrington <[e-mail]>
+Last-Update: 2019-06-13
+
+Index: rabbitmq-server-3.6.10/deps/rabbitmq_management/Makefile
+===================================================================
+--- rabbitmq-server-3.6.10.orig/deps/rabbitmq_management/Makefile
++++ rabbitmq-server-3.6.10/deps/rabbitmq_management/Makefile
+@@ -40,6 +40,9 @@ include erlang.mk
+ # Distribution.
+ # --------------------------------------------------------------------
+ 
++all::
++	$(verbose) sed -i 's/%%VSN%%/$(PROJECT_VERSION)/' bin/rabbitmqadmin
++
+ list-dist-deps::
+ 	@echo bin/rabbitmqadmin
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0003352
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-string-version.patch