[1]: Update to 1.8.8.

[2]: Switch logging to authpriv.

PR:		[1] ports/182618
Submitted by:	[1] Yasuhiro KIMURA <yasu@utahime.org>
		[2] des@

4 files changed, 19 insertions, 21 deletions

diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 181faaab4e9b..4ee9d45f7cee 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sudo
-DISTVERSION=	1.8.7
-PORTREVISION=	1
+DISTVERSION=	1.8.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SUDO}
 
@@ -28,7 +27,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 
 OPTIONS_DEFINE=	LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
 		AUDIT OPIE NLS
-OPTIONS_DEFAULT=	AUDIT NLS
+OPTIONS_DEFAULT=	AUDIT
 
 INSULTS_DESC=	Enable insults on failures
 DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
@@ -37,7 +36,7 @@ NOARGS_SHELL_DESC=	Run a shell if no arguments are given
 AUDIT_DESC=	Enable BSM audit support
 OPIE_DESC=	Enable one-time passwords (no PAM support)
 
-LOGFAC?=	local2
+LOGFAC?=	authpriv
 CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 
 # This is intentionally not an option.
@@ -47,7 +46,6 @@ CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 CONFIGURE_ARGS+=	--with-secure-path="${SUDO_SECURE_PATH}"
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "arm"
@@ -102,10 +100,6 @@ CONFIGURE_ARGS+=	--with-opie
 CONFIGURE_ARGS+=	--with-pam
 .endif
 
-MAN5+=		sudoers.5 sudo.conf.5
-MAN8=		sudo.8 visudo.8 sudoreplay.8 sudo_plugin.8
-MLINKS=		sudo.8 sudoedit.8
-
 post-patch:
 	@${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \
 		s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \
@@ -119,14 +113,7 @@ post-patch:
 .endif
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/pam.conf ${PREFIX}/etc/pam.d/sudo.default
-	if [ ! -f ${PREFIX}/etc/pam.d/sudo ]; then \
-		${CP} -p ${PREFIX}/etc/pam.d/sudo.default \
-		${PREFIX}/etc/pam.d/sudo ; \
-	fi
-	if [ ! -f ${PREFIX}/etc/sudoers ]; then \
-		${CP} -p ${PREFIX}/etc/sudoers.sample ${PREFIX}/etc/sudoers; \
-	fi
-	${TOUCH} ${PREFIX}/etc/sudoers.d/.keep-me
+	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
+	${TOUCH} ${STAGEDIR}${PREFIX}/etc/sudoers.d/.keep-me
 
 .include <bsd.port.mk>
diff --git a/security/sudo/distinfo b/security/sudo/distinfo
index c6ec0fe979ee..0661a91bb1e5 100644
--- a/security/sudo/distinfo
+++ b/security/sudo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sudo-1.8.7.tar.gz) = 39626cf3d48c4fd5a9139a2627d42bfefac7ce47f470bdba3aeb4e3d7c49566a
-SIZE (sudo-1.8.7.tar.gz) = 2027065
+SHA256 (sudo-1.8.8.tar.gz) = 9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9
+SIZE (sudo-1.8.8.tar.gz) = 2117145
diff --git a/security/sudo/pkg-descr b/security/sudo/pkg-descr
index 8aef9f9ae764..d673adaf7c1a 100644
--- a/security/sudo/pkg-descr
+++ b/security/sudo/pkg-descr
@@ -5,4 +5,4 @@ privileges to users and log root activity.  The basic philosophy is to
 give as few privileges as possible but still allow people to get their
 work done.
 
-WWW: http://www.courtesan.com/sudo/
+WWW: http://www.sudo.ws/
diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist
index c1976ce05da4..57027f90c154 100644
--- a/security/sudo/pkg-plist
+++ b/security/sudo/pkg-plist
@@ -12,6 +12,13 @@ libexec/sudo/group_file.so
 libexec/sudo/sudo_noexec.so
 libexec/sudo/sudoers.so
 libexec/sudo/system_group.so
+man/man5/sudo.conf.5.gz
+man/man5/sudoers.5.gz
+man/man8/sudo.8.gz
+man/man8/sudo_plugin.8.gz
+man/man8/sudoedit.8.gz
+man/man8/sudoreplay.8.gz
+man/man8/visudo.8.gz
 sbin/visudo
 %%LDAP%%bin/sudoers2ldif
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
@@ -30,6 +37,7 @@ sbin/visudo
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory
+%%NLS%%share/locale/cs/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/da/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/de/LC_MESSAGES/sudo.mo
@@ -41,6 +49,7 @@ sbin/visudo
 %%NLS%%share/locale/eu/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/sudoers.mo
@@ -53,6 +62,8 @@ sbin/visudo
 %%NLS%%share/locale/nl/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/sudoers.mo