- Backport fix from upstream to use glibc's xattr instead of libattr
* Add patch: 0001-stop-requiring-attr-xattr.patch - Use full author identities in changelog entries OBS-URL: https://build.opensuse.org/package/show/system:packagemanager:dnf/librepo?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
parent
2a01902650
commit
4ee20b8846
116
0001-stop-requiring-attr-xattr.patch
Normal file
116
0001-stop-requiring-attr-xattr.patch
Normal file
@ -0,0 +1,116 @@
|
||||
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"
|
||||
@ -1,5 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 00:45:16 UTC 2018 - ngompa13@gmail.com
|
||||
Thu Sep 13 11:19:32 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Backport fix from upstream to use glibc's xattr instead of libattr
|
||||
* Add patch: 0001-stop-requiring-attr-xattr.patch
|
||||
- Use full author identities in changelog entries
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 4 00:45:16 UTC 2018 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Upgrade to 1.8.1
|
||||
+ Fix memory leaks in Python bindings (gh#rpm-software-management/librepo#83)
|
||||
@ -8,22 +15,22 @@ Thu Jan 4 00:45:16 UTC 2018 - ngompa13@gmail.com
|
||||
+ Fix max download speed from repo (rh#1227921)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 13 17:13:45 UTC 2017 - ngompa13@gmail.com
|
||||
Sun Aug 13 17:13:45 UTC 2017 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Disable running unit tests by default because of random pygpgme failures
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 20 14:35:02 UTC 2017 - ngompa13@gmail.com
|
||||
Mon Feb 20 14:35:02 UTC 2017 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Update to 1.7.20
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 1 06:28:16 UTC 2016 - ngompa13@gmail.com
|
||||
Mon Feb 1 06:28:16 UTC 2016 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Use SUSE-specific groups and tags
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 1 06:15:57 UTC 2016 - ngompa13@gmail.com
|
||||
Mon Feb 1 06:15:57 UTC 2016 - Neal Gompa <ngompa13@gmail.com>
|
||||
|
||||
- Initial packaging of librepo derived from Mageia packaging
|
||||
|
||||
|
||||
@ -40,15 +40,17 @@ Summary: Repodata downloading library
|
||||
License: LGPL-2.0+
|
||||
Group: System/Libraries
|
||||
|
||||
Url: https://github.com/rpm-software-management/librepo
|
||||
URL: https://github.com/rpm-software-management/librepo
|
||||
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
|
||||
# Backports from upstream
|
||||
Patch0001: 0001-stop-requiring-attr-xattr.patch
|
||||
|
||||
BuildRequires: check-devel
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: glib2-devel >= 2.26.0
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: libattr-devel
|
||||
BuildRequires: libcurl-devel >= 7.19.0
|
||||
BuildRequires: libexpat-devel
|
||||
BuildRequires: openssl-devel
|
||||
@ -115,7 +117,7 @@ Python 3 bindings for the librepo library.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%autosetup -p1
|
||||
|
||||
%if %{with python3}
|
||||
rm -rf py3
|
||||
|
||||
Loading…
Reference in New Issue
Block a user