Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nfs4-acl-tools for openSUSE:Factory checked in at 2021-06-01 10:35:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs4-acl-tools (Old) and /work/SRC/openSUSE:Factory/.nfs4-acl-tools.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs4-acl-tools" Tue Jun 1 10:35:11 2021 rev:16 rq:895220 version:0.3.7 Changes: -------- --- /work/SRC/openSUSE:Factory/nfs4-acl-tools/nfs4-acl-tools.changes 2019-11-30 10:40:19.024151032 +0100 +++ /work/SRC/openSUSE:Factory/.nfs4-acl-tools.new.1898/nfs4-acl-tools.changes 2021-06-01 10:35:41.656632497 +0200 @@ -1,0 +2,15 @@ +Thu May 20 13:21:18 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to version 0.3.7 + * Remove OWNER_AT, GROUP_AT, EVERYONE_AT flags, but it is still + possible to set these bits using the "O", "G", and "E" in the + flag field on the commandline. + * Add new option -c/--omit-header to not display comment header. + * Skip comment field while reading ACE(s). Fixes an issue where + nfs4_setfacl failed to handle comments while reading ACE(s) + from nfs4_getfacl output. + * Improved readability: add empty line after each acl + * nfs4_getfacl: return 1 for unknown option and won't use '-?' anymore + * nfs4_setfacl: Add file name to error output. + +------------------------------------------------------------------- Old: ---- nfs4-acl-tools-0.3.5.tar.gz New: ---- nfs4-acl-tools-0.3.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs4-acl-tools.spec ++++++ --- /var/tmp/diff_new_pack.cvT4gX/_old 2021-06-01 10:35:42.108633267 +0200 +++ /var/tmp/diff_new_pack.cvT4gX/_new 2021-06-01 10:35:42.112633273 +0200 @@ -1,7 +1,7 @@ # # spec file for package nfs4-acl-tools # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,14 @@ Name: nfs4-acl-tools -Version: 0.3.5 +Version: 0.3.7 Release: 0 Summary: Command line tools for managing ACLs over NFSv4 License: BSD-3-Clause Group: System/Filesystems -Url: http://linux-nfs.org/~bfields/nfs4-acl-tools/ - -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}.tar.gz +URL: http://linux-nfs.org/~bfields/nfs4-acl-tools/ +Source0: http://linux-nfs.org/~bfields/nfs4-acl-tools/nfs4-acl-tools-%{version}.tar.gz +# GitClone: http://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git Patch2: nfs-acl-tools-xattr.patch BuildRequires: libtool @@ -35,21 +34,22 @@ must also support ACLs. %prep -%setup -q -n %{name}-%{version} +%setup -q %patch2 -p1 %build +autoreconf -fi export CFLAGS="$RPM_OPT_FLAGS -fPIE" export LDFLAGS="-pie" -sed -e 's,--acdir=,-I ,' -i Makefile -make +%configure +%make_build %install -make DESTDIR=%{buildroot} install +%make_install %files -%defattr(-,root,root) -%doc COPYING README TODO VERSION +%license COPYING +%doc README TODO VERSION %{_bindir}/nfs4_editfacl %{_bindir}/nfs4_getfacl %{_bindir}/nfs4_setfacl ++++++ nfs4-acl-tools-0.3.5.tar.gz -> nfs4-acl-tools-0.3.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/VERSION new/nfs4-acl-tools-0.3.7/VERSION --- old/nfs4-acl-tools-0.3.5/VERSION 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/VERSION 2020-06-04 18:26:29.000000000 +0200 @@ -3,5 +3,5 @@ # PKG_MAJOR=0 PKG_MINOR=3 -PKG_REVISION=5 +PKG_REVISION=7 PKG_BUILD=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/aclocal.m4 new/nfs4-acl-tools-0.3.7/aclocal.m4 --- old/nfs4-acl-tools-0.3.5/aclocal.m4 2018-08-21 18:39:04.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/aclocal.m4 2020-06-04 18:27:39.000000000 +0200 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/include/libacl_nfs4.h new/nfs4-acl-tools-0.3.7/include/libacl_nfs4.h --- old/nfs4-acl-tools-0.3.5/include/libacl_nfs4.h 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/include/libacl_nfs4.h 2020-06-04 18:26:29.000000000 +0200 @@ -54,9 +54,6 @@ #define FLAG_SUCCESSFUL_ACCESS 'S' #define FLAG_FAILED_ACCESS 'F' #define FLAG_GROUP 'g' -#define FLAG_OWNER_AT 'O' -#define FLAG_GROUP_AT 'G' -#define FLAG_EVERYONE_AT 'E' #define PERM_READ_DATA 'r' #define PERM_WRITE_DATA 'w' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/include/nfs4.h new/nfs4-acl-tools-0.3.7/include/nfs4.h --- old/nfs4-acl-tools-0.3.5/include/nfs4.h 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/include/nfs4.h 2020-06-04 18:26:29.000000000 +0200 @@ -62,9 +62,6 @@ #define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG 0x00000010 #define NFS4_ACE_FAILED_ACCESS_ACE_FLAG 0x00000020 #define NFS4_ACE_IDENTIFIER_GROUP 0x00000040 -#define NFS4_ACE_OWNER 0x00000080 -#define NFS4_ACE_GROUP 0x00000100 -#define NFS4_ACE_EVERYONE 0x00000200 #define NFS4_ACE_READ_DATA 0x00000001 #define NFS4_ACE_LIST_DIRECTORY 0x00000001 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_ace_from_string.c new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_ace_from_string.c --- old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_ace_from_string.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_ace_from_string.c 2020-06-04 18:26:29.000000000 +0200 @@ -209,15 +209,6 @@ case FLAG_GROUP: flags |= NFS4_ACE_IDENTIFIER_GROUP; break; - case FLAG_OWNER_AT: - flags |= NFS4_ACE_OWNER; - break; - case FLAG_GROUP_AT: - flags |= NFS4_ACE_GROUP; - break; - case FLAG_EVERYONE_AT: - flags |= NFS4_ACE_EVERYONE; - break; default: fprintf(stderr,"Bad Ace Flag:%c\n", *field); goto out_free; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_get_ace_flags.c new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_get_ace_flags.c --- old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_get_ace_flags.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_get_ace_flags.c 2020-06-04 18:26:29.000000000 +0200 @@ -53,12 +53,6 @@ *buf++ = FLAG_FAILED_ACCESS;; if (flags & NFS4_ACE_IDENTIFIER_GROUP) *buf++ = FLAG_GROUP; - if (flags & NFS4_ACE_OWNER) - *buf++ = FLAG_OWNER_AT; - if (flags & NFS4_ACE_GROUP) - *buf++ = FLAG_GROUP_AT; - if (flags & NFS4_ACE_EVERYONE) - *buf++ = FLAG_EVERYONE_AT; *buf = '\0'; return bp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_insert_string_aces.c new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_insert_string_aces.c --- old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_insert_string_aces.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_insert_string_aces.c 2020-06-04 18:26:29.000000000 +0200 @@ -48,6 +48,8 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_print_ace_verbose.c new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_print_ace_verbose.c --- old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_print_ace_verbose.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_print_ace_verbose.c 2020-06-04 18:26:29.000000000 +0200 @@ -131,12 +131,6 @@ printf("\t\tNFS4_ACE_FAILED_ACCESS_ACE_FLAG\n"); if (flag & NFS4_ACE_IDENTIFIER_GROUP) printf("\t\tNFS4_ACE_IDENTIFIER_GROUP\n"); - if (flag & NFS4_ACE_OWNER) - printf("\t\tNFS4_ACE_OWNER\n"); - if (flag & NFS4_ACE_GROUP) - printf("\t\tNFS4_ACE_GROUP\n"); - if (flag & NFS4_ACE_EVERYONE) - printf("\t\tNFS4_ACE_EVERYONE\n"); mask = ace->access_mask; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_set_acl.c new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_set_acl.c --- old/nfs4-acl-tools-0.3.5/libnfs4acl/nfs4_set_acl.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/libnfs4acl/nfs4_set_acl.c 2020-06-04 18:26:29.000000000 +0200 @@ -61,13 +61,13 @@ goto out_free; } else if (res < 0) { if (errno == EOPNOTSUPP) - fprintf(stderr,"Operation to set ACL not supported.\n"); + fprintf(stderr,"Operation to set ACL not supported: %s\n", path); else if (errno == ENODATA) - fprintf(stderr,"ACL Attribute not found on file.\n"); + fprintf(stderr,"ACL Attribute not found on file: %s\n", path); else if (errno == EREMOTEIO) fprintf(stderr,"An NFS server error occurred.\n"); else - perror("Failed setxattr operation"); + printf("Failed setxattr operation: %s: %s\n", path, strerror(errno)); } out_free: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/make-tarball new/nfs4-acl-tools-0.3.7/make-tarball --- old/nfs4-acl-tools-0.3.5/make-tarball 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/make-tarball 2020-06-04 18:26:29.000000000 +0200 @@ -6,7 +6,7 @@ name=nfs4-acl-tools-$PKG_MAJOR.$PKG_MINOR.$PKG_REVISION git tag "$name" -git push --tags master origin +git push --tags origin master git archive --format=tar --prefix="$name/" HEAD | (cd /tmp; tar xf - ) cd /tmp/$name rm .gitignore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/man/man1/nfs4_getfacl.1 new/nfs4-acl-tools-0.3.7/man/man1/nfs4_getfacl.1 --- old/nfs4-acl-tools-0.3.5/man/man1/nfs4_getfacl.1 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/man/man1/nfs4_getfacl.1 2020-06-04 18:26:29.000000000 +0200 @@ -28,6 +28,12 @@ .B nfs4_getfacl will list the NFSv4 ACLs of all files and directories recursively. +If the +.BR -c / --omit-header +flag is specified, +.B nfs4_getfacl +will not display the comment header (Do not print filename). + The output format for an NFSv4 file ACL, e.g., is: .RS .nf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/man/man5/nfs4_acl.5 new/nfs4-acl-tools-0.3.7/man/man5/nfs4_acl.5 --- old/nfs4-acl-tools-0.3.5/man/man5/nfs4_acl.5 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/man/man5/nfs4_acl.5 2020-06-04 18:26:29.000000000 +0200 @@ -173,9 +173,18 @@ .I flag is also set), or one of three special .IR principals : -`OWNER@', `GROUP@', and `EVERYONE@', which are, respectively, analogous -to the POSIX user/group/other distinctions used in, e.g., -.BR chmod (1). +`OWNER@', `GROUP@', and `EVERYONE@': +.TP +.B OWNER@ +matches the file's owner +.TP +.B GROUP@ +matches the file's group +.TP +.B EVERYONE@ +always matches. (Note this is different from the "other" used +in mode bits or POSIX ACLs, which does not match the file's owner or +group.) .SS ACE PERMISSIONS: There are a variety of different ACE .I permissions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nfs4-acl-tools-0.3.5/nfs4_getfacl/nfs4_getfacl.c new/nfs4-acl-tools-0.3.7/nfs4_getfacl/nfs4_getfacl.c --- old/nfs4-acl-tools-0.3.5/nfs4_getfacl/nfs4_getfacl.c 2018-08-21 18:07:51.000000000 +0200 +++ new/nfs4-acl-tools-0.3.7/nfs4_getfacl/nfs4_getfacl.c 2020-06-04 18:26:29.000000000 +0200 @@ -46,6 +46,7 @@ static void more_help(); static char *execname; static void print_acl_from_path(); +static int ignore_comment = 0; static int recursive(const char *fpath, const struct stat *sb, int tflag, struct FTW *ftwbuf) { @@ -57,6 +58,7 @@ {"more-help", 0, 0, 'H' }, {"help", 0, 0, 'h' }, {"recursive", 0, 0, 'R' }, + {"omit-header", 0, 0, 'c'}, { NULL, 0, 0, 0, }, }; @@ -73,7 +75,7 @@ goto out; } - while ((opt = getopt_long(argc, argv, "HR?h", long_options, NULL)) != -1) { + while ((opt = getopt_long(argc, argv, "HR?hc", long_options, NULL)) != -1) { switch(opt) { case 'H': more_help(); @@ -83,11 +85,17 @@ case 'R': do_recursive = 1; break; - - default: + case 'c': + ignore_comment = 1; + break; + case 'h': usage(1); res = 0; goto out; + case '?': + default: + usage(0); + goto out; } } @@ -115,8 +123,10 @@ struct nfs4_acl *acl; acl = nfs4_acl_for_path(fpath); if (acl != NULL) { - printf("\n# file: %s\n", fpath); + if (ignore_comment == 0) + printf("# file: %s\n", fpath); nfs4_print_acl(stdout, acl); + printf("\n"); nfs4_free_acl(acl); } } @@ -125,7 +135,16 @@ { if (label) fprintf(stderr, "%s %s -- get NFSv4 file or directory access control lists.\n", execname, VERSION); - fprintf(stderr, "Usage: %s [-R] file ...\n -H, --more-help\tdisplay ACL format information\n -?, -h, --help\tdisplay this help text\n -R --recursive\trecurse into subdirectories\n", execname); + + static const char *gfusage = \ + "Usage: %s [OPTIONS] file ...\n" + " .. where OPTIONS is any (or none) of:\n" + " -H, --more-help display ACL format information\n" + " -h, --help display this help text\n" + " -R, --recursive recurse into subdirectories\n" + " -c, --omit-header Do not display the comment header (Do not print filename)\n"; + + fprintf(stderr, gfusage, execname); } static void more_help()
