File 0001-stop-requiring-attr-xattr.patch of Package librepo

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-stop-requiring-attr-xattr.patch of Package librepo (Revision 4fb90681b440dcf7477271b40854ac25)

Currently displaying revision 4fb90681b440dcf7477271b40854ac25 , Show latest

From 1dff9c2c8271ba7019b9a9a4d3612b6d4ff86b2b Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Sat, 10 Feb 2018 18:28:28 +0100
Subject: [PATCH] stop requiring attr(xattr)

Latest xattr dropped xattr bits because they are in glibc.

Fixes: https://github.com/rpm-software-management/librepo/issues/121
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
---
 CMakeLists.txt                |  1 -
 cmake/Modules/FindXattr.cmake | 29 -----------------------------
 librepo/checksum.c            |  3 ++-
 librepo/downloader.c          |  2 +-
 tests/test_checksum.c         |  3 ++-
 5 files changed, 5 insertions(+), 33 deletions(-)
 delete mode 100644 cmake/Modules/FindXattr.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5c8c2e..90cf9b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,6 @@ PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
 FIND_PACKAGE(EXPAT REQUIRED)
 FIND_PACKAGE(CURL REQUIRED)
 FIND_PACKAGE(Gpgme REQUIRED)
-FIND_PACKAGE(Xattr REQUIRED)
 
 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
 
diff --git a/cmake/Modules/FindXattr.cmake b/cmake/Modules/FindXattr.cmake
deleted file mode 100644
index fce2c56..0000000
--- a/cmake/Modules/FindXattr.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
-# XATTR_FOUND libattr found
-# XATTR_INCLUDE_DIRS include directories
-# XATTR_LIBRARIES libattr library
-
-FIND_PATH(XATTR_INCLUDE attr/xattr.h
-    /usr/include
-    /usr/local/include
-    ${CMAKE_INCLUDE_PATH}
-    ${CMAKE_INSTALL_PREFIX}/usr/include
-)
-
-FIND_LIBRARY(XATTR_LIB NAMES attr libattr
-    PATHS
-        ${CMAKE_LIBRARY_PATH}
-        ${CMAKE_INSTALL_PREFIX}/lib
-)
-
-IF(XATTR_INCLUDE AND XATTR_LIB)
-  SET(XATTR_FOUND TRUE)
-  SET(XATTR_INCLUDE_DIRS ${XATTR_INCLUDE})
-  SET(XATTR_LIBRARIES ${XATTR_LIB})
-  MESSAGE(STATUS "Found xattr")
-ELSE(XATTR_INCLUDE AND XATTR_LIB)
-  SET(XATTR_FOUND FALSE)
-  SET(XATTR_LIBRARIES "")
-  MESSAGE(STATUS "Not found xattr")
-ENDIF(XATTR_INCLUDE AND XATTR_LIB)
-
-MARK_AS_ADVANCED( XATTR_LIB XATTR_INCLUDE )
diff --git a/librepo/checksum.c b/librepo/checksum.c
index d005397..f55735c 100644
--- a/librepo/checksum.c
+++ b/librepo/checksum.c
@@ -23,10 +23,11 @@
 #include <assert.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/xattr.h>
 #include <unistd.h>
-#include <attr/xattr.h>
 #include <openssl/evp.h>
 
 #include "cleanup.h"
diff --git a/librepo/downloader.c b/librepo/downloader.c
index 5995da0..cf4f050 100644
--- a/librepo/downloader.c
+++ b/librepo/downloader.c
@@ -28,9 +28,9 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/xattr.h>
 #include <fcntl.h>
 #include <curl/curl.h>
-#include <attr/xattr.h>
 
 #include "downloader.h"
 #include "downloader_internal.h"
diff --git a/tests/test_checksum.c b/tests/test_checksum.c
index ab75038..023ae55 100644
--- a/tests/test_checksum.c
+++ b/tests/test_checksum.c
@@ -1,12 +1,13 @@
 #define _GNU_SOURCE
+#include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/xattr.h>
 #include <fcntl.h>
-#include <attr/xattr.h>
 
 #include "librepo/util.h"
 #include "librepo/checksum.h"

Places

File 0001-stop-requiring-attr-xattr.patch of Package librepo (Revision 4fb90681b440dcf7477271b40854ac25)

Places