Hello community, here is the log from the commit of package nfs4-acl-tools for openSUSE:Factory checked in at 2019-11-30 10:38:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfs4-acl-tools (Old) and /work/SRC/openSUSE:Factory/.nfs4-acl-tools.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs4-acl-tools" Sat Nov 30 10:38:21 2019 rev:15 rq:751726 version:0.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/nfs4-acl-tools/nfs4-acl-tools.changes 2014-06-05 10:50:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nfs4-acl-tools.new.26869/nfs4-acl-tools.changes 2019-11-30 10:40:19.024151032 +0100 @@ -1,0 +2,11 @@ +Thu Nov 28 03:36:22 UTC 2019 - Neil Brown <[email protected]> + +- nfs4-acl-tools-0.3.5.tar.gz - new upstream release +- Refresh nfs-acl-tools-xattr.patch +- Delete allow-spaces-in-principal-names.patch - included upstream + Includes fix for bug 967251 : setting inheritable ACLs with -R + Includes other fixes including an fd leak, man page typos and + proper handling of DENY ACEs. + (bsc#96725, boo#1157915) + +------------------------------------------------------------------- Old: ---- allow-spaces-in-principal-names.patch nfs4-acl-tools-0.3.3-git4cb4187e83.tar.bz2 New: ---- nfs4-acl-tools-0.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfs4-acl-tools.spec ++++++ --- /var/tmp/diff_new_pack.KpimHI/_old 2019-11-30 10:40:19.972150918 +0100 +++ /var/tmp/diff_new_pack.KpimHI/_new 2019-11-30 10:40:19.976150918 +0100 @@ -1,7 +1,7 @@ # # spec file for package nfs4-acl-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: nfs4-acl-tools -Version: 0.3.3 +Version: 0.3.5 Release: 0 Summary: Command line tools for managing ACLs over NFSv4 License: BSD-3-Clause Group: System/Filesystems -Url: http://www.citi.umich.edu/projects/nfsv4/linux/ +Url: http://linux-nfs.org/~bfields/nfs4-acl-tools/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: %{name}-%{version}-git4cb4187e83.tar.bz2 -# PATCH-FIX-UPSTREAM allow-spaces-in-principal-names.patch bnc#772896 [email protected] -Patch1: allow-spaces-in-principal-names.patch +Source0: %{name}-%{version}.tar.gz Patch2: nfs-acl-tools-xattr.patch BuildRequires: libtool @@ -37,8 +35,7 @@ must also support ACLs. %prep -%setup -q -n %{name}-%{version}-git4cb4187e83 -%patch1 -p1 +%setup -q -n %{name}-%{version} %patch2 -p1 %build ++++++ nfs-acl-tools-xattr.patch ++++++ --- /var/tmp/diff_new_pack.KpimHI/_old 2019-11-30 10:40:19.992150916 +0100 +++ /var/tmp/diff_new_pack.KpimHI/_new 2019-11-30 10:40:19.992150916 +0100 @@ -1,6 +1,15 @@ ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/configure.ac -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/configure.ac -@@ -23,12 +23,8 @@ AC_FUNC_MALLOC +--- + configure.ac | 3 --- + include/builddefs.in | 2 +- + libnfs4acl/Makefile | 2 +- + libnfs4acl/nfs4_acl_for_path.c | 8 ++++++-- + libnfs4acl/nfs4_set_acl.c | 7 ++++++- + nfs4_setfacl/nfs4_setfacl.c | 3 ++- + 6 files changed, 16 insertions(+), 9 deletions(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -26,11 +26,8 @@ AC_FUNC_MALLOC AC_FUNC_STAT AC_CHECK_FUNCS([memset strchr]) @@ -8,23 +17,49 @@ - AC_PACKAGE_GLOBALS([nfs4acl]) AC_PACKAGE_UTILITIES([nfs4acl]) --AC_PACKAGE_NEED_ATTR_XATTR_H -AC_PACKAGE_NEED_GETXATTR_LIBATTR AC_MANUAL_FORMAT - AC_FUNC_GCC_VISIBILITY ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/libnfs4acl/nfs4_acl_for_path.c -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/libnfs4acl/nfs4_acl_for_path.c -@@ -32,13 +32,17 @@ + AC_OUTPUT(include/builddefs) +--- a/include/builddefs.in ++++ b/include/builddefs.in +@@ -40,7 +40,7 @@ OPTIMIZER = @opt_build@ + MALLOCLIB = @malloc_lib@ + + LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la +-LIBATTR = @libattr@ ++LIBATTR = + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +--- a/libnfs4acl/Makefile ++++ b/libnfs4acl/Makefile +@@ -37,7 +37,7 @@ LTLDFLAGS += -Wl,--version-script,$(TOPD + include $(TOPDIR)/include/builddefs + + LTLIBRARY = libnfs4acl.la +-LTLIBS = -lattr ++LTLIBS = + LTDEPENDENCIES = $(TOPDIR)/include/nfs4.h + + # 3 2 1 -> .so.2.1.2 +--- a/libnfs4acl/nfs4_acl_for_path.c ++++ b/libnfs4acl/nfs4_acl_for_path.c +@@ -32,11 +32,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - +#include <errno.h> #include <sys/types.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> - #include <sys/stat.h> + #include <config.h> + #ifdef HAVE_ATTR_XATTR_H +-# include <attr/xattr.h> ++# include <sys/xattr.h> + #else + # ifdef HAVE_SYS_XATTR_H + # include <sys/xattr.h> +@@ -46,6 +46,10 @@ #include <stdio.h> #include "libacl_nfs4.h" @@ -35,9 +70,9 @@ static int nfs4_getxattr(const char *, void *, size_t); /* returns a newly-allocated struct nfs4_acl for `path', or NULL on error. */ ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/libnfs4acl/nfs4_set_acl.c -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/libnfs4acl/nfs4_set_acl.c -@@ -29,14 +29,19 @@ +--- a/libnfs4acl/nfs4_set_acl.c ++++ b/libnfs4acl/nfs4_set_acl.c +@@ -29,12 +29,13 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -45,9 +80,14 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/errno.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> - #include <unistd.h> + #include <config.h> + #ifdef HAVE_ATTR_XATTR_H +-# include <attr/xattr.h> ++# include <sys/xattr.h> + #else + # ifdef HAVE_SYS_XATTR_H + # include <sys/xattr.h> +@@ -44,6 +45,10 @@ #include <stdio.h> #include "libacl_nfs4.h" @@ -58,9 +98,9 @@ int nfs4_set_acl(struct nfs4_acl *acl, const char *path) { int res = 0; ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/nfs4_setfacl/nfs4_setfacl.c -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/nfs4_setfacl/nfs4_setfacl.c -@@ -34,11 +34,12 @@ +--- a/nfs4_setfacl/nfs4_setfacl.c ++++ b/nfs4_setfacl/nfs4_setfacl.c +@@ -34,13 +34,14 @@ */ #define _XOPEN_SOURCE 500 @@ -69,30 +109,10 @@ #include <sys/wait.h> #include <sys/stat.h> #include <sys/errno.h> --#include <attr/xattr.h> -+#include <sys/xattr.h> - #include <stdlib.h> - #include <unistd.h> - #include <ctype.h> ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/libnfs4acl/Makefile -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/libnfs4acl/Makefile -@@ -37,7 +37,7 @@ LTLDFLAGS += -Wl,--version-script,$(TOPD - include $(TOPDIR)/include/builddefs - - LTLIBRARY = libnfs4acl.la --LTLIBS = -lattr -+LTLIBS = - LTDEPENDENCIES = $(TOPDIR)/include/nfs4.h - - # 3 2 1 -> .so.2.1.2 ---- nfs4-acl-tools-0.3.3-git4cb4187e83.orig/include/builddefs.in -+++ nfs4-acl-tools-0.3.3-git4cb4187e83/include/builddefs.in -@@ -40,7 +40,7 @@ OPTIMIZER = @opt_build@ - MALLOCLIB = @malloc_lib@ - - LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la --LIBATTR = @libattr@ -+LIBATTR = - - prefix = @prefix@ - exec_prefix = @exec_prefix@ + #include <config.h> + #ifdef HAVE_ATTR_XATTR_H +-# include <attr/xattr.h> ++# include <sys/xattr.h> + #else + # ifdef HAVE_SYS_XATTR_H + # include <sys/xattr.h>
