diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2004-07-20 08:30:14 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2004-07-20 08:30:14 +0000 |
| commit | 12015b11c6647ab33219d8beedfb6947a8fb5447 (patch) | |
| tree | 34dc314dc141d50a4dfd7c5fe63932484a47f423 /security/sudo | |
| parent | lding for slate-5.0.1 (diff) | |
Undo yesterdays change after sysutils/porttools suddenly failed.
Kris (bento (noh! pointyhat)) reported it
PR: ports/58387
Notes
Notes:
svn path=/head/; revision=114281
Diffstat (limited to 'security/sudo')
| -rw-r--r-- | security/sudo/Makefile | 5 | ||||
| -rw-r--r-- | security/sudo/pkg-install | 2 | ||||
| -rw-r--r-- | security/sudo/pkg-plist | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/security/sudo/Makefile b/security/sudo/Makefile index dbf7738ed6da..704266ac447b 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -7,7 +7,7 @@ PORTNAME= sudo PORTVERSION= 1.6.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.sudo.ws/sudo/dist/ \ http://probsd.org/sudoftp/ \ @@ -55,7 +55,6 @@ post-patch: @${REINPLACE_CMD} -e 's|^|#|g' ${WRKSRC}/sample.sudoers post-install: - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EXAMPLESDIR}/sudoers + ${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${PREFIX}/etc/sudoers.sample .include <bsd.port.post.mk> diff --git a/security/sudo/pkg-install b/security/sudo/pkg-install index 95bd56127f0d..bd38791d206e 100644 --- a/security/sudo/pkg-install +++ b/security/sudo/pkg-install @@ -5,6 +5,6 @@ fi if [ -e ${PKG_PREFIX}/etc/sudoers ]; then echo "Will not overwrite existing ${PKG_PREFIX}/etc/sudoers file." else - cp -p ${EXAMPLESDIR}/sudoers ${PKG_PREFIX}/etc/sudoers + cp -p ${PKG_PREFIX}/etc/sudoers.sample ${PKG_PREFIX}/etc/sudoers chmod 440 ${PKG_PREFIX}/etc/sudoers fi diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist index ab2792bdc9a5..e4ca595b134b 100644 --- a/security/sudo/pkg-plist +++ b/security/sudo/pkg-plist @@ -1,5 +1,4 @@ -@unexec if cmp -s %D/etc/sudoers %%EXAMPLESDIR%%/sudoers; then rm -f %D/etc/sudoers; fi +@unexec if cmp -s %D/etc/sudoers %D/etc/sudoers.sample; then rm -f %D/etc/sudoers; fi bin/sudo +etc/sudoers.sample sbin/visudo -%%EXAMPLESDIR%%/sudoers -@dirrm %%EXAMPLESDIR%% |