From 8b74fa415edfefeee5869704d39ee8de1e82b422 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 25 May 2014 23:47:24 -0500
Subject: [PATCH 1/1] Remove xattr configuration option

---
 NEWS               |  4 ++++
 README             |  6 ------
 archlinux/PKGBUILD |  3 +--
 configure.ac       | 25 -------------------------
 rpm/wimtools.spec  |  3 +--
 5 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/NEWS b/NEWS
index 4fef76cd..6e6704c1 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,10 @@ Version 1.7.0-BETA:
 
 	On Windows, sparse file attributes are no longer set on extracted files.
 
+	On UNIX, configuring with --disable-xattr or --enable-xattr is no longer
+	supported.  Mounting WIM images now always requires extended attribute
+	support.  Use --without-fuse to disable support for mounting WIM images.
+
 	The shared library version has been bumped up.  The main
 	incompatibilities are:
 
diff --git a/README b/README
index 3a0ef00b..a242e7f6 100644
--- a/README
+++ b/README
@@ -280,12 +280,6 @@ This section documents the most important options that may be passed to the
 	from libcrypto (part of OpenSSL).  The default is to use libcrypto if it
 	is found on the system.
 
---enable-xattr, --disable-xattr
-	Enable or disable support for the extended-attributes interface to NTFS
-	alternate data streams in mounted WIMs.  To support these, wimlib
-	requires that the setxattr() function and the attr/xattr.h header are
-	available.  The default is to autodetect whether support is possible.
-
 --disable-multithreaded-compression
 	By default, data will be compressed using multiple threads when writing
 	a WIM, unless only 1 processor is detected.  Specify this option to
diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 28458460..8157966a 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -18,8 +18,7 @@ source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 
 build() {
 	cd "$pkgname-$pkgver"
-	./configure --with-libcrypto --with-fuse --with-ntfs-3g \
-			--enable-xattr --prefix=/usr
+	./configure --with-libcrypto --with-fuse --with-ntfs-3g --prefix=/usr
 	make
 }
 
diff --git a/configure.ac b/configure.ac
index ac5bee1e..7698dc66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ AC_CHECK_FUNCS([futimens utimensat utime flock mempcpy	\
 # HAVE_*_H macro so that the NTFS-3g headers don't get confused and try to skip
 # including certain headers.
 AC_CHECK_HEADERS([alloca.h		\
-		  attr/xattr.h		\
 		  byteswap.h		\
 		  endian.h		\
 		  errno.h		\
@@ -179,7 +178,6 @@ WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
 WINDOWS_LDADD=""
-ENABLE_XATTR_DEFAULT="autodetect"
 
 case "$host" in
 	*-*-mingw*)
@@ -192,7 +190,6 @@ case "$host" in
 		WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
 		WINDOWS_LDFLAGS="-no-undefined"
 		WINDOWS_LDADD="-lshlwapi"
-		ENABLE_XATTR_DEFAULT="no"
 		;;
 	*-*-cygwin*)
 		# Cygwin (WARNING: not well supported)
@@ -293,28 +290,6 @@ if test "x$WITH_FUSE" = "xyes"; then
 fi
 AM_CONDITIONAL([WITH_FUSE], [test "x$WITH_FUSE" = "xyes"])
 
-ENABLE_XATTR=no
-AC_ARG_ENABLE([xattr],
-	[AS_HELP_STRING([--enable-xattr], [Enable the xattr interface to access WIM
-			alternate data streams (default: autodetect)])],
-	[ENABLE_XATTR=$enableval],
-	[if test "x$ENABLE_XATTR_DEFAULT" = "xautodetect"; then
-		AC_CHECK_FUNC([setxattr],
-			[AC_CHECK_HEADER([attr/xattr.h],
-				[ENABLE_XATTR=yes],
-				[AC_MSG_WARN([Cannot find the "attr/xattr.h" header.  You will not be
-				 able to use the xattr interface to access WIM alternate data
-				 streams.])])],
-			[AC_MSG_WARN([Cannot find the setxattr() function.  You will not be
-			 able to use the xattr interface to access WIM alternate data
-			 streams.])])
-	fi])
-
-if test "x$ENABLE_XATTR" = "xyes"; then
-	AC_DEFINE([ENABLE_XATTR], [1], [Define to 1 if using the xattr
-			interface to WIM alternate data streams])
-fi
-
 AC_MSG_CHECKING([whether to use SSSE3-accelerated SHA1 ])
 AC_ARG_ENABLE([ssse3-sha1],
 	    AS_HELP_STRING([--enable-ssse3-sha1], [use assembly language implementation
diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index a0df471c..8b85e918 100644
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -62,8 +62,7 @@ mounting them.
            --disable-rpath		\
 	   --with-libcrypto		\
 	   --with-ntfs-3g		\
-	   --with-fuse			\
-	   --enable-xattr
+	   --with-fuse
 make %{?_smp_mflags}
 
 %install
-- 
2.43.0