svn commit: r443616 - head/security/sudo

[Mathieu Arnold]

Author: mat
Date: Thu Jun 15 11:01:34 2017
New Revision: 443616
URL: https://svnweb.freebsd.org/changeset/ports/443616

Log:
  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

Modified:
  head/security/sudo/Makefile   (contents, props changed)
  head/security/sudo/pkg-plist   (contents, props changed)

Modified: head/security/sudo/Makefile
==============================================================================
--- head/security/sudo/Makefile	Thu Jun 15 09:01:31 2017	(r443615)
+++ head/security/sudo/Makefile	Thu Jun 15 11:01:34 2017	(r443616)
@@ -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

Modified: head/security/sudo/pkg-plist
==============================================================================
--- head/security/sudo/pkg-plist	Thu Jun 15 09:01:31 2017	(r443615)
+++ head/security/sudo/pkg-plist	Thu Jun 15 11:01:34 2017	(r443616)
@@ -1,8 +1,7 @@
 bin/sudo
 bin/sudoedit
 bin/sudoreplay
-etc/sudoers.dist
- at sample etc/sudoers.sample
+ at 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