From 283c6801d9796cf47a845b87b1d91ebe36a0c89d Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 15 Jun 2017 11:01:34 +0000 Subject: Starting in 1.8.20, the sample sudoers file has been installed twice, once as sudoers.sample and once as sudoers.dist. Remove one of them. PR: 219708 Submitted by: mat Approved by: maintainer timeout Sponsored by: Absolight --- security/sudo/Makefile | 3 ++- security/sudo/pkg-plist | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 546cd87..71f966e 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -3,6 +3,7 @@ PORTNAME= sudo PORTVERSION= 1.8.20p2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SUDO @@ -88,7 +89,7 @@ post-patch: post-install: ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default ${TOUCH} ${STAGEDIR}${PREFIX}/etc/sudoers.d/.keep-me - ${MV} ${STAGEDIR}${PREFIX}/etc/sudoers ${STAGEDIR}${PREFIX}/etc/sudoers.sample + ${RM} ${STAGEDIR}${PREFIX}/etc/sudoers ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo .for f in group_file.so libsudo_util.so sudoers.so system_group.so diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist index 32288e7..e0441cf 100644 --- a/security/sudo/pkg-plist +++ b/security/sudo/pkg-plist @@ -1,8 +1,7 @@ bin/sudo bin/sudoedit bin/sudoreplay -etc/sudoers.dist -@sample etc/sudoers.sample +@sample etc/sudoers.dist etc/sudoers @sample etc/pam.d/sudo.default etc/pam.d/sudo include/sudo_plugin.h libexec/sudo/group_file.so -- cgit v1.1