From 6c59fec448a44124a643ad22a940597e1f325266 Mon Sep 17 00:00:00 2001
From: Ken Dawson <dawsonwu@rahul.net>
Date: Sat, 3 Jan 2015 04:08:18 +0000
Subject: Use sys/xattr.h instead of attr/xattr.h.

xattr.h from libattr is not necessary, because glibc ships its own
xattr.h for many years already (since v2.3, so it's like 13 years).
libattr's header included errno.h, thus now it needs to be included
explicitly.

Signed-off-by: Przemyslaw Pawelczyk <przemoc@gmail.com>
---
 metaentry.c | 3 ++-
 metastore.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/metaentry.c b/metaentry.c
index 1f45fca..3ed37e8 100644
--- a/metaentry.c
+++ b/metaentry.c
@@ -25,13 +25,14 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <limits.h>
 #include <dirent.h>
 #include <sys/mman.h>
 #include <utime.h>
 #include <fcntl.h>
 #include <stdint.h>
+#include <errno.h>
 
 #include "metastore.h"
 #include "metaentry.h"
diff --git a/metastore.c b/metastore.c
index 323525a..83f8555 100644
--- a/metastore.c
+++ b/metastore.c
@@ -23,10 +23,11 @@
 #include <sys/stat.h>
 #include <getopt.h>
 #include <utime.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "metastore.h"
 #include "settings.h"
-- 
cgit v1.2.1


From ff3a26bfbf2f3f120a5edf92f9f7a1dfd340187e Mon Sep 17 00:00:00 2001
From: Przemyslaw Pawelczyk <przemoc@gmail.com>
Date: Sun, 8 Feb 2015 01:42:43 +0100
Subject: AUTHORS: Add Ken Dawson.

---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index 4e32aea..d6d099f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@ Current maintainer of unofficial metastore continuation is:
 All other direct and indirect source code contributors are:
 
 	Sergio Callegari                        <sergio.callegari@gmail.com>
+	Ken Dawson                                      <dawsonwu@rahul.net>
 	Dan Fandrich                                <dan@coneharvesters.com>
 	Romain Francoise                             <rfrancoise@debian.org>
 	Joey Hess                                  <joey@kodama.kitenet.net>
-- 
cgit v1.2.1


From 3c3d9053ea088b160ac7c36c27960da254fba976 Mon Sep 17 00:00:00 2001
From: Przemyslaw Pawelczyk <przemoc@gmail.com>
Date: Sun, 8 Feb 2015 01:51:37 +0100
Subject: NEWS: Add information about xattr.h change.

---
 NEWS | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NEWS b/NEWS
index 093f612..15c8946 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 Latest stuff                          (planned release date: 2015-03-??)
 ------------------------------------------------------------------------
 
+ * Dependency on libattr's xattr.h header has been removed.
+   As long as your libc provides sys/xattr.h (glibc does it since v2.3),
+   everything should be fine.
 
 
 Old times                                                    (2007-2014)
-- 
cgit v1.2.1