Bug 280565 - net/rabbitmq: update to 3.13.6
Summary: net/rabbitmq: update to 3.13.6
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Vladimir Druzenko
URL: https://github.com/rabbitmq/rabbitmq-...
Keywords:
Depends on:
Blocks:
 
Reported: 2024-08-02 01:06 UTC by Artyom Davidov
Modified: 2024-08-19 15:22 UTC (History)
3 users (show)

See Also:
bugzilla: maintainer-feedback? (erlang)
ard_1: maintainer-feedback?
vvd: merge-quarterly+


Attachments
Patch to update net/rabbitmq to 3.13.6 (39.66 KB, patch)
2024-08-02 01:06 UTC, Artyom Davidov
ard_1: maintainer-approval?
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Artyom Davidov 2024-08-02 01:06:36 UTC
Created attachment 252442 [details]
Patch to update net/rabbitmq to 3.13.6

This patch will update net/rabbitmq to the latest version 3.13.6
Comment 1 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-15 23:22:05 UTC
Maintainer timeout 2 weeks reached.
Comment 2 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-19 12:28:00 UTC
(In reply to Artyom Davidov from comment #0)
Why did you remove "rabbitmq-tanzu"?
It build and install fine with "rabbitmq-tanzu".
Comment 3 Artyom Davidov 2024-08-19 13:24:50 UTC
(In reply to Vladimir Druzenko from comment #2)
Hello Vladimir!

I've removed it 'cause it was removed from the upstream tarball sbin directory.

You are right that it will build fine if we'll leave it in the Makefile and the pkg-plist but the resulting package will have just a symbolic link to a non-existent binary inside, but not the actual file, since it was removed upstream.

This is due to the way we creating package for this software - at the post-install phase the port creates symbolic links from the files in the original sbin directory to the ${STAGEDIR}${PREFIX}/sbin directory. And the list of such symbolic link is not automatically generated, but is manually added to the Makefile. So this list in the Makefiles should be consistent with the list of the files from the sbin directory of the upstream tarball.

On the other hand the port will pass check-plist phase even with the rabbitmq-tanzu included since it checks for the presence of the files in the STAGEDIR and pkg-plist, but it doesn't check the correctness of the symbolic links we create at the post-install phase.
Comment 4 Artyom Davidov 2024-08-19 14:16:47 UTC
(In reply to Vladimir Druzenko from comment #2)

One more thing about the rabbitmq-tanzu symbolic link - since the file was absent even in the rabbitmq 3.13.3 upstream tarball sbin directory this issue also affects the current net/rabbitmq 3.13.3 port.
One can install the current port version and check /usr/local/sbin directory and notice that there is a rabbitmq-tanzu symbolic link that points nowhere.

So the proposed patch will fix this minor packing issue though I didn't mention it.
Comment 5 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-19 14:32:34 UTC
(In reply to Artyom Davidov from comment #4)
Indeed, there is not even a mention of the tenzu substring anywhere in the distribution files.
ok, I'll commit it now.
Comment 6 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-19 14:41:02 UTC
Were there any important bug fixes (security, crashes, disruption of work) between 3.13.3 and 3.13.6 for the merge-quarterly?

In Chagelogs I see this one only:
    Nodes now register themselves before running peer discovery, reducing the probability of
    first (usually) two nodes to boot potentially forming two initial clusters.
    GitHub issues: #11647, #11646
Comment 7 Artyom Davidov 2024-08-19 15:01:49 UTC
(In reply to Vladimir Druzenko from comment #6)
AFAIK there were several fixes included in this version that makes it a candidate to merging into a quarterly branch.
Though there were no security fixes, there were fixes that can affect a successful upgrade from the 3.12.x branch (it was fixed in 3.13.4 - https://github.com/rabbitmq/rabbitmq-server/issues/11380) and some cluster-related fixes.

Moreover this version was recently marked by the upstream in the release notes as a recommended version to upgrade to for users running version 3.13.3. (https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.3) - the upstream version 3.13.3 release notes were specially edited to state this.

So it looks like we should merge 3.13.6 in a quarterly branch due to upstream recommendations and the bugs that were fixed in the rabbitmq version 3.13.6
Comment 8 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-19 15:04:40 UTC
(In reply to Artyom Davidov from comment #7)
Ok!

Also I replace all PORTVERSION with DISTVERSION.
Comment 9 commit-hook freebsd_committer freebsd_triage 2024-08-19 15:09:14 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b6062706c9a275a56799a5ddb1e5e872cf215582

commit b6062706c9a275a56799a5ddb1e5e872cf215582
Author:     Artyom Davidov <ard_1@mail.ru>
AuthorDate: 2024-08-19 15:05:11 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-19 15:05:11 +0000

    net/rabbitmq: Update 3.13.3 → 3.13.6

    This upgrade is highly recommended to all users currently on earlier
    3.13.x series and in particular between 3.13.3 and 3.13.5, inclusive.

    Changelogs:
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.4
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.5
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.6

    PR:             280565
    Approved by:    erlang (maintainer, timeout > 14 days)
    MFH:            2024Q3

 net/rabbitmq/Makefile  |  20 +--
 net/rabbitmq/distinfo  |   6 +-
 net/rabbitmq/pkg-plist | 438 +++++++++++++++++++++++++------------------------
 3 files changed, 236 insertions(+), 228 deletions(-)
Comment 10 commit-hook freebsd_committer freebsd_triage 2024-08-19 15:10:16 UTC
A commit in branch 2024Q3 references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6dc379e9d77a2d27296fcddd7add85839b1589fc

commit 6dc379e9d77a2d27296fcddd7add85839b1589fc
Author:     Artyom Davidov <ard_1@mail.ru>
AuthorDate: 2024-08-19 15:05:11 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-08-19 15:09:23 +0000

    net/rabbitmq: Update 3.13.3 → 3.13.6

    This upgrade is highly recommended to all users currently on earlier
    3.13.x series and in particular between 3.13.3 and 3.13.5, inclusive.

    Changelogs:
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.4
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.5
    https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.13.6

    PR:             280565
    Approved by:    erlang (maintainer, timeout > 14 days)
    MFH:            2024Q3

    (cherry picked from commit b6062706c9a275a56799a5ddb1e5e872cf215582)

 net/rabbitmq/Makefile  |  20 +--
 net/rabbitmq/distinfo  |   6 +-
 net/rabbitmq/pkg-plist | 438 +++++++++++++++++++++++++------------------------
 3 files changed, 236 insertions(+), 228 deletions(-)
Comment 11 Vladimir Druzenko freebsd_committer freebsd_triage 2024-08-19 15:22:14 UTC
Thanks.
Comment 12 Artyom Davidov 2024-08-19 15:22:58 UTC
Thank you Vladimir!