diff --git a/.gitignore b/.gitignore index 5895b97..8ac440b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/nfs4-acl-tools-0.3.5.tar.gz +SOURCES/nfs4-acl-tools-0.4.2.tar.gz diff --git a/.nfs4-acl-tools.metadata b/.nfs4-acl-tools.metadata index cd45ca3..2c9b790 100644 --- a/.nfs4-acl-tools.metadata +++ b/.nfs4-acl-tools.metadata @@ -1 +1 @@ -07e075ee51921ecb7529840919d62170a28b8762 SOURCES/nfs4-acl-tools-0.3.5.tar.gz +9ca3d1e11ccfe372c99f2fbe0398806d814fa285 SOURCES/nfs4-acl-tools-0.4.2.tar.gz diff --git a/SOURCES/nfs4-acl-tools-0.3.5-ace-reads.patch b/SOURCES/nfs4-acl-tools-0.3.5-ace-reads.patch deleted file mode 100644 index a366df4..0000000 --- a/SOURCES/nfs4-acl-tools-0.3.5-ace-reads.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 5236e718f0d5dfb9008d3afed64aa642ea38d32e -Author: Kenneth D'souza -Date: Tue Mar 26 19:41:09 2019 +0530 - - nfs4_setfacl: Skip comment field while reading ACE(s). - - With commit 6630629bb661a7f48fb9856f7fd9616ce1499efa an additional field for filename - was added due to which nfs4_setfacl failed to handle comments while reading ACE(s) - from nfs4_getfacl output. - This patch resolves the issue by skipping comment header. - - With fix: - - $ nfs4_setfacl --test -s "$(nfs4_getfacl file1)" file2 - ## Test mode only - the resulting ACL for "/test/file2": - A::OWNER@:rwatTcCy - A:g:GROUP@:rtcy - A::EVERYONE@:rtcy - - Without fix: - - $ nfs4_setfacl --test -s "$(nfs4_getfacl file1)" file2 - Failed while inserting ACE(s). - - Signed-off-by: Kenneth D'souza - Signed-off-by: J. Bruce Fields - -diff --git a/libnfs4acl/nfs4_insert_string_aces.c b/libnfs4acl/nfs4_insert_string_aces.c -index 5a482d5..f93c3e9 100644 ---- a/libnfs4acl/nfs4_insert_string_aces.c -+++ b/libnfs4acl/nfs4_insert_string_aces.c -@@ -48,6 +48,8 @@ int nfs4_insert_string_aces(struct nfs4_acl *acl, const char *acl_spec, unsigned - while ((ssp = strsep(&sp, ",\t\n\r")) != NULL) { - if (!strlen(ssp)) - continue; -+ if (*ssp == '#') -+ continue; - - if ((ace = nfs4_ace_from_string(ssp, acl->is_directory)) == NULL) - goto out_failed; diff --git a/SPECS/nfs4-acl-tools.spec b/SPECS/nfs4-acl-tools.spec index 30900a6..6a9598e 100644 --- a/SPECS/nfs4-acl-tools.spec +++ b/SPECS/nfs4-acl-tools.spec @@ -1,6 +1,6 @@ Name: nfs4-acl-tools -Version: 0.3.5 -Release: 8%{?dist} +Version: 0.4.2 +Release: 0%{?dist} Summary: The nfs4 ACL tools License: BSD URL: http://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git;a=summary @@ -10,11 +10,6 @@ BuildRequires: make BuildRequires: libtool BuildRequires: libattr-devel -# -# RHEL9.0 -# -Patch001: nfs4-acl-tools-0.3.5-ace-reads.patch - %description This package contains commandline ACL utilities for the Linux NFSv4 client. @@ -42,6 +37,9 @@ make DESTDIR=%{buildroot} install %{_mandir}/man5/* %changelog +* Tue Nov 15 2022 Steve Dickson - 0.4.2-0 +- Updated to the latest upstream release: nfs4-acl-tools-0.4.2 (bz 2059052) + * Wed Aug 18 2021 Steve Dickson - 0.3.5-8 - nfs4_setfacl: Skip comment field while reading ACE(s) (bz 1970815)