up to 2.50

- upstream patch to fix install of capsh

diff --git a/libcap-install_capsh.patch b/libcap-install_capsh.patch
new file mode 100644 (file)
index 0000000..7ba6739
--- /dev/null
+++ b/libcap-install_capsh.patch
@@ -0,0 +1,38 @@
+From fc82332156dc04c24578aefcb7741d749d025032 Mon Sep 17 00:00:00 2001
+From: "Andrew G. Morgan" <morgan@kernel.org>
+Date: Fri, 28 May 2021 13:41:17 -0700
+Subject: Make capsh an installed binary again
+
+Bug report from Jan Palus:
+
+  https://bugzilla.kernel.org/show_bug.cgi?id=213261
+
+Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
+---
+ progs/Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/progs/Makefile b/progs/Makefile
+index 289186e..2289cf7 100644
+--- a/progs/Makefile
++++ b/progs/Makefile
+@@ -32,14 +32,14 @@ $(BUILD): %: %.o $(DEPS)
+ 
+ install: all
+       mkdir -p -m 0755 $(FAKEROOT)$(SBINDIR)
+-      for p in $(PROGS) ; do \
++      for p in $(PROGS) capsh ; do \
+               install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \
+       done
+ ifeq ($(RAISE_SETFCAP),yes)
+       $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
+ endif
+ 
+-test: $(PROGS)
++test: $(PROGS) capsh
+ 
+ capshdoc.h.cf: capshdoc.h ./mkcapshdoc.sh
+       ./mkcapshdoc.sh > $@
+-- 
+cgit 1.2.3-1.el7
+

diff --git a/libcap.spec b/libcap.spec
index 44f81e69d597a3f5b1efb8725f9c0b16a8c5d171..11a259e8836f4228545d2f72c26e1e31e28ac1ac 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -9,13 +9,14 @@ Summary:      POSIX.1e capability suite
 Summary(pl.UTF-8):     Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):  Biblioteca para leitura e configuração de capabilities.
 Name:          libcap
-Version:       2.49
+Version:       2.50
 Release:       1
 Epoch:         1
 License:       GPL v2 or BSD
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
-# Source0-md5: b43ae3690fe4d2cb32e4d25c0983ecd3
+# Source0-md5: 66a561afa81666236ff973544ff4e864
+Patch0:                %{name}-install_capsh.patch
 URL:           https://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
 %{?with_golang:BuildRequires:  golang}
@@ -94,6 +95,7 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 LDFLAGS="%{rpmldflags}" \