From aa6c367bad9bd0fb9ab4cb594373cd9535c7d4a5 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Nov 19 2013 14:39:11 +0000
Subject: provide /etc/xattr.conf to exclude copying certain extended attrs (#1031423)


---

diff --git a/0002-attr-2.4.47-xattr-conf.patch b/0002-attr-2.4.47-xattr-conf.patch
new file mode 100644
index 0000000..00dce32
--- /dev/null
+++ b/0002-attr-2.4.47-xattr-conf.patch
@@ -0,0 +1,78 @@
+From 78fd043ba4378c7db84288c76911a57d4d5ff848 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@linbit.com>
+Date: Mon, 18 Nov 2013 22:11:44 +0100
+Subject: [PATCH] Add a default /etc/xattr.conf file
+
+[upstream commit fe92f96a4d8b017b73d1eb262d4ea3be5e9d48df]
+
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ Makefile             |    4 ++++
+ include/builddefs.in |    1 +
+ xattr.conf           |   20 ++++++++++++++++++++
+ 3 files changed, 25 insertions(+), 0 deletions(-)
+ create mode 100644 xattr.conf
+
+diff --git a/Makefile b/Makefile
+index 4443fe0..f94f457 100644
+--- a/Makefile
++++ b/Makefile
+@@ -28,6 +28,8 @@ CONFIGURE = \
+ 	configure config.guess config.sub \
+ 	ltmain.sh m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 \
+ 	m4/ltversion.m4 m4/lt~obsolete.m4
++SRCFILES = \
++	xattr.conf
+ LSRCFILES = \
+ 	configure.in Makepkgs install-sh exports README VERSION \
+ 	$(CONFIGURE)
+@@ -92,6 +94,8 @@ include/config.h: include/builddefs
+ install: default $(addsuffix -install,$(SUBDIRS))
+ 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
+ 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
++	$(INSTALL) -m 755 -d $(PKG_CONF_DIR)
++	$(INSTALL) -m 644 xattr.conf $(PKG_CONF_DIR)
+ 
+ install-dev: default $(addsuffix -install-dev,$(SUBDIRS))
+ 
+diff --git a/include/builddefs.in b/include/builddefs.in
+index d9931db..f888d25 100644
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -48,6 +48,7 @@ PKG_INC_DIR	= @includedir@/attr
+ PKG_MAN_DIR	= @mandir@
+ PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+ PKG_LOCALE_DIR	= @datadir@/locale
++PKG_CONF_DIR	= @sysconfdir@
+ 
+ CC		= @cc@
+ AWK		= @awk@
+diff --git a/xattr.conf b/xattr.conf
+new file mode 100644
+index 0000000..e1f2215
+--- /dev/null
++++ b/xattr.conf
+@@ -0,0 +1,20 @@
++# /etc/xattr.conf
++#
++# Format:
++# <pattern> <action>
++#
++# Actions:
++#   permissions - copy when trying to preserve permissions.
++#   skip - do not copy.
++
++system.nfs4_acl			permissions
++system.nfs4acl			permissions
++system.posix_acl_access		permissions
++system.posix_acl_default	permissions
++trusted.SGI_ACL_DEFAULT		skip		# xfs specific
++trusted.SGI_ACL_FILE		skip		# xfs specific
++trusted.SGI_CAP_FILE		skip		# xfs specific
++trusted.SGI_DMI_*		skip		# xfs specific
++trusted.SGI_MAC_FILE		skip		# xfs specific
++xfsroot.*			skip		# xfs specific; obsolete
++user.Beagle.*			skip		# ignore Beagle index data
+-- 
+1.7.1
+
diff --git a/attr.spec b/attr.spec
index 72f9be1..1cbc4a1 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,13 +1,16 @@
 Summary: Utilities for managing filesystem extended attributes
 Name: attr
 Version: 2.4.47
-Release: 3%{?dist}
+Release: 4%{?dist}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: http://download.savannah.gnu.org/releases-noredirect/attr/attr-%{version}.src.tar.gz
 
 # silence compile-time warnings
 Patch1: 0001-attr-2.4.47-warnings.patch
 
+# install /etc/xattr.conf
+Patch2: 0002-attr-2.4.47-xattr-conf.patch
+
 License: GPLv2+
 URL: http://acl.bestbits.at/
 Group: System Environment/Base
@@ -55,6 +58,7 @@ you'll also want to install attr.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -116,8 +120,12 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 
 %files -n libattr
 %{_libdir}/libattr.so.*
+%config(noreplace) %{_sysconfdir}/xattr.conf
 
 %changelog
+* Tue Nov 19 2013 Kamil Dudka <kdudka@redhat.com> 2.4.47-4
+- provide /etc/xattr.conf to exclude copying certain extended attrs (#1031423)
+
 * Fri Aug 09 2013 Kamil Dudka <kdudka@redhat.com> 2.4.47-3
 - drop a docdir-related patch to fix a packaging failure (#991997)