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

Proposed by Bryce Harrington
Status: Work in progress
Proposed branch: ~bryce/ubuntu/+source/rabbitmq-server:sru.1773324-eoan
Merge into: ubuntu/+source/rabbitmq-server:ubuntu/eoan-devel
Diff against target: 51 lines (+31/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-string-version.patch (+23/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack Needs Information
Christian Ehrhardt  (community) Needs Fixing
Canonical Server Pending
Review via email: mp+368659@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

> Applied-Upstream: 3.6.10
suggests it would be in any >=3.6.10 but you have fixes for B/C/D/E which means that can't be true.

It should be upstream or at least acknowledged in Debian to fix it this way to not become a long term maintenance Debt.
Please add a ref to a Debian bug to the headers once you created one.

"Origin: backport" also suggests this is upstream somewhere, but you'd need to append the URL like
"Origin: backport, <url-to-original-git-commit>
The "not needed if author is present" isn't true in most cases - best practice - always add such an URL

Please find how this was fixed upstream (if it was) and update the two tags as mentioned above.

review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Ah, you're right, I didn't list things properly.

The situation is that the version number is being set in their own release machinery. We're using basically the same sed command but need to apply it in a makefile. So, while we're doing the same thing as upstream, the patch itself needs to live in our delta (or Debian's rather -- see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908690.) Since it was provided by a community member, then looking at DEP3 requirements it looks like it should be listed as from 'other', and marked as not for upstream.

I've updated the patch for the four branches.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Great, thanks Bryce.
Mostly LGTM now, one thing the header could get then is
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908690

And I thought
Ubuntu-Bug is actually Bug-Ubuntu
yeah [1] says:
"Bug-<Vendor> or Bug (optional)"

And an ack on
Origin: other
yet we use to extend Origin with helping data.
So as on a git commit you'd do
Origin: upstream, url
We could/should (my opinion) here use something like
Origin: other, https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1773324/+attachment/5269746/+files/3-1.0-1ubuntu2.debdiff

While not deal breaking, since these are trivial to fix up I'd ask you to do so.

[1]: https://dep-team.pages.debian.net/deps/dep3/

review: Needs Fixing
Revision history for this message
Bryce Harrington (bryce) wrote :

Thanks, I've corrected those errors, please review updates.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Question inline

review: Needs Information
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Looking at our MP queue again - this one still waits for Andreas questions inline, hence a ping on this MP ... ping

Revision history for this message
Bryce Harrington (bryce) wrote :

You may have already seen on the bug report, but the original packager is looking into those questions (see below).

When I looked at it initially, I got the impression the prepare-dist route would be appropriate only when creating the orig tarball, so Alvin's approach looked cleaner if done as a packaging patch. But can wait and see what upstream says.

"""
Hi Bryce,

I looked into the Makefile and it seems that prepare-dist target is used when producing the erlang plugin archives (.ez files) and not when building the package itself. Based on the build server documentation[1], all is the default target that is why I used that fix. There's a difference between the sed commands though, the fix replaces the version inline the rabbitmqadmin file itself but for prepare-dist it's generating a new file.

Sorry just to be clear, upstream is the rabbitmq-server repository itself right? I haven't approach them about this problem and whether it's a good fix. I'll do that and get back to you.

[1] https://www.rabbitmq.com/build-server.html
"""

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks for the info Bryce, TBH I haven't checked the bug updates before now.
I think it is fine to wait for what Debian is doing.

The only thing I wonder is if we should/could set the MPs (4) to "work in progress" or "rejected" for now. Once available again you can refresh them as needed and set them back.
That way they would be out of our overview as long as they are not actionable.

Unmerged commits

7b7fb29... by Bryce Harrington

changelog

337175d... by Bryce Harrington

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

d94eed1... by James Page

Import patches-unapplied version 3.7.8-4ubuntu2 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: cff48271ab0bc613f672f936a80bc02fca232fee

New changelog entries:
  * Resolve issues with startup of RabbitMQ with erlang provided
    epmd daemon (LP: #1808766):
    - d/rabbitmq-server.service: Wants/After epmd.socket, aligning
      with services actually provided by erlang in Ubuntu.
    - d/control: Bump minimum erlang-* package versions to ensure
      compatibility with epmd.socket configuration.

cff4827... by Corey Bryant

Import patches-unapplied version 3.7.8-4ubuntu1 to ubuntu/disco-proposed

Imported using git-ubuntu import.

Changelog parent: 1fee780529c1858a0422869d8156c69091319550

New changelog entries:
  [ Corey Bryant ]
  * d/gbp.conf: Update gbp configuration file.
  * d/control: Update Vcs-* links and maintainers.
  * d/control: Set minimum erlang dependencies to 1:21.1.1, according to
    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909941#32.
  [ James Page ]
  * d/control,rules: Switch to using Python 3.

1fee780... by Thomas Goirand <email address hidden>

Import patches-unapplied version 3.7.8-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 2a4d03f736a38fddf6c3d85bccde17813c40c11c

New changelog entries:
  * Remove Elixir version patch.
  * Build-depends on Elixir 1.6.6.

2a4d03f... by Thomas Goirand <email address hidden>

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

Imported using git-ubuntu import.

Changelog parent: 2621fb36121d62516855c169e2b96592d2013c32

New changelog entries:
  * Remove $LANG wrapper hack.
  * Wrap rabbitmqctl to set $LANG and avoid warning.

2621fb3... by Thomas Goirand <email address hidden>

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

Imported using git-ubuntu import.

Changelog parent: be2ea2d7e0c7d9091a1b1733bddcb014fad243a6

New changelog entries:
  [ Daniel Baumann ]
  * Updating vcs fields.
  * Updating copyright format url.
  * Updating maintainer field.
  * Running wrap-and-sort -bast.
  * Updating standards version to 4.0.0.
  * Removing gbp.conf, not used anymore or should be specified in the
    developers dotfiles.
  * Correcting permissions in debian packaging files.
  * Updating standards version to 4.0.1.
  * Deprecating priority extra as per policy 4.0.1.
  * Updating standards version to 4.1.0.
  [ Ondřej Nový ]
  * d/control: Set Vcs-* to salsa.debian.org
  * d/changelog: Remove trailing whitespaces
  * d/control: Use <email address hidden> as maintainer
  [ Thomas Goirand ]
  * New upstream release:
    - Fix FTBFS with newer Erlang (Closes: #910623).
  * Fix the way to calculate upstream VERSION in debian/rules.
  * Switched rabbitmq-server.service to type notify, and other minor changes
    in this file (Closes: #812342), do not wait for timeout on shutdown either
    (Closes: #902136).
  * Updated debian/control for this release.
  * Bumped debhelper to 10.
  * Standards-Version is now 4.2.1.
  * Add patch to accept Elixir 1.6.5.
  * Also package manpages.

be2ea2d... by Thomas Goirand <email address hidden>

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>

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>

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 1a5047a..d07d8cc 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+rabbitmq-server (3.7.8-4ubuntu3) eoan; urgency=medium
7+
8+ * d/patch: Add fix-string-version.patch to update rabbitmq_management
9+ version string during build. (LP: #1773324)
10+
11+ -- Alvin Joseph Tang <alvintang@gmail.com> Sun, 09 Jun 2019 15:51:54 +0800
12+
13 rabbitmq-server (3.7.8-4ubuntu2) disco; urgency=medium
14
15 * Resolve issues with startup of RabbitMQ with erlang provided
16diff --git a/debian/patches/fix-string-version.patch b/debian/patches/fix-string-version.patch
17new file mode 100644
18index 0000000..4cadf7a
19--- /dev/null
20+++ b/debian/patches/fix-string-version.patch
21@@ -0,0 +1,23 @@
22+Description: Replace %%VSN%% in rabbitmqadmin with version number
23+Author: Alvin Joseph Tang, alvintang@gmail.com
24+Origin: other, https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1773324/+attachment/5269746/+files/3-1.0-1ubuntu2.debdiff
25+Forwarded: not-needed
26+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/1773324
27+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908690
28+Reviewed-by: Bryce Harrington <bryce@canonical.com>
29+Last-Update: 2019-06-13
30+
31+Index: rabbitmq-server-3.6.10/deps/rabbitmq_management/Makefile
32+===================================================================
33+--- rabbitmq-server-3.6.10.orig/deps/rabbitmq_management/Makefile
34++++ rabbitmq-server-3.6.10/deps/rabbitmq_management/Makefile
35+@@ -40,6 +40,9 @@ include erlang.mk
36+ # Distribution.
37+ # --------------------------------------------------------------------
38+
39++all::
40++ $(verbose) sed -i 's/%%VSN%%/$(PROJECT_VERSION)/' bin/rabbitmqadmin
41++
42+ list-dist-deps::
43+ @echo bin/rabbitmqadmin
44+
45diff --git a/debian/patches/series b/debian/patches/series
46new file mode 100644
47index 0000000..0003352
48--- /dev/null
49+++ b/debian/patches/series
50@@ -0,0 +1 @@
51+fix-string-version.patch

Subscribers

People subscribed via source and target branches