Index: Makefile =================================================================== --- Makefile (revision 370508) +++ Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sudo -DISTVERSION= 1.8.10p3 -PORTREVISION= 1 +DISTVERSION= 1.8.11p1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SUDO} @@ -15,6 +14,7 @@ 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 @@ -92,9 +92,10 @@ 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 Index: distinfo =================================================================== --- distinfo (revision 370508) +++ distinfo (working copy) @@ -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: files/patch-install-sh =================================================================== --- files/patch-install-sh (revision 0) +++ files/patch-install-sh (working copy) @@ -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: files/patch-install-sh ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 Index: files/patch-plugins__sudoers__Makefile.in =================================================================== --- files/patch-plugins__sudoers__Makefile.in (revision 370508) +++ files/patch-plugins__sudoers__Makefile.in (working copy) @@ -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: files/patch-plugins__sudoers__audit.c =================================================================== --- files/patch-plugins__sudoers__audit.c (revision 370508) +++ files/patch-plugins__sudoers__audit.c (working copy) @@ -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: pkg-plist =================================================================== --- pkg-plist (revision 370508) +++ pkg-plist (working copy) @@ -7,6 +7,9 @@ @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 @@ -37,6 +40,7 @@ %%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 @@ -43,6 +47,7 @@ %%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 @@ -59,6 +64,8 @@ %%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 @@ -80,7 +87,6 @@ %%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