Index: branches/2014Q4/security/sudo/Makefile
===================================================================
--- branches/2014Q4/security/sudo/Makefile	(revision 370967)
+++ branches/2014Q4/security/sudo/Makefile	(revision 370968)
@@ -1,101 +1,102 @@
 # Created by: erich@rrnet.com
 # $FreeBSD$
 
 PORTNAME=	sudo
-DISTVERSION=	1.8.10p3
-PORTREVISION=	1
+DISTVERSION=	1.8.11p1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SUDO}
 
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Allow others to run commands as root
 
 LICENSE=	sudo
 LICENSE_NAME=	Sudo license
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USES=		libtool
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lgcc
 LDFLAGS+=	-lssp_nonshared
 
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-ignore-dot \
 		--with-tty-tickets \
 		--with-env-editor \
 		--with-logincap \
 		--with-long-otp-prompt
 
 OPTIONS_DEFINE=	LDAP INSULTS DISABLE_ROOT_SUDO DISABLE_AUTH NOARGS_SHELL \
 		AUDIT OPIE NLS SSSD DOCS
 OPTIONS_DEFAULT=	AUDIT
 OPTIONS_SUB=	yes
 
 INSULTS_DESC=	Enable insults on failures
 DISABLE_ROOT_SUDO_DESC=	Do not allow root to run sudo
 DISABLE_AUTH_DESC=	Do not require authentication by default
 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)
 SSSD_DESC=	Enable SSSD backend support.
 
 LOGFAC?=	authpriv
 CONFIGURE_ARGS+=	--with-logfac=${LOGFAC}
 
 # This is intentionally not an option.
 # SUDO_SECURE_PATH is a PATH string that will override the user's PATH.
 # ex: make SUDO_SECURE_PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 .if defined(SUDO_SECURE_PATH)
 CONFIGURE_ARGS+=	--with-secure-path="${SUDO_SECURE_PATH}"
 .endif
 
 NLS_USES=	gettext
 NLS_CONFIGURE_ENABLE=	nls
 NLS_LDFLAGS=	-L${LOCALBASE}/lib -lintl
 NLS_CFLAGS=	-I${LOCALBASE}/include
 
 INSULTS_CONFIGURE_ON=	--with-insults
 INSULTS_CONFIGURE_ON+=	--with-all-insults
 
 LDAP_USE=	OPENLDAP=yes
 LDAP_CONFIGURE_ON=	--with-ldap=${PREFIX}
 SUDO_LDAP_CONF?=	ldap.conf
 LDAP_CONFIGURE_ON+=	--with-ldap-conf-file=${PREFIX}/etc/${SUDO_LDAP_CONF}
 
 DISABLE_ROOT_SUDO_CONFIGURE_ON=	--disable-root-sudo
 DISABLE_AUTH_CONFIGURE_ON=	--disable-authentication
 NOARGS_SHELL_CONFIGURE_ENABLE=	noargs-shell
 AUDIT_CONFIGURE_WITH=	bsm-audit
 OPIE_CONFIGURE_ON=	--with-opie
 OPIE_CONFIGURE_OFF=	--with-pam
 SSSD_CONFIGURE_ON=	--with-sssd
 SSSD_RUN_DEPENDS=	sssd:${PORTSDIR}/security/sssd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "arm"
 CONFIGURE_ARGS+=	--disable-pie
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -E '/install-(binaries|noexec):/,/^$$/ \
 		s/\$$\(INSTALL\)/& ${STRIP}/;s/-b\~/-b ~/' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's,$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(docdir),$$(srcdir)/sudoers2ldif $$(DESTDIR)$$(bindir),' ${WRKSRC}/plugins/sudoers/Makefile.in
 .if empty(PORT_OPTIONS:MDOCS)
 	@${REINPLACE_CMD} -e 's/mkinstalldirs $$(DESTDIR)$$(docdir)/mkinstalldirs/' \
 		${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e '/for f in $$(OTHER_DOCS); do/d;/@LDAP@for f in $$(OTHER_DOCS_LDAP); do/d' ${WRKSRC}/doc/Makefile.in
 	@${REINPLACE_CMD} -e 's/$$(DESTDIR)$$(sudoersdir) $$(DESTDIR)$$(docdir)/$$(DESTDIR)$$(sudoersdir)/' ${WRKSRC}/plugins/sudoers/Makefile.in
 .endif
 
 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
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo
-.for f in group_file.so sudoers.so system_group.so
+.for f in group_file.so libsudo_util.so sudoers.so system_group.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f}
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2014Q4/security/sudo/distinfo
===================================================================
--- branches/2014Q4/security/sudo/distinfo	(revision 370967)
+++ branches/2014Q4/security/sudo/distinfo	(revision 370968)
@@ -1,2 +1,2 @@
-SHA256 (sudo-1.8.10p3.tar.gz) = 6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400
-SIZE (sudo-1.8.10p3.tar.gz) = 2262370
+SHA256 (sudo-1.8.11p1.tar.gz) = 44c275772595a119185336164bb76b6e08f23d38aa0fe0d6bab48812e75d6a43
+SIZE (sudo-1.8.11p1.tar.gz) = 2402012
Index: branches/2014Q4/security/sudo/files/patch-install-sh
===================================================================
--- branches/2014Q4/security/sudo/files/patch-install-sh	(nonexistent)
+++ branches/2014Q4/security/sudo/files/patch-install-sh	(revision 370968)
@@ -0,0 +1,28 @@
+--- install-sh.orig	2014-09-24 01:40:15.000000000 +0900
++++ install-sh	2014-10-10 07:26:54.000000000 +0900
+@@ -171,12 +171,6 @@
+ 	if [ ! -d "${DEST}" ] ; then
+ 	    ${MKDIR} "${DEST}" || exit 1
+ 	fi
+-	if ${CHOWNIT} ; then
+-	    ${CHOWN} "${OWNER}" "${DEST}" || exit 1
+-	fi
+-	if ${CHGROUPIT} ; then
+-	    ${CHGRP} "${GROUP}" "${DEST}" || exit 1
+-	fi
+ 	if ${CHMODIT} ; then
+ 	    ${CHMOD} "${MODE}"  "${DEST}" || exit 1
+ 	fi
+@@ -227,12 +221,6 @@
+ if ${STRIPIT} ; then
+     ${STRIP} "${DEST}" || exit 1
+ fi
+-if ${CHOWNIT} ; then
+-    ${CHOWN} "${OWNER}" "${DEST}" || exit 1
+-fi
+-if ${CHGROUPIT} ; then
+-    ${CHGRP} "${GROUP}" "${DEST}" || exit 1
+-fi
+ if ${CHMODIT} ; then
+     ${CHMOD} "${MODE}" "${DEST}" || exit 1
+ fi

