From 99792f54eda344dc1451c50413130a205e0b66d6 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sun, 17 Jan 2021 10:32:12 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libcap.git#7408f6c23e9553236f0deebef3ed4f3ce8cce794 --- .gitignore | 2 ++ libcap-2.44-buildflags.patch | 25 ------------------------- libcap.spec | 12 ++++++------ sources | 2 +- 4 files changed, 9 insertions(+), 32 deletions(-) delete mode 100644 libcap-2.44-buildflags.patch diff --git a/.gitignore b/.gitignore index d8e5cf2..6c34aa0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ libcap-2.17.tar.gz /libcap-2.25.tar.gz /libcap-2.26.tar.gz /libcap-2.44.tar.gz +/libcap-0.2.46.tar.gz +/libcap-2.46.tar.gz diff --git a/libcap-2.44-buildflags.patch b/libcap-2.44-buildflags.patch deleted file mode 100644 index f821d8a..0000000 --- a/libcap-2.44-buildflags.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up ./Make.Rules.rh ./Make.Rules ---- ./Make.Rules.rh 2020-10-21 14:35:56.645593319 +0200 -+++ ./Make.Rules 2020-10-21 14:38:34.794968440 +0200 -@@ -56,10 +56,10 @@ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(t - - CC := $(CROSS_COMPILE)gcc - DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --COPTS ?= -O2 -+COPTS ?= $(RPM_OPT_FLAGS) - CFLAGS ?= $(COPTS) $(DEFINES) - BUILD_CC ?= $(CC) --BUILD_COPTS ?= -O2 -+BUILD_COPTS ?= $(RPM_OPT_FLAGS) - BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH) - AR := $(CROSS_COMPILE)ar - RANLIB := $(CROSS_COMPILE)ranlib -@@ -69,7 +69,7 @@ WARNINGS=-Wall -Wwrite-strings \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS ?= #-g -+LDFLAGS ?= $(RPM_LD_FLAGS) - LIBCAPLIB := -L$(topdir)/libcap -lcap - LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread -Wl,-wrap,pthread_create - diff --git a/libcap.spec b/libcap.spec index 5eb51f0..4dfecc1 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,15 +1,14 @@ Name: libcap -Version: 2.44 +Version: 2.46 Release: 1%{?dist} Summary: Library for getting and setting POSIX.1e capabilities URL: https://sites.google.com/site/fullycapable/ License: BSD or GPLv2 Source: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/%{name}-%{version}.tar.gz -# http://manned.org/getpcaps/299a4949/src: -Patch0: libcap-2.44-buildflags.patch BuildRequires: libattr-devel pam-devel perl-interpreter gcc +BuildRequires: make %description libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) @@ -40,8 +39,7 @@ Install libcap-devel if you want to develop or compile applications using libcap. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build # libcap can not be build with _smp_mflags: @@ -63,7 +61,6 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %ldconfig_scriptlets %files -%{!?_licensedir:%global license %%doc} %license License %doc doc/capability.notes %{_libdir}/*.so.* @@ -85,6 +82,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %changelog +* Sun Jan 17 2021 Peter Robinson - 2.46-1 +- Update to 0.2.46 + * Wed Oct 21 2020 Karsten Hopp - 2.44-1 - update to 2.44 - remove additional getpcaps manpage as it now included in the sources diff --git a/sources b/sources index 920b392..4662b98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libcap-2.44.tar.gz) = 29feb4a503aee7b86dba882175b0b76f05aed39c63ddcf47a7db7d62ab517a40c506dadfc40ddd1911f551dbe5bb26e447bb4c1024b298658a86750caab67144 +SHA512 (libcap-2.46.tar.gz) = d7d6d8d02701c2bef8f5095a0c923c1bb7033167894d573ad1c935d36d338adb9e58fe2e2779d5e9e8efaf5fe9bc87f43a85eafc733b76f953636038868d73d2