Attachment 213618 Details for Bug 245713 – Enable PAM support and imports PAM config file

[patch] Enable PAM support and imports PAM config file

add-pam-to-doas.txt (text/plain), 2.03 KB, created by Jesse Smith on 2020-04-20 23:06:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jesse Smith

Created: 2020-04-20 23:06:31 UTC

Size: 2.03 KB

patch

obsolete

>diff -ruN /usr/ports/security/doas/Makefile doas/Makefile
>--- /usr/ports/security/doas/Makefile	2019-12-30 18:10:30.000000000 +0000
>+++ doas/Makefile	2020-04-20 23:00:40.653285000 +0000
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/security/doas/Makefile 521559 2019-12-30 18:10:30Z pi $
> 
> PORTNAME=	doas
>-PORTVERSION=	6.2p4
>+PORTVERSION=	6.2p5
> CATEGORIES=	security
> 
> MAINTAINER=	jsmith@resonatingmedia.com
>@@ -16,6 +16,10 @@
> USE_GITHUB=	yes
> GH_ACCOUNT=	slicer69
> 
>+OPTIONS_DEFINE=	PAM
>+OPTIONS_DEFAULT=PAM
>+PAM_CFLAGS+=	-D USE_PAM
>+
> MAKE_ENV+=	TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"'
> 
> BINMODE=	4755
>@@ -25,6 +29,8 @@
> 		man/man5/doas.conf.5.gz \
> 		man/man1/doas.1.gz
> 
>+PAM_PLIST_FILES+= "@sample etc/pam.d/doas.default etc/pam.d/doas"
>+
> # 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.
>@@ -36,7 +42,10 @@
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/doas.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
>-	${INSTALL_MAN} ${WRKSRC}/doas.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
>+	${INSTALL_MAN} ${WRKSRC}/doas.1.final ${STAGEDIR}${MAN1PREFIX}/man/man1/doas.1
>+	${INSTALL_MAN} ${WRKSRC}/doas.conf.5.final ${STAGEDIR}${MAN5PREFIX}/man/man5/doas.conf.5
>+
>+do-install-PAM-on:
>+	${INSTALL_DATA} ${WRKSRC}/compat/pam.conf.freebsd ${STAGEDIR}${PREFIX}/etc/pam.d/doas.default
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/security/doas/distinfo doas/distinfo
>--- /usr/ports/security/doas/distinfo	2019-12-30 18:10:30.000000000 +0000
>+++ doas/distinfo	2020-04-20 23:01:07.308759000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1577500586
>-SHA256 (slicer69-doas-6.2p4_GH0.tar.gz) = 427a98e6641c9f6b76f6d9992e89f66c7ccab7f6d8bb24b19f4d25e0b98e6ab1
>-SIZE (slicer69-doas-6.2p4_GH0.tar.gz) = 26098
>+TIMESTAMP = 1587423667
>+SHA256 (slicer69-doas-6.2p5_GH0.tar.gz) = 3cab9804d3a9dfa739afc769aa84697825b53cb09419c7d421e807caf1e7b7c8
>+SIZE (slicer69-doas-6.2p5_GH0.tar.gz) = 26650

Flags:

jsmith: maintainer-approval+

Actions: View | Diff

Attachments on bug 245713: 213515 | 213526 | 213618