Property changes on: branches/2014Q4/security/sudo/files/patch-install-sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in
===================================================================
--- branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in	(revision 370967)
+++ branches/2014Q4/security/sudo/files/patch-plugins__sudoers__Makefile.in	(revision 370968)
@@ -1,14 +1,12 @@
---- ./plugins/sudoers/Makefile.in.orig	2011-04-11 08:28:33.000000000 -0400
-+++ ./plugins/sudoers/Makefile.in	2011-04-17 09:38:29.349385961 -0400
-@@ -358,9 +358,8 @@
+--- plugins/sudoers/Makefile.in.orig	2014-10-08 05:26:20.000000000 +0900
++++ plugins/sudoers/Makefile.in	2014-10-10 07:23:21.000000000 +0900
+@@ -323,8 +323,7 @@
+ 
  install-sudoers: install-dirs
- 	$(INSTALL) -d -O $(sudoers_uid) -G $(sudoers_gid) -m 0750 \
- 	    $(DESTDIR)$(sudoersdir)/sudoers.d
+ 	$(INSTALL) -d $(INSTALL_OWNER) -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
-+	$(INSTALL) -O $(sudoers_uid) -G $(sudoers_gid) -m $(sudoers_mode) \
-+		sudoers $(DESTDIR)$(sudoersdir)/sudoers.sample
+-	    $(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
++	$(INSTALL) $(INSTALL_OWNER) -m $(sudoers_mode) sudoers $(DESTDIR)$(sudoersdir)/sudoers
  
  uninstall:
- 	-rm -f $(DESTDIR)$(plugindir)/sudoers$(soext)
+ 	-$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(plugindir)/sudoers.la
Index: branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c
===================================================================
--- branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c	(revision 370967)
+++ branches/2014Q4/security/sudo/files/patch-plugins__sudoers__audit.c	(revision 370968)
@@ -1,10 +1,10 @@
---- ./plugins/sudoers/audit.c.orig	2013-06-04 11:48:28.000000000 +0200
-+++ ./plugins/sudoers/audit.c	2013-07-05 13:10:01.000000000 +0200
-@@ -39,6 +39,7 @@
+--- plugins/sudoers/audit.c.orig	2014-09-24 01:40:15.000000000 +0900
++++ plugins/sudoers/audit.c	2014-10-10 07:24:43.000000000 +0900
+@@ -42,6 +42,7 @@
  
  #ifdef HAVE_BSM_AUDIT
  # include "bsm_audit.h"
-+# include "gettext.h"
++# include "sudo_gettext.h"
  #endif
  #ifdef HAVE_LINUX_AUDIT
  # include "linux_audit.h"
Index: branches/2014Q4/security/sudo/pkg-plist
===================================================================
--- branches/2014Q4/security/sudo/pkg-plist	(revision 370967)
+++ branches/2014Q4/security/sudo/pkg-plist	(revision 370968)
@@ -1,86 +1,92 @@
 bin/sudo
 bin/sudoedit
 bin/sudoreplay
 @sample etc/sudoers.sample
 @unexec if cmp -s %D/etc/pam.d/sudo.default %D/etc/pam.d/sudo; then rm -f %D/etc/pam.d/sudo ; fi
 etc/pam.d/sudo.default
 @exec if [ ! -f %D/etc/pam.d/sudo ] ; then cp -p %D/%F %B/sudo; fi
 include/sudo_plugin.h
 libexec/sudo/group_file.so
+libexec/sudo/libsudo_util.so
+libexec/sudo/libsudo_util.so.0
+libexec/sudo/libsudo_util.so.0.0.0
 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
 %%LDAP%%man/man5/sudoers.ldap.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
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/HISTORY
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TROUBLESHOOTING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%%%DOCSDIR%%/sample.pam
 %%PORTDOCS%%%%DOCSDIR%%/sample.sudo.conf
 %%PORTDOCS%%%%DOCSDIR%%/sample.sudoers
 %%PORTDOCS%%%%DOCSDIR%%/sample.syslog.conf
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.LDAP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory
 %%NLS%%share/locale/ca/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/sudoers.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
 %%NLS%%share/locale/de/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/el/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/es/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/sudo.mo
 %%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
 %%NLS%%share/locale/it/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/it/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/sudoers.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/sudo.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/sudo.mo
 %%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
 %%NLS%%share/locale/sr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/sudo.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/sudoers.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/sudo.mo
 %%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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 etc/sudoers.d/.keep-me
 @dir /var/db/sudo
 @dir /var/run/sudo
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 370967)
+++ branches/2014Q4	(revision 370968)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r370967