SHA256
1
0
forked from pool/fsarchiver
fsarchiver/fsarchiver-attr.patch
Kyrill Detinov 62118cc3e0 Accepting request 255282 from home:elvigia:branches:Archiving:Backup
- Remove dependency on libattr..it was never linked anyway,
  things still worked because glibc provides the same interface.

OBS-URL: https://build.opensuse.org/request/show/255282
OBS-URL: https://build.opensuse.org/package/show/Archiving:Backup/fsarchiver?expand=0&rev=25
2014-10-12 15:15:44 +00:00

52 lines
1.4 KiB
Diff

--- fsarchiver-0.6.19.orig/src/oper_restore.c
+++ fsarchiver-0.6.19/src/oper_restore.c
@@ -19,12 +19,13 @@
# include "config.h"
#endif
+#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
#include <string.h>
#include <stdlib.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
#include <sys/time.h>
#include <sys/stat.h>
#include <gcrypt.h>
--- fsarchiver-0.6.19.orig/src/oper_save.c
+++ fsarchiver-0.6.19/src/oper_save.c
@@ -28,7 +28,8 @@
#include <sys/mount.h>
#include <sys/statvfs.h>
#include <sys/stat.h>
-#include <attr/xattr.h>
+#include <errno.h>
+#include <sys/xattr.h>
#include <zlib.h>
#include <assert.h>
#include <gcrypt.h>
@@ -57,6 +58,10 @@
#include "error.h"
#include "queue.h"
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
+
typedef struct s_savear
{ carchwriter ai;
cregmulti regmulti;
--- fsarchiver-0.6.19.orig/configure.ac
+++ fsarchiver-0.6.19/configure.ac
@@ -88,7 +88,7 @@ PKG_CHECK_MODULES([BLKID], [blkid])
PKG_CHECK_MODULES([UUID], [uuid])
dnl Check for header files installed with a library
-AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
+AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
dnl Check for standard header files.
AC_CHECK_HEADERS([malloc.h unistd.h pthread.h])