git: 2038605e5d01 - main - security/sudo-rs: Update to 0.2.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 09 May 2025 03:32:53 UTC
The branch main has been updated by dutra:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2038605e5d0190a719ffa70b2e50e141081961cc
commit 2038605e5d0190a719ffa70b2e50e141081961cc
Author: Marc Schoolderman <info@marcschoolderman.nl>
AuthorDate: 2025-05-09 03:26:24 +0000
Commit: Gabriel M. Dutra <dutra@FreeBSD.org>
CommitDate: 2025-05-09 03:32:26 +0000
security/sudo-rs: Update to 0.2.6
ChangeLog:
https://github.com/trifectatechfoundation/sudo-rs/releases/tag/v0.2.6
PR: 286636
Approved by: submitter is maintainer
---
security/sudo-rs/Makefile | 41 ++++++++++++++++++++++-------------------
security/sudo-rs/distinfo | 14 +++++++-------
2 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/security/sudo-rs/Makefile b/security/sudo-rs/Makefile
index f5822ca31ccc..701a0b45f30c 100644
--- a/security/sudo-rs/Makefile
+++ b/security/sudo-rs/Makefile
@@ -1,7 +1,6 @@
PORTNAME= sudo-rs
-PORTVERSION= 0.2.5
+PORTVERSION= 0.2.6
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= security
MAINTAINER= marc@trifectatech.org
@@ -15,6 +14,11 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
BUILD_DEPENDS= pandoc:${PORTSDIR}/textproc/hs-pandoc
+FLAVORS= default coexist
+FLAVOR?= ${FLAVORS:[1]}
+coexist_PKGNAMESUFFIX= -coexist
+coexist_DESCR= pkg-descr-coexist
+
USES= cargo
USE_GITHUB= yes
@@ -23,8 +27,8 @@ GH_TAGNAME= main
CARGO_CRATES= diff-0.1.13 \
glob-0.3.2 \
- libc-0.2.170 \
- log-0.4.26 \
+ libc-0.2.172 \
+ log-0.4.27 \
pretty_assertions-1.4.1 \
yansi-1.0.1
@@ -32,20 +36,20 @@ CARGO_CRATES= diff-0.1.13 \
CARGO_TEST= no
.endif
-PLIST_SUB+= RS_SUFFIX=${RS_SUFFIX}
+.if ${FLAVOR} == default
+CONFLICTS_INSTALL= sudo
+RS_SUFFIX=
+PLIST_SUB+= NO_COEXIST=""
+.else
+RS_SUFFIX= -rs
+PLIST_SUB+= NO_COEXIST="@comment "
+.endif
+PLIST_SUB+= RS_SUFFIX=${RS_SUFFIX}
PORTDOCS= CHANGELOG.md CONTRIBUTING.md COPYRIGHT LICENSE-* README.md \
SECURITY.md
-OPTIONS_DEFINE= COEXIST DOCS
-OPTIONS_SUB= yes
-
-COEXIST_DESC= Install using -rs suffix to coexist with security/sudo
-COEXIST_CONFLICTS_INSTALL_OFF= sudo
-COEXIST_VARS= RS_SUFFIX=-rs
-
-post-patch:
- ${REINPLACE_CMD} -E -e "s:(/usr/local)?/etc:${LOCALBASE}/etc:" ${WRKSRC}/src/sudo/mod.rs
+OPTIONS_DEFINE= DOCS
post-build:
.for man in sudo.8 visudo.8 sudoers.5
@@ -64,13 +68,12 @@ post-install:
${MKDIR} ${STAGEDIR}/var/db/sudo
# we are not going to try to replace 'su', since that is part of FreeBSD itself
${RM} ${STAGEDIR}${PREFIX}/bin/su
-
-post-install-COEXIST-on:
- ${MV} ${STAGEDIR}${PREFIX}/bin/sudo ${STAGEDIR}${PREFIX}/bin/sudo${RS_SUFFIX}
-
-post-install-COEXIST-off:
+.if ${FLAVOR} == default
${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/sudo.default
${INSTALL_DATA} ${FILESDIR}/sudoers ${STAGEDIR}${PREFIX}/etc/sudoers.dist
+.else
+ ${MV} ${STAGEDIR}${PREFIX}/bin/sudo ${STAGEDIR}${PREFIX}/bin/sudo${RS_SUFFIX}
+.endif
post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/security/sudo-rs/distinfo b/security/sudo-rs/distinfo
index 5d7966a4ccbf..7162c3e88c85 100644
--- a/security/sudo-rs/distinfo
+++ b/security/sudo-rs/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1743665625
+TIMESTAMP = 1746636640
SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
SIZE (rust/crates/diff-0.1.13.crate) = 46216
SHA256 (rust/crates/glob-0.3.2.crate) = a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2
SIZE (rust/crates/glob-0.3.2.crate) = 22359
-SHA256 (rust/crates/libc-0.2.170.crate) = 875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828
-SIZE (rust/crates/libc-0.2.170.crate) = 760076
-SHA256 (rust/crates/log-0.4.26.crate) = 30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e
-SIZE (rust/crates/log-0.4.26.crate) = 47022
+SHA256 (rust/crates/libc-0.2.172.crate) = d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa
+SIZE (rust/crates/libc-0.2.172.crate) = 791646
+SHA256 (rust/crates/log-0.4.27.crate) = 13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94
+SIZE (rust/crates/log-0.4.27.crate) = 48120
SHA256 (rust/crates/pretty_assertions-1.4.1.crate) = 3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d
SIZE (rust/crates/pretty_assertions-1.4.1.crate) = 78952
SHA256 (rust/crates/yansi-1.0.1.crate) = cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049
SIZE (rust/crates/yansi-1.0.1.crate) = 75497
-SHA256 (trifectatechfoundation-sudo-rs-v0.2.5-main_GH0.tar.gz) = 0eb28fe7aacd79505c2949a4318d079a39151d9646e057ff6f362e8f2706cfb5
-SIZE (trifectatechfoundation-sudo-rs-v0.2.5-main_GH0.tar.gz) = 707844
+SHA256 (trifectatechfoundation-sudo-rs-v0.2.6-main_GH0.tar.gz) = e50131984916f272c5bdf376b5093e42bca29cce066431f4902ae60edb5a0df5
+SIZE (trifectatechfoundation-sudo-rs-v0.2.6-main_GH0.tar.gz) = 712201