diff options
| -rw-r--r-- | UPDATING | 8 | ||||
| -rw-r--r-- | security/sudo/Makefile | 3 | ||||
| -rw-r--r-- | security/sudo/files/patch-plugins__sudoers__Makefile.in | 11 | ||||
| -rw-r--r-- | security/sudo/files/patch-plugins__sudoers__sudoers.in | 12 | ||||
| -rw-r--r-- | security/sudo/pkg-plist | 2 |
5 files changed, 11 insertions, 25 deletions
@@ -5,14 +5,6 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. -20110411: - AFFECTS: users of security/sudo - AUTHOR: wxs@FreeBSD.org - - The security/sudo port no longer installs an empty sudoers.d directory. - If you have an old sudoers file laying around you will have to - either comment out, or remove the includedir line for that directory. - 20110409: AFFECTS: users of japanese/asterisk-sounds AUTHOR: tota@FreeBSD.org diff --git a/security/sudo/Makefile b/security/sudo/Makefile index 841a206a8e04..1633032cafc6 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -7,7 +7,7 @@ PORTNAME= sudo PORTVERSION= 1.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= http://www.sudo.ws/sudo/dist/ \ http://www.signal42.com/mirrors/sudo_ftp/ \ @@ -128,5 +128,6 @@ post-install: if [ ! -f ${PREFIX}/etc/sudoers ]; then \ ${CP} -p ${PREFIX}/etc/sudoers.sample ${PREFIX}/etc/sudoers; \ fi + ${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me .include <bsd.port.post.mk> diff --git a/security/sudo/files/patch-plugins__sudoers__Makefile.in b/security/sudo/files/patch-plugins__sudoers__Makefile.in index e7232c920b62..56477360a222 100644 --- a/security/sudo/files/patch-plugins__sudoers__Makefile.in +++ b/security/sudo/files/patch-plugins__sudoers__Makefile.in @@ -1,6 +1,6 @@ --- ./plugins/sudoers/Makefile.in.orig 2011-04-06 10:59:31.000000000 -0400 -+++ ./plugins/sudoers/Makefile.in 2011-04-09 21:26:23.120266452 -0400 -@@ -350,17 +350,15 @@ ++++ ./plugins/sudoers/Makefile.in 2011-04-11 12:47:45.435271822 -0400 +@@ -350,6 +350,7 @@ install-includes: install-doc: @@ -8,11 +8,10 @@ @LDAP@$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0555 $(srcdir)/sudoers2ldif $(DESTDIR)$(docdir) install-plugin: sudoers.la install-dirs - $(INSTALL) -b~ -O $(install_uid) -G $(install_gid) -M 0755 .libs/sudoers$(soext) $(DESTDIR)$(plugindir) - +@@ -358,9 +359,8 @@ install-sudoers: install-dirs -- $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ -- $(DESTDIR)$(sudoersdir)/sudoers.d + $(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -M 0750 \ + $(DESTDIR)$(sudoersdir)/sudoers.d - test -r $(DESTDIR)$(sudoersdir)/sudoers || \ - $(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -M $(sudoers_mode) \ - sudoers $(DESTDIR)$(sudoersdir)/sudoers diff --git a/security/sudo/files/patch-plugins__sudoers__sudoers.in b/security/sudo/files/patch-plugins__sudoers__sudoers.in index 35199f678dda..d4f6230e7560 100644 --- a/security/sudo/files/patch-plugins__sudoers__sudoers.in +++ b/security/sudo/files/patch-plugins__sudoers__sudoers.in @@ -1,5 +1,5 @@ ---- plugins/sudoers/sudoers.in.orig 2010-08-18 07:45:38.000000000 -0400 -+++ plugins/sudoers/sudoers.in 2011-04-11 08:41:26.550267535 -0400 +--- ./plugins/sudoers/sudoers.in.orig 2010-08-18 07:45:38.000000000 -0400 ++++ ./plugins/sudoers/sudoers.in 2011-04-11 12:47:45.440272893 -0400 @@ -31,6 +31,14 @@ ## ## Defaults specification @@ -15,11 +15,3 @@ ## You may wish to keep some of the following environment variables ## when running commands via sudo. ## -@@ -84,7 +92,3 @@ - ## of the user they are running the command as (root by default). - # Defaults targetpw # Ask for the password of the target user - # ALL ALL=(ALL) ALL # WARNING: only use this together with 'Defaults targetpw' -- --## Read drop-in files from @sysconfdir@/sudoers.d --## (the '#' here does not indicate a comment) --#includedir @sysconfdir@/sudoers.d diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist index fa8ef9a7d0a4..0c7fe4bbebcd 100644 --- a/security/sudo/pkg-plist +++ b/security/sudo/pkg-plist @@ -28,3 +28,5 @@ sbin/visudo %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/sudoers2ldif %%PORTDOCS%%@dirrm %%DOCSDIR%% +etc/sudoers.d/.keep-me +@dirrmtry etc/sudoers.d |