From nobody Mon Nov 6 18:13:41 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SPKGs590Hz50WRL; Mon, 6 Nov 2023 18:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SPKGs4jkFz4X22; Mon, 6 Nov 2023 18:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699294421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrxhNL1lCyAn58Imo+chfUbXEnxx8JeuPv6Iq72RfPo=; b=DtjOTDEpE+uKAZ8d6zcrpDcSVrSXCs+fW06AdovhUnz66HScdo/eHGfkv/lbtnQ0FEn3kH zU5cRZYpHxbs01CNjokOrFa1BhUVrxsy5gJpjssO/BClUP5DXbyZzdcIDjohEnyACgyjo3 mutou3yiuuW6BKXf9IRz33oyKJbH6yai+jxn/jnLWQZJ8kRxk+dd6hQxOAyGvaRFuiu4Jg ymX6g+LCXLt+MLGcvAyXIp7Hjbnww7xyLKQ7agUw6LGm6iHB7H9xswzP8YQSF7N0hrcUd/ 9uemYqRFmbQfR/7+A4wyC1hh9iBjhXP2eVx68WQOKm1n6yx9wsafNG5pP3DoKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699294421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wrxhNL1lCyAn58Imo+chfUbXEnxx8JeuPv6Iq72RfPo=; b=q0xS0ZrxKxl2gKhgGq3Ay8WD89RHOm11QFuuOBiVe/yfJUHJ6vvYrOgc93BgsYncctrDJp gVZmZvJImTOtikndTs7s7XUip3rXvXHcqEZtL6kJNd3JqQh1zsAErQV7c2cqK67tcQBK7m 40glFmRQXA0O8jeizPZmwnYMKZmz64w1XGOSJhjEhbyMrW1+SHKtjs0mWRMgHaldVYFpWN zdO4iVGKhXJyx7McpKC2/SvcGFe+2LTODWwESryoGbfHq0huNtcNB0W3yfHUGPIWhsh7Ax CSbgW3By7ckdOhFklccagXzl/SaN/Q49q64GgaGvnEInSgUVnnL7n0GFK1iGCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699294421; a=rsa-sha256; cv=none; b=ab+GapQcfNkNZ2/0ONmp1XiHfShuk+b44sS7DC+eUDgQQ+pKpP8kp6xIdt9gXP8hpO7p6g BVLl4jpH5N5R30JXJe2ZhYRUKVXm83J0tuiLG6+qJIoOsyrH9gGqDDdYexxdIpDD3fBkbm mnK5ZkfFHNdzoFlBRkvQmTStw00/jh2/yC+i0lkIjnhHlknCNrEs3TiEpX6aN7kxem2mXA YJNWmdPSBwZyA9PMLy+6F5WtsM0Uc5sk6pMvLEUTIZGgyN8uQlgw1Qvr4jkIO3RfWTMPHR hKD8uEaDd4VYWzNdl1tddSjHSfBcj/uQy6DX/3g5cgVL5IxY/Eso9+K7q2qtXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SPKGs3nhnz3Ky; Mon, 6 Nov 2023 18:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A6IDfN2009383; Mon, 6 Nov 2023 18:13:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A6IDfY6009380; Mon, 6 Nov 2023 18:13:41 GMT (envelope-from git) Date: Mon, 6 Nov 2023 18:13:41 GMT Message-Id: <202311061813.3A6IDfY6009380@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: dd773c154038 - main - security/sudo: Update to 1.9.15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd773c1540388b14692001643e323a556ed2d445 Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd773c1540388b14692001643e323a556ed2d445 commit dd773c1540388b14692001643e323a556ed2d445 Author: Renato Botelho AuthorDate: 2023-10-31 13:45:14 +0000 Commit: Renato Botelho CommitDate: 2023-11-06 18:13:29 +0000 security/sudo: Update to 1.9.15 While here: - Prevent combination of SSSD and GSSAPI_HEIMDAL because sssd port requires MIT kerberos and it will conflict with heimdal - Removed SSSD_DEVEL option because sssd-devel port requires sudo and it creates a circular dependency - Fix OPIE on FreeBSD versions after it was removed from base Sponsored by: Rubicon Communications, LLC ("Netgate") --- security/sudo/Makefile | 26 ++++++++++++++------------ security/sudo/distinfo | 6 +++--- security/sudo/pkg-plist | 1 + 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/security/sudo/Makefile b/security/sudo/Makefile index c3267fce9a29..c8b0c63da991 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,6 +1,5 @@ PORTNAME= sudo -PORTVERSION= 1.9.14p3 -PORTREVISION= 1 +PORTVERSION= 1.9.15 CATEGORIES= security MASTER_SITES= SUDO @@ -30,11 +29,10 @@ LDFLAGS+= -lgcc PORTSCOUT= ignore:1 OPTIONS_DEFINE= AUDIT DISABLE_AUTH DISABLE_ROOT_SUDO DOCS EXAMPLES \ - INSULTS LDAP NLS NOARGS_SHELL OPIE PAM PYTHON SSL + INSULTS LDAP NLS NOARGS_SHELL OPIE PAM PYTHON SSL SSSD OPTIONS_DEFAULT= AUDIT PAM SSL -OPTIONS_RADIO= KERBEROS SSSD +OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT -OPTIONS_RADIO_SSSD= SSSD SSSD_DEVEL OPTIONS_SUB= yes AUDIT_DESC= Enable BSM audit support @@ -46,8 +44,7 @@ NOARGS_SHELL_DESC= Run a shell if no arguments are given OPIE_DESC= Enable one-time passwords (no PAM support) PYTHON_DESC= Enable python plugin support SSL_DESC= Use OpenSSL TLS and SHA2 functions -SSSD_DESC= Enable SSSD backend support. -SSSD_DEVEL_DESC= Enable SSSD-devel backend support. +SSSD_DESC= Enable SSSD backend support AUDIT_CONFIGURE_WITH= bsm-audit @@ -86,12 +83,11 @@ PYTHON_CONFIGURE_ENABLE=python SSL_USES= ssl SSL_CONFIGURE_ON= --enable-openssl=${OPENSSLBASE} +SSSD_PREVENTS= GSSAPI_HEIMDAL +SSSD_PREVENTS_MSG= sssd requires MIT kerberos and it conflicts with heimdal SSSD_RUN_DEPENDS= sssd:security/sssd SSSD_CONFIGURE_ON= --with-sssd -SSSD_DEVEL_RUN_DEPENDS= sssd:security/sssd-devel -SSSD_DEVEL_CONFIGURE_ON= --with-sssd - LOGFAC?= authpriv SUDO_LDAP_CONF?= ldap.conf @@ -112,6 +108,13 @@ CONFIGURE_ARGS+= --enable-kerb5-instance="${SUDO_KERB5_INSTANCE}" .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400072 +. if ${PORT_OPTIONS:MOPIE} +BUILD_DEPENDS+= opie>0:security/opie +RUN_DEPENDS+= opie>0:security/opie +. endif +.endif + .if ${ARCH} == "arm" CONFIGURE_ARGS+= --disable-pie .endif @@ -120,8 +123,6 @@ 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 @@ -130,6 +131,7 @@ post-install: ${RM} ${STAGEDIR}${PREFIX}/etc/sudoers ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cvtsudoers ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sudoreplay + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/sudo/sudo_intercept.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sudo_logsrvd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/sudo_sendlog ${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/visudo diff --git a/security/sudo/distinfo b/security/sudo/distinfo index 823b7ed41411..ff270902c6f5 100644 --- a/security/sudo/distinfo +++ b/security/sudo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690249679 -SHA256 (sudo-1.9.14p3.tar.gz) = a08318b1c4bc8582c004d4cd9ae2903abc549e7e46ba815e41fe81d1c0782b62 -SIZE (sudo-1.9.14p3.tar.gz) = 5232320 +TIMESTAMP = 1699294299 +SHA256 (sudo-1.9.15.tar.gz) = fd0e254870e92e873b508ba16382f5ac3af81a5a38d1ea9cf973606db4262589 +SIZE (sudo-1.9.15.tar.gz) = 5301915 diff --git a/security/sudo/pkg-plist b/security/sudo/pkg-plist index 682fedc57f46..96573715a41b 100644 --- a/security/sudo/pkg-plist +++ b/security/sudo/pkg-plist @@ -92,6 +92,7 @@ sbin/sudo_sendlog %%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/id/LC_MESSAGES/sudo.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