[arch-commits] Commit in libcap/repos (4 files)
David Runge
dvzrv at archlinux.org
Mon Jun 7 17:27:43 UTC 2021
Date: Monday, June 7, 2021 @ 17:27:42
Author: dvzrv
Revision: 417302
archrelease: copy trunk to testing-x86_64
Added:
libcap/repos/testing-x86_64/
libcap/repos/testing-x86_64/0001-Make-capsh-an-installed-binary-again.patch
(from rev 417301, libcap/trunk/0001-Make-capsh-an-installed-binary-again.patch)
libcap/repos/testing-x86_64/PKGBUILD
(from rev 417301, libcap/trunk/PKGBUILD)
libcap/repos/testing-x86_64/libcap-2.45-makefile.patch
(from rev 417301, libcap/trunk/libcap-2.45-makefile.patch)
-------------------------------------------------+
0001-Make-capsh-an-installed-binary-again.patch | 38 ++++++++++++++
PKGBUILD | 57 ++++++++++++++++++++++
libcap-2.45-makefile.patch | 21 ++++++++
3 files changed, 116 insertions(+)
Copied: libcap/repos/testing-x86_64/0001-Make-capsh-an-installed-binary-again.patch (from rev 417301, libcap/trunk/0001-Make-capsh-an-installed-binary-again.patch)
===================================================================
--- testing-x86_64/0001-Make-capsh-an-installed-binary-again.patch (rev 0)
+++ testing-x86_64/0001-Make-capsh-an-installed-binary-again.patch 2021-06-07 17:27:42 UTC (rev 417302)
@@ -0,0 +1,38 @@
+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
+
Copied: libcap/repos/testing-x86_64/PKGBUILD (from rev 417301, libcap/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2021-06-07 17:27:42 UTC (rev 417302)
@@ -0,0 +1,57 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Hugo Doria <hugo at archlinux.org>
+
+pkgname=libcap
+pkgver=2.50
+pkgrel=2
+pkgdesc='POSIX 1003.1e capabilities'
+arch=('x86_64')
+url="https://sites.google.com/site/fullycapable/"
+license=('GPL2')
+depends=('glibc' 'pam')
+makedepends=('linux-api-headers')
+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'
+ 'SKIP'
+ '4f613f83198dfccb8b79e1b2c8764657a85300cb166d633d86b87f46567d51fa9395387caf33e82a8718f19e9a1fc65c11e7b6f63c3c4cde1b2a27f70671ec07'
+ '6b6ac20247e02b54da1b139827625cdad2ade2f8129b9d5e6510788e4748d9ca121c830e1abf99ea10b1a12ec806a23511dbfbc2804eb78dcf4d46ed38daa639')
+b2sums=('be83dfe1e55a4363936f53afb13edd2c1fd8c9bc27f7946bfda1eb8fb3046d0370997dcf85ba9dab7de10673527b4e8d15f104a75eaf407cba8ed0fc42465790'
+ 'SKIP'
+ '6f50d5a03c3532e6e50506cd878b1c9ca5cee5f1758f9318d4cb5d1e319cbe5f31210ba46a81b1af30730e2329aed7921c11f1a468a596a3f210972ca0da9d64'
+ '92da72a31ef361126191bc7e709a8bd1df36a01d851540462806c7a5277e9c2f9607cd0cd81c70ef2cc5969668edc33345815cab7eb10667a0000a7b6c5988fc')
+validpgpkeys=(38A644698C69787344E954CE29EE848AE2CCF3F4) # Andrew G. Morgan <morgan at kernel.org>
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ # 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() {
+ cd "$pkgname-$pkgver"
+ make KERNEL_HEADERS='/usr/include' lib='lib' prefix='/usr'
+}
+
+check() {
+ cd "$pkgname-$pkgver"
+ make test
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" RAISE_SETFCAP='no' lib='lib' prefix='/usr' install
+ # docs
+ install -vDm 644 {CHANGELOG,README} -t "${pkgdir}/usr/share/doc/${pkgname}/"
+ install -vDm 644 pam_cap/capability.conf \
+ -t "$pkgdir/usr/share/doc/$pkgname/examples/"
+}
Copied: libcap/repos/testing-x86_64/libcap-2.45-makefile.patch (from rev 417301, libcap/trunk/libcap-2.45-makefile.patch)
===================================================================
--- testing-x86_64/libcap-2.45-makefile.patch (rev 0)
+++ testing-x86_64/libcap-2.45-makefile.patch 2021-06-07 17:27:42 UTC (rev 417302)
@@ -0,0 +1,21 @@
+diff -ruN a/Make.Rules b/Make.Rules
+--- a/Make.Rules 2020-11-03 02:38:59.000000000 +0100
++++ b/Make.Rules 2020-11-06 16:55:10.149893784 +0100
+@@ -37,7 +37,7 @@
+ # Target directories
+
+ MANDIR=$(man_prefix)/man
+-SBINDIR=$(exec_prefix)/sbin
++SBINDIR=$(exec_prefix)/bin
+ INCDIR=$(inc_prefix)/include
+ LIBDIR=$(lib_prefix)/$(lib)
+ PKGCONFIGDIR=$(LIBDIR)/pkgconfig
+@@ -79,7 +79,7 @@
+ SYSTEM_HEADERS = /usr/include
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+-CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
++CFLAGS += $(CPPFLAGS) -Dlinux $(WARNINGS) $(DEBUG)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+
+ # SHARED tracks whether or not the SHARED libraries (libcap.so,
More information about the arch-commits
mailing list