Page MenuHomeFreeBSD

security/doas: Update to 5.9p5
ClosedPublic

Authored by woodsb02 on Aug 24 2016, 2:23 PM.

Details

Summary

security/doas: Update to 5.9p5

This update enforces the correct uid and gid when -u switch is used.

PR: 211622

Test Plan

poudriere testport -i security/doas

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

woodsb02 updated this revision to Diff 19632.Aug 24 2016, 2:23 PM
woodsb02 retitled this revision from to security/doas: Update to 5.9p5.
woodsb02 updated this object.
woodsb02 edited the test plan for this revision. (Show Details)
woodsb02 added reviewers: adamw, mat, koobs.
koobs accepted this revision.EditedAug 24 2016, 2:47 PM
koobs edited edge metadata.

Other than the use of PORTVERSION instead of DISTVERSION for this version string, this looks fine.

If you want to update it to DISTVERSION, you'll want to first ensure the resulting PORTVERSION string is higher in value than the current PORTVERSION value, otherwise a PORTEPOCH will be needed (which may well be needed anyway for some later version.)

You can test with pkg version -t <ver1> <ver2>

You'll find DISTVERSION=5.9p5 auto creates a PORTVERSION=5.9.p5 (I think, note the dot)

This revision is now accepted and ready to land.Aug 24 2016, 2:47 PM
adamw edited edge metadata.Aug 24 2016, 3:01 PM

I agree with koobs that this should have been DISTVERSION from the beginning (I think I might have sent an email about that at one point?).

Given that DISTVERSION would require a PORTEPOCH bump, I'd prefer to add a comment to the Makefile reminding the maintainer and future committers that it should be switched to DISTVERSION as soon as the version gets higher than 5.9.

koobs requested changes to this revision.Aug 24 2016, 3:03 PM
koobs edited edge metadata.

Concur with @adamw, this is a nice compromise: it'll get done, eventually, without ever needing a PORTEPOCH. Everyone wins.

This revision now requires changes to proceed.Aug 24 2016, 3:03 PM
koobs added a comment.Aug 24 2016, 3:03 PM

Pending comment

koobs accepted this revision.Aug 24 2016, 3:09 PM
koobs edited edge metadata.

I forgot your leash is a little looser already :)

Approved by: line is required in the commit message btw (cant see in review desc)

This revision is now accepted and ready to land.Aug 24 2016, 3:09 PM
This revision was automatically updated to reflect the committed changes.
mat added inline comments.Aug 24 2016, 3:46 PM
head/security/doas/Makefile
4–5

About that, PORTVERSION is just fine. Only switch to DISTVERSION if 5.9 is after 5.9p5:

$ pkg version -t 5.9 5.9p5
<
$ pkg version -t 5.9.p5 5.9
<

To sum up, if 5.9p5 means 5.9-pre-release-5 and a 5.9 will follow, switching to DISTVERSION is the way to go.
If, on the other hand, 5.9p5 means the fifth path after 5.9, by all mean, keep PORTVERSION, it works just right.

adamw added a comment.Aug 24 2016, 3:50 PM

Or 5.9.1.

$ pkg version -t 5.9p5 5.9.1
>
mat edited edge metadata.Aug 24 2016, 3:56 PM

My main point was that 1.[a-z] < 1.0 (and it is pure luck that alpha < beta < release-candidate).

But it is true that 1.[0-9] < 1[a-z].

It is a mess.