Page MenuHomeFreeBSD
Differential D9664

security/doas: Match upstream version
ClosedPublic
Actions

Authored by jrm on Feb 18 2017, 2:57 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 14, 6:34 PM
Unknown Object (File)
Mon, Apr 14, 6:29 PM
Unknown Object (File)
Mon, Apr 14, 6:27 PM
Unknown Object (File)
Mon, Apr 14, 6:27 PM
Unknown Object (File)
Mon, Apr 14, 6:27 PM
Unknown Object (File)
Mon, Apr 14, 6:27 PM
Unknown Object (File)
Mon, Apr 14, 6:27 PM
Unknown Object (File)
Wed, Apr 2, 9:43 PM
View All Files
Subscribers
mat

Details

Reviewers
mat
Commits
rP434585: security/doas: Update to version 6.0p.
Summary

security/doas: Match upstream version (non-working example)

PR: 217176

Test Plan

portlint -C: OK
testport: OK (poudriere: 10.3-RELEASE-p10, i386)
testport: OK (poudriere: 10.3-RELEASE-p10, amd64)
testport: OK (poudriere: 11.0-RELEASE-p1, i386)
testport: OK (poudriere: 11.0-RELEASE-p1, amd64)

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 7629
Build 7777: arc lint + arc unit

Event Timeline

jrm updated this revision to Diff 25353.Feb 18 2017, 2:57 PM
jrm retitled this revision from to security/doas: Match upstream version (non-working example).
jrm updated this object.
jrm edited the test plan for this revision. (Show Details)
Herald added a subscriber: mat. · View Herald TranscriptFeb 18 2017, 2:57 PM
jrm updated this object.Feb 18 2017, 2:58 PM
jrm updated this object.Feb 18 2017, 7:42 PM
jrm updated this revision to Diff 25449.Feb 20 2017, 11:23 PM

Update distinfo for new upstream GH tag.

jrm retitled this revision from security/doas: Match upstream version (non-working example) to security/doas: Match upstream version.Feb 20 2017, 11:23 PM
jrm updated this object.
mat added a comment.Feb 21 2017, 12:31 PM

Note that this does not have reviewers, so, nobody is likely to review it ;-)

security/doas/Makefile
19

remove uselessly added tab.

jrm added a comment.Feb 21 2017, 12:53 PM

I was just using the visual diff to discuss changes to a patch with a submitter.

mat added a comment.Feb 21 2017, 12:58 PM

Then you should probably have the discussion here, in public :-)

jrm updated this revision to Diff 25469.Feb 21 2017, 2:16 PM

Updating license variables.

jrm added a comment.Feb 21 2017, 2:24 PM

License situation:

Most of the code is under OpenBSD's ISC license.
There is some code from NetBSD under a 2-clause BSD license.
The author of the FreeBSD port, jsmith@resonatingmedia.com created this license file, which includes the same NetBSD license and a copyright notice with his contact information: https://github.com/slicer69/doas/blob/master/LICENSE

I guess the two lines below depend on what jsmith@resonatingmedia.com wants to do.

#LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE...
#LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE...

jrm edited the test plan for this revision. (Show Details)Feb 21 2017, 2:26 PM
jrm added a reviewer: mat.
mat added inline comments.Feb 22 2017, 7:33 AM
security/doas/Makefile
12–13

Those should be uncommented.

jrm updated this revision to Diff 25524.Feb 22 2017, 2:08 PM
jrm edited the test plan for this revision. (Show Details)

Uncomment the LICENSE_FILE_BSD2CLAUSE and LICENSE_FILE_ISCL lines.

mat accepted this revision.Feb 22 2017, 2:11 PM
mat edited edge metadata.
mat added inline comments.
security/doas/Makefile
19

The extra tab should be removed.

This revision is now accepted and ready to land.Feb 22 2017, 2:11 PM
jrm marked an inline comment as done.Feb 22 2017, 2:19 PM

I suspect I am flirting with the boundaries of your patience, but could you elaborate why it makes sense to

LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE
LICENSE_FILE_ISCL=${WRKSRC}/LICENSE

when ${WRKSRC}/LICENSE only contains what it does?

security/doas/Makefile
12–13

Unocmmented, but this seems strange to me. That license file only contains the ISCL with the porter's copyright statement.

Closed by commit rP434585: security/doas: Update to version 6.0p. (authored by jrm). · Explain WhyFeb 22 2017, 2:53 PM
This revision was automatically updated to reflect the committed changes.
jrm marked an inline comment as done.

Revision Contents
Changeset List

PathSize
security/
doas/
11 lines
6 lines
files/
2 lines

Diff 25524

View Options

security/doas/Makefile

# $FreeBSD$ # $FreeBSD$
PORTNAME= doas PORTNAME= doas
PORTVERSION= 5.9p7 PORTVERSION= 6.0p0
CATEGORIES= security CATEGORIES= security
MAINTAINER= jsmith@resonatingmedia.com MAINTAINER= jsmith@resonatingmedia.com
COMMENT= Simple sudo alternative to run commands as another user COMMENT= Simple sudo alternative to run commands as another user
LICENSE= ISCL LICENSE= BSD2CLAUSE ISCL
LICENSE_COMB= multi
LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE
LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE
matUnsubmitted
Done
Inline Actions

Those should be uncommented.

mat: Those should be uncommented.
jrmAuthorUnsubmitted
Not Done
Inline Actions

Unocmmented, but this seems strange to me. That license file only contains the ISCL with the porter's copyright statement.

jrm: Unocmmented, but this seems strange to me. That license file only contains the ISCL with the…
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= slicer69 GH_ACCOUNT= slicer69
GH_PROJECT= doas GH_PROJECT= doas
GH_TAGNAME= a15e6ed
USES= gmake USES= gmake
matUnsubmitted
Not Done
Inline Actions

remove uselessly added tab.

mat: remove uselessly added tab.
matUnsubmitted
Not Done
Inline Actions

The extra tab should be removed.

mat: The extra tab should be removed.
BINMODE= 4755 BINMODE= 4755
ETCDIR= ${PREFIX}/etc
SUB_FILES= pkg-message SUB_FILES= pkg-message
PLIST_FILES= bin/doas \ PLIST_FILES= bin/doas \
man/man5/doas.conf.5.gz \ man/man5/doas.conf.5.gz \
man/man1/doas.1.gz man/man1/doas.1.gz
do-install: do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

security/doas/distinfo

TIMESTAMP = 1481094025 TIMESTAMP = 1487632696
SHA256 (slicer69-doas-5.9p7-a15e6ed_GH0.tar.gz) = dbc6da18619acb168e2951751e1431971d0ec11db1cd6bbfaed7c7f9e1f2557d SHA256 (slicer69-doas-6.0p0_GH0.tar.gz) = bb27019da7323728533de965b51a3cbf97d68eb8d53626bb2a626dcf05a24e84
SIZE (slicer69-doas-5.9p7-a15e6ed_GH0.tar.gz) = 15573 SIZE (slicer69-doas-6.0p0_GH0.tar.gz) = 16775
View Options

security/doas/files/pkg-message.in

Loading...