Page MenuHomeFreeBSD

audio/mumble-server: update to 1.5.517
ClosedPublic

Authored by vvd on Jul 15 2023, 10:29 PM.
Referenced Files
F81951501: D41048.id132659.diff
Wed, Dec 11, 7:34 PM
Unknown Object (File)
Thu, Nov 14, 3:58 PM
Unknown Object (File)
Wed, Nov 13, 11:59 PM
Unknown Object (File)
Wed, Nov 13, 4:25 PM
Unknown Object (File)
Wed, Nov 13, 4:17 PM
Unknown Object (File)
Wed, Nov 13, 3:54 PM
Unknown Object (File)
Wed, Nov 13, 3:51 PM
Unknown Object (File)
Wed, Nov 13, 3:47 PM
Subscribers

Details

Summary

Upstream rename murmur to mumble-server - need help with entry in UPDATING.

Tested on live system 13.2-p1 amd64 - build, run and connect to server (and speak).
Build in poudriere 13.2-p1 amd64 and i386 with default options and with all options on.

Can't test on arm, ppc and other platforms. Who can test?

Also need testing on 14 with OpenSSL 3 and LLVM 16.

PR: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261395

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

vvd requested review of this revision.Jul 15 2023, 10:29 PM
vvd created this revision.

The problem with UPDATING is that it's only visible to people with a checked-out ports tree; people who only use binary packages will never see the messages.

You still want to put stuff in UPDATING, but pkg-message is actually the most helpful as it's visible to everyone using pkg (FreeBSD upstream, poudriere, etc.).

See https://docs.freebsd.org/en/books/porters-handbook/pkg-files/#porting-message, especially "Example 4: Display a Message on Upgrade."

