summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgarga <garga@FreeBSD.org>2017-06-27 13:49:53 +0000
committergarga <garga@FreeBSD.org>2017-06-27 13:49:53 +0000
commit6c024d9d08b713929900655bcc603e3cfb73de03 (patch)
tree37af9674d8761e80efe430f0139db73cbd94c6df
parente354b10f0e9fe7108b8062f76955be850b974b22 (diff)
downloadFreeBSD-ports-6c024d9d08b713929900655bcc603e3cfb73de03.zip
FreeBSD-ports-6c024d9d08b713929900655bcc603e3cfb73de03.tar.gz
Fix the way ${PREFIX}/etc/sudoers.d is handled removing the workaround added in
r260609 and using @dir PR: 220234 Submitted by: Jose Luis Duran <jlduran@gmail.com> Sponsored by: Rubicon Communications (Netgate)
-rw-r--r--security/sudo/Makefile3
-rw-r--r--security/sudo/pkg-plist2
2 files changed, 2 insertions, 3 deletions
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 71f966e..75341b1 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sudo
PORTVERSION= 1.8.20p2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= SUDO
@@ -88,7 +88,6 @@ post-patch:
post-install:
${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
- ${TOUCH} ${STAGEDIR}${PREFIX}/etc/sudoers.d/.keep-me
${RM} ${STAGEDIR}${PREFIX}/etc/sudoers
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay
${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo
diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist
index e0441cf..4487d39 100644
--- a/security/sudo/pkg-plist
+++ b/security/sudo/pkg-plist
@@ -94,7 +94,7 @@ sbin/visudo
%%NLS%%share/locale/vi/LC_MESSAGES/sudoers.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/sudo.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/sudoers.mo
-etc/sudoers.d/.keep-me
+@dir etc/sudoers.d
@dir /var/db/sudo/lectured
@dir /var/db/sudo
@dir /var/run/sudo
OpenPOWER on IntegriCloud