Skip to contentSkip to conversation

package/libcap: bump to version 2.42

PATCH New Fabrice Fontaine 2 participants 2 messages Aug 29, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libcap: bump to version 2.42

- Drop first patch (already in version:
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=22f2e207f7824d231aab4de973e547f006e3ea3c)
- Drop second patch (already in version:
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=786b64b72b5ba3d4b6195f40c0096932d2c72b57)
- Drop third patch (not needed since
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit?id=f1c3ac995d02d4f17b9d15656ab6d58f4c87435a)
- Update indentation in hash file (two spaces)

---
 ...d-system-fixes-for-cross-compilation.patch | 53 -------------------
 ...tall-into-install-shared-install-sta.patch | 48 -----------------
 ....c-fix-build-with-old-kernel-headers.patch | 51 ------------------
 package/libcap/libcap.hash                    |  4 +-
 package/libcap/libcap.mk                      |  2 +-
 5 files changed, 3 insertions(+), 155 deletions(-)
 delete mode 100644 package/libcap/0001-build-system-fixes-for-cross-compilation.patch
 delete mode 100644 package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
 delete mode 100644 package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch
package/libcap/0001-build-system-fixes-for-cross-compilation.patch deleted +0 -53
deleted file mode 100644
index de2409085e..0000000000
@@ -1,53 +0,0 @@
-From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <[email protected]>
-Date: Sun, 6 Mar 2016 22:52:02 +0100
-Subject: [PATCH] build-system: fixes for cross-compilation
-
-Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-[yann.morin.1998 at free.fr: dont chmod +x the shared lib]
-Signed-off-by: "Yann E. MORIN" <[email protected]>
-
-diff --git a/Make.Rules b/Make.Rules
-index 8347b26..8a07a3f 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -48,26 +48,26 @@ MINOR=25
- KERNEL_HEADERS := $(topdir)/libcap/include/uapi
- IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
- 
--CC := gcc
--CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--BUILD_CC := $(CC)
--BUILD_CFLAGS := $(CFLAGS) $(IPATH)
--AR := ar
--RANLIB := ranlib
-+CC ?= gcc
-+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+BUILD_CC ?= $(CC)
-+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
-+AR ?= ar
-+RANLIB ?= ranlib
- DEBUG = -g #-DDEBUG
- WARNINGS=-Wall -Wwrite-strings \
-         -Wpointer-arith -Wcast-qual -Wcast-align \
-         -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
-+LDFLAGS ?= #-g
- BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
- 
- SYSTEM_HEADERS = /usr/include
- INCS=$(topdir)/libcap/include/sys/capability.h
- LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
--PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
-+PAM_CAP = no
- INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
- DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
- 
--- 
-1.9.1
-
package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch deleted +0 -48

48 lines not on this page · raw message

package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch deleted +0 -51

51 lines not on this page · raw message

package/libcap/libcap.hash +2 -2
index cbef0dc86d..19044cab01 100644
@@ -1,5 +1,5 @@
 # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
-sha256	dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a  libcap-2.27.tar.xz
+sha256  3605a9cb60076547ea9f64989e0ba576da9508e4653e8dc40ae54c0d6f443dfd  libcap-2.42.tar.xz
 
 # Hash for license file:
-sha256	088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc  License
+sha256  088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc  License
package/libcap/libcap.mk +1 -1
index 4919a4adca..08c1bc9deb 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCAP_VERSION = 2.27
+LIBCAP_VERSION = 2.42
 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
 LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/libcap: bump to version 2.42

Quoted 9 lines · On Sat, 29 Aug 2020 22:57:31 +0200 Fabrice Fontaine…

- Drop first patch (already in version:
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=22f2e207f7824d231aab4de973e547f006e3ea3c)
- Drop second patch (already in version:
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=786b64b72b5ba3d4b6195f40c0096932d2c72b57)
- Drop third patch (not needed since
https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit?id=f1c3ac995d02d4f17b9d15656ab6d58f4c87435a)
- Update indentation in hash file (two spaces)

Quoted 10 lines
---
 ...d-system-fixes-for-cross-compilation.patch | 53 -------------------
 ...tall-into-install-shared-install-sta.patch | 48 -----------------
 ....c-fix-build-with-old-kernel-headers.patch | 51 ------------------
 package/libcap/libcap.hash                    |  4 +-
 package/libcap/libcap.mk                      |  2 +-
 5 files changed, 3 insertions(+), 155 deletions(-)
 delete mode 100644 package/libcap/0001-build-system-fixes-for-cross-compilation.patch
 delete mode 100644 package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
 delete mode 100644 package/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com