[arch-commits] Commit in libcap/trunk (2 files)

[David Runge]

    Date: Monday, June 28, 2021 @ 09:46:53
  Author: dvzrv
Revision: 418749

upgpkg: libcap 2.51-1: Upgrade to 2.51.

Remove included patch to add back capsh.

Modified:
  libcap/trunk/PKGBUILD
Deleted:
  libcap/trunk/0001-Make-capsh-an-installed-binary-again.patch

-------------------------------------------------+
 0001-Make-capsh-an-installed-binary-again.patch |   38 ----------------------
 PKGBUILD                                        |   18 +++-------
 2 files changed, 6 insertions(+), 50 deletions(-)

Deleted: 0001-Make-capsh-an-installed-binary-again.patch
===================================================================
--- 0001-Make-capsh-an-installed-binary-again.patch	2021-06-28 09:29:06 UTC (rev 418748)
+++ 0001-Make-capsh-an-installed-binary-again.patch	2021-06-28 09:46:53 UTC (rev 418749)
@@ -1,38 +0,0 @@
-From fc82332156dc04c24578aefcb7741d749d025032 Mon Sep 17 00:00:00 2001
-From: "Andrew G. Morgan" <morgan at kernel.org>
-Date: Fri, 28 May 2021 13:41:17 -0700
-Subject: [PATCH 1/2] 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 at 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 > $@
--- 
-2.32.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-28 09:29:06 UTC (rev 418748)
+++ PKGBUILD	2021-06-28 09:46:53 UTC (rev 418749)
@@ -4,8 +4,8 @@
 # Contributor: Hugo Doria <hugo at archlinux.org>
 
 pkgname=libcap
-pkgver=2.50
-pkgrel=2
+pkgver=2.51
+pkgrel=1
 pkgdesc='POSIX 1003.1e capabilities'
 arch=('x86_64')
 url="https://sites.google.com/site/fullycapable/"
@@ -15,16 +15,13 @@
 provides=('libcap.so' 'libpsx.so')
 source=("https://kernel.org/pub/linux/libs/security/linux-privs/${pkgname}2/${pkgname}-$pkgver.tar."{xz,sign}
         "${pkgname}-2.45-makefile.patch"
-        "0001-Make-capsh-an-installed-binary-again.patch"
 )
-sha512sums=('6ac2df1ea9a9154e082c0595d343380ff8abed953b53c635a9297683289f2fa708eff488a42c6053e5ac556a5d90faa8709b3d98a47b2911f05bf80f2663a543'
+sha512sums=('3b4a97ef864a2ce2f87056ebc282223b0c71ca71c539744dc629ffe7905ca5fdde937ca70c34ec84406fe54863d39abf32775818a5e5a6fdf3069706b1723a88'
             'SKIP'
-            '4f613f83198dfccb8b79e1b2c8764657a85300cb166d633d86b87f46567d51fa9395387caf33e82a8718f19e9a1fc65c11e7b6f63c3c4cde1b2a27f70671ec07'
-            '6b6ac20247e02b54da1b139827625cdad2ade2f8129b9d5e6510788e4748d9ca121c830e1abf99ea10b1a12ec806a23511dbfbc2804eb78dcf4d46ed38daa639')
-b2sums=('be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790'
+            '4f613f83198dfccb8b79e1b2c8764657a85300cb166d633d86b87f46567d51fa9395387caf33e82a8718f19e9a1fc65c11e7b6f63c3c4cde1b2a27f70671ec07')
+b2sums=('9f004e28891fbbb3552016e2e9250eab38935b6b40ad9e808a64ab07eecb52c5fa9032caed0baab719df8afe9aeec98403d10b05336bebe15a50b64020e5afc2'
         'SKIP'
-        '6f50d5a03c3532e6e50506cd878b1c9ca5cee5f1758f9318d4cb5d1e319cbe5f31210ba46a81b1af30730e2329aed7921c11f1a468a596a3f210972ca0da9d64'
-        '92da72a31ef361126191bc7e709a8bd1df36a01d851540462806c7a5277e9c2f9607cd0cd81c70ef2cc5969668edc33345815cab7eb10667a0000a7b6c5988fc')
+        '6f50d5a03c3532e6e50506cd878b1c9ca5cee5f1758f9318d4cb5d1e319cbe5f31210ba46a81b1af30730e2329aed7921c11f1a468a596a3f210972ca0da9d64')
 validpgpkeys=(38A644698C69787344E954CE29EE848AE2CCF3F4) # Andrew G. Morgan <morgan at kernel.org>
 
 prepare() {
@@ -32,9 +29,6 @@
   # SBINDIR is hardcoded to sbin. set to bin
   # add CPPFLAGS
   patch -Np1 -i ../"${pkgname}-2.45-makefile.patch"
-  # install missing capsh binary:
-  # https://bugs.archlinux.org/task/71071
-  patch -Np1 -i ../"0001-Make-capsh-an-installed-binary-again.patch"
 }
 
 build() {