aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs/libcap
diff options
context:
space:
mode:
Diffstat (limited to 'package/libs/libcap')
-rw-r--r--package/libs/libcap/Makefile7
-rw-r--r--package/libs/libcap/patches/300-disable-tests.patch2
-rw-r--r--package/libs/libcap/patches/900-use-more-compatible-shebang.patch8
3 files changed, 14 insertions, 3 deletions
diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile
index b8e45a52c77..989209302a4 100644
--- a/package/libs/libcap/Makefile
+++ b/package/libs/libcap/Makefile
@@ -6,16 +6,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libcap
-PKG_VERSION:=2.48
+PKG_VERSION:=2.69
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2
-PKG_HASH:=4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2
+PKG_HASH:=f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb
PKG_MAINTAINER:=Paul Wassi <p.wassi@gmx.at>
PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=License
+PKG_CPE_ID:=cpe:/a:libcap_project:libcap
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
@@ -74,6 +75,8 @@ MAKE_FLAGS += \
DYNAMIC="yes" \
lib="lib"
+TARGET_CFLAGS += $(FPIC)
+
ifneq ($(CONFIG_PACKAGE_libcap-bin-capsh-shell),)
TARGET_CFLAGS += -DSHELL='\"$(CONFIG_PACKAGE_libcap-bin-capsh-shell)\"'
endif
diff --git a/package/libs/libcap/patches/300-disable-tests.patch b/package/libs/libcap/patches/300-disable-tests.patch
index c1779e28ecf..1cf9cc4ea6a 100644
--- a/package/libs/libcap/patches/300-disable-tests.patch
+++ b/package/libs/libcap/patches/300-disable-tests.patch
@@ -7,4 +7,4 @@
- $(MAKE) -C tests $@
$(MAKE) -C progs $@
$(MAKE) -C doc $@
- $(MAKE) -C kdebug $@
+
diff --git a/package/libs/libcap/patches/900-use-more-compatible-shebang.patch b/package/libs/libcap/patches/900-use-more-compatible-shebang.patch
new file mode 100644
index 00000000000..454c703fbe7
--- /dev/null
+++ b/package/libs/libcap/patches/900-use-more-compatible-shebang.patch
@@ -0,0 +1,8 @@
+--- a/progs/mkcapshdoc.sh
++++ b/progs/mkcapshdoc.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ # This script generates some C code for inclusion in the capsh binary.
+ # The Makefile generally only generates the .c code and compares it
+ # with the checked in code in the progs directory.