From 63e7de9940c77c6f8b1ebb87ad148ac4d1ed8e6c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Jun 10 2019 13:32:31 +0000
Subject: Resolves: #1031423 - xattr.conf: remove entries for NFSv4 ACLs namespaces


---

diff --git a/0003-attr-2.4.48-xattr-conf-nfs4-acls.patch b/0003-attr-2.4.48-xattr-conf-nfs4-acls.patch
new file mode 100644
index 0000000..1b77c5c
--- /dev/null
+++ b/0003-attr-2.4.48-xattr-conf-nfs4-acls.patch
@@ -0,0 +1,64 @@
+From 5c04ee88bc3a8fe4bde91d488d74bbadb836a5e6 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 4 Mar 2019 16:13:42 +0100
+Subject: [PATCH 1/2] xattr.conf: document how libattr itself uses the file
+
+Otherwise users could think that only entries with the `skip` action
+are excluded by libattr functions attr_copy_file() and attr_copy_fd()
+by default.
+---
+ xattr.conf | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/xattr.conf b/xattr.conf
+index dcbc12c..7361fbd 100644
+--- a/xattr.conf
++++ b/xattr.conf
+@@ -6,6 +6,10 @@
+ # Actions:
+ #   permissions - copy when trying to preserve permissions.
+ #   skip - do not copy.
++#
++# Note that libattr functions attr_copy_file() and attr_copy_fd() by default
++# skip all extended attributes that are matched by any of the below patterns,
++# regardless of the specified action.
+ 
+ system.nfs4_acl			permissions
+ system.nfs4acl			permissions
+-- 
+2.20.1
+
+
+From 951fbb74d402a96619b6b9ee894d272650ec7100 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 4 Mar 2019 16:21:52 +0100
+Subject: [PATCH 2/2] xattr.conf: remove entries for NFSv4 ACLs namespaces
+
+... in order to make it possible to copy NFSv4 ACLs by GNU coreutils'
+implementation of cp(1).  There is no way to make GNU coreutils copy
+extended attributes that are matched by any entry from /etc/xattr.conf.
+
+GNU coreutils upstream says that NFS-related entries should be removed
+from the default /etc/xattr.conf to make copying of NFSv4 ACLs work:
+
+http://lists.gnu.org/archive/html/bug-coreutils/2019-03/msg00008.html
+---
+ xattr.conf | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/xattr.conf b/xattr.conf
+index 7361fbd..1ac5b2f 100644
+--- a/xattr.conf
++++ b/xattr.conf
+@@ -11,8 +11,6 @@
+ # skip all extended attributes that are matched by any of the below patterns,
+ # regardless of the specified action.
+ 
+-system.nfs4_acl			permissions
+-system.nfs4acl			permissions
+ system.posix_acl_access		permissions
+ system.posix_acl_default	permissions
+ trusted.SGI_ACL_DEFAULT		skip		# xfs specific
+-- 
+2.20.1
+
diff --git a/attr.spec b/attr.spec
index 0754cbb..7f5841f 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,7 +1,7 @@
 Summary: Utilities for managing filesystem extended attributes
 Name: attr
 Version: 2.4.48
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: https://download-mirror.savannah.gnu.org/releases/attr/attr-%{version}.tar.gz
 
 # fix test-suite failure with perl-5.26.0 (#1473853)
@@ -10,6 +10,12 @@ Patch1:  0001-attr-2.4.48-test-suite-perl.patch
 # fix conflict with fakechroot (https://github.com/dex4er/fakechroot/issues/57)
 Patch2:  0002-attr-2.4.48-switch-back-to-syscall.patch
 
+# xattr.conf: remove entries for NFSv4 ACLs namespaces (#1031423)
+# https://lists.nongnu.org/archive/html/acl-devel/2019-03/msg00000.html
+# https://lists.nongnu.org/archive/html/acl-devel/2019-03/msg00001.html
+# https://lists.nongnu.org/archive/html/acl-devel/2019-05/msg00000.html
+Patch3:  0003-attr-2.4.48-xattr-conf-nfs4-acls.patch
+
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/attr
 BuildRequires: gettext
@@ -115,6 +121,9 @@ ln -fs ../sys/xattr.h $RPM_BUILD_ROOT%{_includedir}/attr/xattr.h
 %config(noreplace) %{_sysconfdir}/xattr.conf
 
 %changelog
+* Mon Jun 10 2019 Kamil Dudka <kdudka@redhat.com> 2.4.48-6
+- xattr.conf: remove entries for NFSv4 ACLs namespaces (#1031423)
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.48-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild