Date: Fri, 26 Jun 2026 10:34:04 +0000 From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3af1429b0ee9 - main - filesystems/amazon-efs-utils: update to 3.1.3 Message-ID: <6a3e559c.35b9b.27ab6473@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=3af1429b0ee91ac3434ee8d93e94958b9e5e16de commit 3af1429b0ee91ac3434ee8d93e94958b9e5e16de Author: Olivier Cochard <olivier@FreeBSD.org> AuthorDate: 2026-06-26 09:54:19 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2026-06-26 09:54:19 +0000 filesystems/amazon-efs-utils: update to 3.1.3 And fix a bug in doubled path substitution regarding the configuration file of amazon-efs-mount-watchdog Sponsored by: Netflix --- filesystems/amazon-efs-utils/Makefile | 5 +++-- filesystems/amazon-efs-utils/distinfo | 6 +++--- .../files/patch-src_mount__efs_____init____.py | 9 +++++---- .../files/patch-src_watchdog_____init____.py | 18 ------------------ 4 files changed, 11 insertions(+), 27 deletions(-) diff --git a/filesystems/amazon-efs-utils/Makefile b/filesystems/amazon-efs-utils/Makefile index b37aeee96a82..c5c0541cd63d 100644 --- a/filesystems/amazon-efs-utils/Makefile +++ b/filesystems/amazon-efs-utils/Makefile @@ -1,7 +1,6 @@ PORTNAME= amazon-efs-utils DISTVERSIONPREFIX= v -DISTVERSION= 3.1.0 -PORTREVISION= 3 +DISTVERSION= 3.1.3 CATEGORIES= filesystems python MAINTAINER= olivier@FreeBSD.org @@ -50,6 +49,8 @@ post-patch: @${REINPLACE_CMD} -e 's|mount\.efs|mount_efs|g' \ ${WRKSRC}/src/efs_utils_common/file_utils.py \ ${WRKSRC}/man/mount.efs.8 + @${REINPLACE_CMD} -e 's|@@EFS_LIBDIR@@|${EFS_LIBDIR}|g' \ + ${WRKSRC}/src/mount_efs/__init__.py do-install: ${INSTALL_PROGRAM} ${WRKDIR}/target/release/efs-proxy \ diff --git a/filesystems/amazon-efs-utils/distinfo b/filesystems/amazon-efs-utils/distinfo index c5257204380c..1784875ac295 100644 --- a/filesystems/amazon-efs-utils/distinfo +++ b/filesystems/amazon-efs-utils/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1777326058 +TIMESTAMP = 1782406088 SHA256 (rust/crates/addr2line-0.25.1.crate) = 1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b SIZE (rust/crates/addr2line-0.25.1.crate) = 43134 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -903,5 +903,5 @@ SHA256 (rust/crates/zerovec-derive-0.11.3.crate) = 625dc425cab0dca6dc3c3319506e6 SIZE (rust/crates/zerovec-derive-0.11.3.crate) = 22115 SHA256 (rust/crates/zmij-1.0.21.crate) = b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa SIZE (rust/crates/zmij-1.0.21.crate) = 26665 -SHA256 (aws-efs-utils-v3.1.0_GH0.tar.gz) = 5f1dbb1511e528529d8509d122cb65a1a7c0af89848f07a61983eea33a5256d8 -SIZE (aws-efs-utils-v3.1.0_GH0.tar.gz) = 455918 +SHA256 (aws-efs-utils-v3.1.3_GH0.tar.gz) = 37fb2a409d9ab2a1a8f81f78ee508b6f3122ecf2ed0ca632bd667ffe6fa465f3 +SIZE (aws-efs-utils-v3.1.3_GH0.tar.gz) = 461056 diff --git a/filesystems/amazon-efs-utils/files/patch-src_mount__efs_____init____.py b/filesystems/amazon-efs-utils/files/patch-src_mount__efs_____init____.py index 784b15400d59..ff8000309799 100644 --- a/filesystems/amazon-efs-utils/files/patch-src_mount__efs_____init____.py +++ b/filesystems/amazon-efs-utils/files/patch-src_mount__efs_____init____.py @@ -1,10 +1,11 @@ --- src/mount_efs/__init__.py.orig 2026-04-17 08:53:11 UTC +++ src/mount_efs/__init__.py -@@ -36,6 +36,7 @@ import sys +@@ -34,6 +34,7 @@ import logging + import logging + import platform import re import sys - -+sys.path.insert(0, "/usr/local/lib/amazon/efs") + ++sys.path.insert(0, "@@EFS_LIBDIR@@") from efs_utils_common.cloudwatch import bootstrap_cloudwatch_logging from efs_utils_common.config_utils import ( - bootstrap_logging, diff --git a/filesystems/amazon-efs-utils/files/patch-src_watchdog_____init____.py b/filesystems/amazon-efs-utils/files/patch-src_watchdog_____init____.py index be5be1e2206f..b80a6f146edd 100644 --- a/filesystems/amazon-efs-utils/files/patch-src_watchdog_____init____.py +++ b/filesystems/amazon-efs-utils/files/patch-src_watchdog_____init____.py @@ -1,23 +1,5 @@ --- src/watchdog/__init__.py.orig 2026-04-17 08:53:05 UTC +++ src/watchdog/__init__.py -@@ -60,7 +60,7 @@ FS_PREFIX = "fs-" - SERVICE = "elasticfilesystem" - FS_PREFIX = "fs-" - --CONFIG_FILE = "/etc/amazon/efs/efs-utils.conf" -+CONFIG_FILE = "/usr/local/etc/amazon/efs/efs-utils.conf" - CONFIG_SECTION = "mount-watchdog" - MOUNT_CONFIG_SECTION = "mount" - CLIENT_INFO_SECTION = "client-info" -@@ -79,7 +79,7 @@ EFS_SERVICE_NAME = "elasticfilesystem" - - DEFAULT_NFS_PORT = "2049" - EFS_SERVICE_NAME = "elasticfilesystem" --PRIVATE_KEY_FILE = "/etc/amazon/efs/privateKey.pem" -+PRIVATE_KEY_FILE = "/usr/local/etc/amazon/efs/privateKey.pem" - DEFAULT_REFRESH_SELF_SIGNED_CERT_INTERVAL_MIN = 60 - DEFAULT_STUNNEL_HEALTH_CHECK_INTERVAL_MIN = 5 - DEFAULT_STUNNEL_HEALTH_CHECK_TIMEOUT_SEC = 30 @@ -742,7 +742,64 @@ def get_current_local_nfs_mounts(mount_file="/proc/mou """ mounts = []home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a3e559c.35b9b.27ab6473>