bofh added inline comments.
UIDs
286 ↗(On Diff #124723)

Do not do this please. Create a new user. For safety and sanity reasons it's not wise to change/remove this during the lifetime of supported releases. So we can remove this sometimes after the end of 13.

The problem with UPDATING is that it's only visible to people with a checked-out ports tree; people who only use binary packages will never see the messages.

pkg-updating(8) - display UPDATING entries of software packages

After discussion in IRC I updated the patch:

  • Keep old names for user and group is "technical debt" and "confuse the users" (especially new).
  • Use new UID and GID is difficult to migrate for running systems - find and change owner for all files required for port.

So, IMHO, rename user and group is "the lesser of the evils".

The problem with UPDATING is that it's only visible to people with a checked-out ports tree; people who only use binary packages will never see the messages.

You still want to put stuff in UPDATING, but pkg-message is actually the most helpful as it's visible to everyone using pkg (FreeBSD upstream, poudriere, etc.).

See https://docs.freebsd.org/en/books/porters-handbook/pkg-files/#porting-message, especially "Example 4: Display a Message on Upgrade."

Added pkg-message.

The problem with UPDATING is that it's only visible to people with a checked-out ports tree; people who only use binary packages will never see the messages.

pkg-updating(8) - display UPDATING entries of software packages

pkg-updating(8) requires a ports tree checked out locally. For users who exclusively use pkg(8), messages only come from pkg-message.

tcberner added inline comments.
UPDATING
16 ↗(On Diff #126054)

@bapt is there a way to make pkg handle the migration during upgrade?

There is something strange going on with this diff. When trying to apply it via arc patch D41048 I do get the audio/mumble-server port, but it contains PORTNAME=murmur and PORTVERSION=1.3.3. Maybe this is because the patch doesn't apply.

@vvd can you please refresh it?

There is something strange going on with this diff. When trying to apply it via arc patch D41048 I do get the audio/mumble-server port, but it contains PORTNAME=murmur and PORTVERSION=1.3.3. Maybe this is because the patch doesn't apply.

@vvd can you please refresh it?

I don't know how to do this correct in one patch: 1) rename port, 2) update to new version.
So patch can look weird and possible not all tools can work correctly with it. This part:

diff --git a/audio/murmur/Makefile b/audio/mumble-server/Makefile
similarity index 100%
rename from audio/murmur/Makefile
rename to audio/mumble-server/Makefile
diff --git a/audio/murmur/distinfo b/audio/mumble-server/distinfo
similarity index 100%
rename from audio/murmur/distinfo
rename to audio/mumble-server/distinfo
diff --git a/audio/murmur/files/murmur.in b/audio/mumble-server/files/mumble_server.in
similarity index 100%
rename from audio/murmur/files/murmur.in
rename to audio/mumble-server/files/mumble_server.in
diff --git a/audio/murmur/files/patch-initialize-SSL b/audio/mumble-server/files/patch-initialize-SSL
similarity index 100%
rename from audio/murmur/files/patch-initialize-SSL
rename to audio/mumble-server/files/patch-initialize-SSL
diff --git a/audio/murmur/files/patch-scripts_murmur.ini b/audio/mumble-server/files/patch-scripts_murmur.ini
similarity index 100%
rename from audio/murmur/files/patch-scripts_murmur.ini
rename to audio/mumble-server/files/patch-scripts_murmur.ini
diff --git a/audio/murmur/files/patch-src_SelfSignedCertificate.cpp b/audio/mumble-server/files/patch-src_SelfSignedCertificate.
cpp
similarity index 100%
rename from audio/murmur/files/patch-src_SelfSignedCertificate.cpp
rename to audio/mumble-server/files/patch-src_SelfSignedCertificate.cpp
diff --git a/audio/murmur/pkg-descr b/audio/mumble-server/pkg-descr
similarity index 100%
rename from audio/murmur/pkg-descr
rename to audio/mumble-server/pkg-descr
diff --git a/audio/murmur/pkg-plist b/audio/mumble-server/pkg-plist
similarity index 100%
rename from audio/murmur/pkg-plist
rename to audio/mumble-server/pkg-plist

I don't know how to do this correct in one patch: 1) rename port, 2) update to new version.

Create a commit, then use git format-patch -1.

Patch from git format-patch -1.
Not so obvious - diff look like "rm file && create file"…

I don't know if this is what you asked for...

As an option, create a new port with new UID/GID, and specify DEPRECATED in the old one and for some time there will be 2 ports at the same time. And then delete the old one with an entry in UPDATINGS describing the migration process.

In D41048#990566, @vvd wrote:

As an option, create a new port with new UID/GID, and specify DEPRECATED in the old one and for some time there will be 2 ports at the same time. And then delete the old one with an entry in UPDATINGS describing the migration process.

I actually like this plan, even without deprecating. Just leave it as it is, use new UID/GID and free old UID/GID. In the pkg-message change step 5 from pw usermod to chown -R.

In D41048#990566, @vvd wrote:

As an option, create a new port with new UID/GID, and specify DEPRECATED in the old one and for some time there will be 2 ports at the same time. And then delete the old one with an entry in UPDATINGS describing the migration process.

I actually like this plan, even without deprecating. Just leave it as it is, use new UID/GID and free old UID/GID. In the pkg-message change step 5 from pw usermod to chown -R.

1.3 is deprecated by upstream (we have 1.3.3, but last verison in 1.3 branch is 1.3.4).
1.4 is current stable release, but it doesn't support OpenSSL 3.
1.5 is RC for 1 year already - waiting release.

Update audio/murumr from 1.3.3 to 1.3.4 is waste of time, IMHO.
Update audio/murumr 1.3 to 1.4 and add new port audio/mumble-server with 1.5 - it's IMHO double work (but I can do it).
Just deprecate audio/murumr 1.3 with EXPIRATION_DATE=2024-12-31 and add new port audio/mumble-server with 1.5 is best option, IMHO.

Added UIDs, GIDs and UPDATING.

I check - update from 1.3.3 to 1.3.4 is trivial. Can I update it and take maintainership without review?
Also it need LIB_DEPENDS=devel/abseil - tested in poudriere.

After that I'll update patch in this review.

Patch against current audio/murmur.

Trying to update diff using arcanist.

If you want to test it - get current patch.
If you want to see diff with old murmur - check history patch here: https://reviews.freebsd.org/D41048?id=133095

This revision is now accepted and ready to land.Jan 22 2024, 7:02 PM