Index: branches/2017Q2/security/sudo/Makefile =================================================================== --- branches/2017Q2/security/sudo/Makefile (revision 442265) +++ branches/2017Q2/security/sudo/Makefile (revision 442266) @@ -1,98 +1,98 @@ # Created by: erich@rrnet.com # $FreeBSD$ PORTNAME= sudo -PORTVERSION= 1.8.19p2 +PORTVERSION= 1.8.20p1 CATEGORIES= security MASTER_SITES= SUDO MAINTAINER= garga@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= cpe libtool CPE_VENDOR= todd_miller USE_LDCONFIG= yes GNU_CONFIGURE= yes LDFLAGS+= -lgcc 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:security/sssd .include .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 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 libsudo_util.so sudoers.so system_group.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/${f} .endfor .include Index: branches/2017Q2/security/sudo/distinfo =================================================================== --- branches/2017Q2/security/sudo/distinfo (revision 442265) +++ branches/2017Q2/security/sudo/distinfo (revision 442266) @@ -1,3 +1,3 @@ -TIMESTAMP = 1484415267 -SHA256 (sudo-1.8.19p2.tar.gz) = 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 -SIZE (sudo-1.8.19p2.tar.gz) = 2861855 +TIMESTAMP = 1496171509 +SHA256 (sudo-1.8.20p1.tar.gz) = 9e980eb23a60dd11f0f452e672e705d7a386882bc230c6e8483050e03182db1d +SIZE (sudo-1.8.20p1.tar.gz) = 2930394 Index: branches/2017Q2/security/sudo/files/patch-lib__util__strtoid.c =================================================================== --- branches/2017Q2/security/sudo/files/patch-lib__util__strtoid.c (revision 442265) +++ branches/2017Q2/security/sudo/files/patch-lib__util__strtoid.c (nonexistent) @@ -1,11 +0,0 @@ ---- ./lib/util/strtoid.c.orig 2016-12-18 05:52:23.000000000 -0800 -+++ ./lib/util/strtoid.c 2016-12-19 13:48:01.268725000 -0800 -@@ -80,7 +80,7 @@ - } - if (errno == ERANGE) { - if (errstr != NULL) { -- if (llval == LLONG_MAX)) { -+ if (llval == LLONG_MAX) - *errstr = N_("value too large"); - else - *errstr = N_("value too small"); Property changes on: branches/2017Q2/security/sudo/files/patch-lib__util__strtoid.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q2/security/sudo/files/patch-install-sh =================================================================== --- branches/2017Q2/security/sudo/files/patch-install-sh (revision 442265) +++ branches/2017Q2/security/sudo/files/patch-install-sh (revision 442266) @@ -1,28 +1,28 @@ ---- install-sh.orig 2015-07-15 18:38:05 UTC +--- install-sh.orig 2017-01-14 04:30:15 UTC +++ install-sh @@ -171,12 +171,6 @@ if ${DIRMODE} ; then 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 @@ fi +@@ -226,12 +220,6 @@ fi + ## Strip and set the owner/mode. if ${STRIPIT} ; then ${STRIP} "${DEST}" || exit 1 - fi +-fi -if ${CHOWNIT} ; then - ${CHOWN} "${OWNER}" "${DEST}" || exit 1 -fi -if ${CHGROUPIT} ; then - ${CHGRP} "${GROUP}" "${DEST}" || exit 1 --fi + fi if ${CHMODIT} ; then ${CHMOD} "${MODE}" "${DEST}" || exit 1 - fi Index: branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in =================================================================== --- branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in (revision 442265) +++ branches/2017Q2/security/sudo/files/patch-plugins__sudoers__sudoers.in (revision 442266) @@ -1,17 +1,17 @@ ---- plugins/sudoers/sudoers.in.orig 2015-07-15 18:44:07 UTC +--- plugins/sudoers/sudoers.in.orig 2017-01-14 04:30:15 UTC +++ plugins/sudoers/sudoers.in @@ -32,6 +32,14 @@ ## ## Defaults specification ## +## Uncomment if needed to preserve environmental variables related to the +## FreeBSD pkg utility and fetch. +# Defaults env_keep += "PKG_CACHEDIR PKG_DBDIR FTP_PASSIVE_MODE" +## +## Additionally uncomment if needed to preserve environmental variables +## related to portupgrade +# Defaults env_keep += "PORTSDIR PORTS_INDEX PORTS_DBDIR PACKAGES PKGTOOLS_CONF" +## ## You may wish to keep some of the following environment variables ## when running commands via sudo. ## Index: branches/2017Q2/security/sudo/pkg-plist =================================================================== --- branches/2017Q2/security/sudo/pkg-plist (revision 442265) +++ branches/2017Q2/security/sudo/pkg-plist (revision 442266) @@ -1,100 +1,101 @@ bin/sudo bin/sudoedit bin/sudoreplay +etc/sudoers.dist @sample etc/sudoers.sample @sample etc/pam.d/sudo.default etc/pam.d/sudo 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 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/README.LDAP %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.OpenLDAP %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.iPlanet %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/schema.ActiveDirectory %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pam.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudo.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sudoers %%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf %%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/fr/LC_MESSAGES/sudoers.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/hu/LC_MESSAGES/sudo.mo %%NLS%%share/locale/hu/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/ko/LC_MESSAGES/sudo.mo %%NLS%%share/locale/ko/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/nn/LC_MESSAGES/sudo.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/ru/LC_MESSAGES/sudoers.mo %%NLS%%share/locale/sk/LC_MESSAGES/sudo.mo %%NLS%%share/locale/sk/LC_MESSAGES/sudoers.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 etc/sudoers.d/.keep-me @dir /var/db/sudo/lectured @dir /var/db/sudo @dir /var/run/sudo Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 442265) +++ branches/2017Q2 (revision 442266) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r440636,442153