Index: head/security/sudo/Makefile =================================================================== --- head/security/sudo/Makefile (revision 416750) +++ head/security/sudo/Makefile (revision 416751) @@ -1,99 +1,99 @@ # Created by: erich@rrnet.com # $FreeBSD$ PORTNAME= sudo PORTVERSION= 1.8.16 -PORTREVISION= 1 +PORTREVISION= 2 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: head/security/sudo/files/patch-fix_bz208198 =================================================================== --- head/security/sudo/files/patch-fix_bz208198 (nonexistent) +++ head/security/sudo/files/patch-fix_bz208198 (revision 416751) @@ -0,0 +1,35 @@ +--- plugins/sudoers/pwutil.c Thu Apr 28 15:27:53 2016 -0600 ++++ plugins/sudoers/pwutil.c Wed May 04 08:55:21 2016 -0600 +@@ -139,8 +139,8 @@ + item = node->data; + sudo_debug_printf(SUDO_DEBUG_DEBUG, + "%s: uid %u [%s] -> user %s [%s] (cache hit)", __func__, +- (unsigned int)uid, key.registry, item->d.pw->pw_name, +- item->registry); ++ (unsigned int)uid, key.registry, ++ item->d.pw ? item->d.pw->pw_name : "unknown", item->registry); + goto done; + } + /* +@@ -202,8 +202,8 @@ + if ((node = rbfind(pwcache_byname, &key)) != NULL) { + item = node->data; + sudo_debug_printf(SUDO_DEBUG_DEBUG, +- "%s: user %s [%s] -> uid %u [%s] (cache hit)", __func__, name, +- key.registry, (unsigned int)item->d.pw->pw_uid, item->registry); ++ "%s: user %s [%s] -> uid %d [%s] (cache hit)", __func__, name, ++ key.registry, item->d.pw ? (int)item->d.pw->pw_uid : -1, item->registry); + goto done; + } + /* +@@ -461,8 +461,8 @@ + item = node->data; + sudo_debug_printf(SUDO_DEBUG_DEBUG, + "%s: gid %u [%s] -> group %s [%s] (cache hit)", __func__, +- (unsigned int)gid, key.registry, item->d.gr->gr_name, +- item->registry); ++ (unsigned int)gid, key.registry, ++ item->d.gr ? item->d.gr->gr_name : "unknown", item->registry); + goto done; + } + /* Property changes on: head/security/sudo/files/patch-fix_bz208198 ___________________________________________________________________ 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