Attachment #206269 for bug #239629

View | Details | Raw Unified | Return to bug 239629
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	doas
PORTVERSION=	6.1
CATEGORIES=	security

MAINTAINER=	jsmith@resonatingmedia.com

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

USES=	gmake
USE_GITHUB=	yes
GH_ACCOUNT=	slicer69
GH_PROJECT=	doas

MAKE_ENV+=	TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'

BINMODE=	4755


		man/man5/doas.conf.5.gz \
		man/man1/doas.1.gz

# These are upstream's default paths that are set for the GLOBAL_PATH variable
# in doas.h since the 6.1 release. Those paths are then used for target user's
# PATH variable instead of those of the original user.
#
# See also:
#  * https://github.com/slicer69/doas/blob/6.1/Makefile#L7
#  * https://github.com/slicer69/doas/releases/tag/6.1
_GLOBAL_PATH=	${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin:

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

Lines 1-3 Link Here

(-)security/doas/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1552317435	1	TIMESTAMP = 1564865652
2	SHA256 (slicer69-doas-6.0p3_GH0.tar.gz) = abf7911df661fd82acc3ff71724b73cf0f2102f8a5379153a1c031b285ed8c97	2	SHA256 (slicer69-doas-6.1_GH0.tar.gz) = f6ae5243a711774cd46d5087c544e7feead7e138c6053c030c47489a722033f2
3	SIZE (slicer69-doas-6.0p3_GH0.tar.gz) = 18470	3	SIZE (slicer69-doas-6.1_GH0.tar.gz) = 19965





%%PREFIX%%/etc/doas.conf

must be created. Refer to doas.conf(5) for further details.

Note: In order to be able to run most desktop (GUI) applications, the user
needs to have the keepenv keyword specified. If keepenv is not specified then
key elements, like the user's $HOME variable, will be reset and cause the GUI
application to crash.

Users who only need to run command line applications can usually get away
without keepenv.

When in doubt, try to avoid using keepenv as it is less secure to have
environment variables passed to privileged users.
EOD
}
{ type: upgrade
  maximum_version: "6.1"
  message: <<EOD
With the 6.1 release the transfer of most environment variables (e.g. USER,
HOME and PATH) from the original user to the target user has changed.

Please refer to doas.conf(5) for further details.
EOD
}
]

Return to bug 239629

Lines 1-7 Link Here

(-)security/doas/Makefile (-3 / +12 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= doas	3	PORTNAME= doas
4	PORTVERSION= 6.0p3	4	PORTVERSION= 6.1
5	CATEGORIES= security	5	CATEGORIES= security
6		6
7	MAINTAINER= jsmith@resonatingmedia.com	7	MAINTAINER= jsmith@resonatingmedia.com
Lines 12-22 Link Here
12	LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE	12	LICENSE_FILE_BSD2CLAUSE= ${WRKSRC}/LICENSE
13	LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE	13	LICENSE_FILE_ISCL= ${WRKSRC}/LICENSE
14		14
		15	USES= gmake
15	USE_GITHUB= yes	16	USE_GITHUB= yes
16	GH_ACCOUNT= slicer69	17	GH_ACCOUNT= slicer69
17	GH_PROJECT= doas
18		18
19	USES= gmake	19	MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
20		20
21	BINMODE= 4755	21	BINMODE= 4755
22		22
Lines 25-30 Link Here
25	man/man5/doas.conf.5.gz \	25	man/man5/doas.conf.5.gz \
26	man/man1/doas.1.gz	26	man/man1/doas.1.gz
27		27
		28	# These are upstream's default paths that are set for the GLOBAL_PATH variable
		29	# in doas.h since the 6.1 release. Those paths are then used for target user's
		30	# PATH variable instead of those of the original user.
		31	#
		32	# See also:
		33	# * https://github.com/slicer69/doas/blob/6.1/Makefile#L7
		34	# * https://github.com/slicer69/doas/releases/tag/6.1
		35	_GLOBAL_PATH= ${LOCALBASE}/sbin:${LOCALBASE}/bin:/usr/sbin:/usr/bin:/sbin:/bin:
		36
28	do-install:	37	do-install:
29	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	38	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
30	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	39	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1

Lines 5-13 Link Here

(-)security/doas/files/pkg-message.in (-2 / +20 lines)
5		5
6	%%PREFIX%%/etc/doas.conf	6	%%PREFIX%%/etc/doas.conf
7		7
8	must be created.	8	must be created. Refer to doas.conf(5) for further details.
9		9
10	Refer to doas.conf(5).	10	Note: In order to be able to run most desktop (GUI) applications, the user
		11	needs to have the keepenv keyword specified. If keepenv is not specified then
		12	key elements, like the user's $HOME variable, will be reset and cause the GUI
		13	application to crash.
		14
		15	Users who only need to run command line applications can usually get away
		16	without keepenv.
		17
		18	When in doubt, try to avoid using keepenv as it is less secure to have
		19	environment variables passed to privileged users.
11	EOD	20	EOD
12	}	21	}
		22	{ type: upgrade
		23	maximum_version: "6.1"
		24	message: <<EOD
		25	With the 6.1 release the transfer of most environment variables (e.g. USER,
		26	HOME and PATH) from the original user to the target user has changed.
		27
		28	Please refer to doas.conf(5) for further details.
		29	EOD
		30	}
13	]	31	]