Attachment #213526 for bug #245713

Lines 2-7 Link Here

(-)b/security/doas/Makefile (+10 lines)
2		2
3	PORTNAME= doas	3	PORTNAME= doas
4	PORTVERSION= 6.2p4	4	PORTVERSION= 6.2p4
		5	PORTREVISION= 1
5	CATEGORIES= security	6	CATEGORIES= security
6		7
7	MAINTAINER= jsmith@resonatingmedia.com	8	MAINTAINER= jsmith@resonatingmedia.com
Lines 16-21 USES= gmake Link Here
16	USE_GITHUB= yes	17	USE_GITHUB= yes
17	GH_ACCOUNT= slicer69	18	GH_ACCOUNT= slicer69
18		19
		20	OPTIONS_DEFINE= PAM
		21	OPTIONS_DEFAULT=PAM
		22	PAM_CFLAGS+= -D USE_PAM
		23
19	MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'	24	MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
20		25
21	BINMODE= 4755	26	BINMODE= 4755
Lines 25-30 PLIST_FILES= bin/doas \ Link Here
25	man/man5/doas.conf.5.gz \	30	man/man5/doas.conf.5.gz \
26	man/man1/doas.1.gz	31	man/man1/doas.1.gz
27		32
		33	PAM_PLIST_FILES+= "@sample etc/pam.d/doas.default etc/pam.d/doas"
		34
28	# These are upstream's default paths that are set for the GLOBAL_PATH variable	35	# 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	36	# 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.	37	# PATH variable instead of those of the original user.
Lines 39-42 do-install: Link Here
39	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1	46	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
40	${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5	47	${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
41		48
		49	do-install-PAM-on:
		50	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/doas.default
		51
42	.include <bsd.port.mk>	52	.include <bsd.port.mk>




#
# $FreeBSD$
#
# PAM configuration for the "doas" service
#

# auth
auth		include		system

# account
account		include		system

# session
# XXX: pam_lastlog (used in system) causes users to appear as though
# they are no longer logged in in system logs.
session		required	pam_permit.so

# password
password	include		system

Return to bug 245713

Added Link Here

(-)b/security/doas/files/pam.conf (+19 lines)
1	#
2	# $FreeBSD$
3	#
4	# PAM configuration for the "doas" service
5	#
6
7	# auth
8	auth include system
9
10	# account
11	account include system
12
13	# session
14	# XXX: pam_lastlog (used in system) causes users to appear as though
15	# they are no longer logged in in system logs.
16	session required pam_permit.so
17
18	# password
19	password include system