From b0e929f4d5c41f8c5b1054895327a718ec83f7a6 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 28 Oct 2013 15:00:30 +0100
Subject: add new package libcap

---
 package/libcap/Makefile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/libcap/Makefile

(limited to 'package/libcap/Makefile')

diff --git a/package/libcap/Makefile b/package/libcap/Makefile
new file mode 100644
index 000000000..af8fef397
--- /dev/null
+++ b/package/libcap/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		libcap
+PKG_VERSION:=		2.22
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ce64058bdb3f086ddbfca8ce6c919845
+PKG_DESCR:=		capabilities library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.friedhoff.org/posixfilecaps.html
+PKG_SITES:=		http://openadk.org/distfiles/
+PKG_OPTS:=		dev
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:=		manual
+
+libcap-install:
+	$(INSTALL_DIR) $(IDIR_LIBCAP)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libcap*.so* \
+		$(IDIR_LIBCAP)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3


From c82dab24ed58a919a52fa121e064c6125ceb803a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 8 Nov 2013 16:32:10 +0100
Subject: fix cross-compile on Darwin

---
 package/libcap/Makefile                       |  4 +++-
 package/libcap/patches/patch-Make_Rules       | 12 +++++++++---
 package/libcap/patches/patch-libcap_Makefile  |  2 +-
 package/libcap/patches/patch-pam_cap_Makefile | 10 ++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 package/libcap/patches/patch-pam_cap_Makefile

(limited to 'package/libcap/Makefile')

diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index af8fef397..40ebae489 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -5,10 +5,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libcap
 PKG_VERSION:=		2.22
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		ce64058bdb3f086ddbfca8ce6c919845
 PKG_DESCR:=		capabilities library
 PKG_SECTION:=		libs
+PKG_BUILDDEP:=		pam
 PKG_URL:=		http://www.friedhoff.org/posixfilecaps.html
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
@@ -19,6 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBCAP,libcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CPPFLAGS_FOR_BUILD+=	-I$(LINUX_HEADER_DIR)/include
 CONFIG_STYLE:=		manual
 
 libcap-install:
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules
index 95bd663d9..09f31b3b4 100644
--- a/package/libcap/patches/patch-Make_Rules
+++ b/package/libcap/patches/patch-Make_Rules
@@ -1,5 +1,5 @@
 --- libcap-2.22.orig/Make.Rules	2011-07-25 04:18:23.000000000 +0200
-+++ libcap-2.22/Make.Rules	2013-10-28 11:38:54.000000000 +0100
++++ libcap-2.22/Make.Rules	2013-11-08 16:22:41.000000000 +0100
 @@ -12,10 +12,6 @@ FAKEROOT=$(DESTDIR)
  # These choices are motivated by the fact that getcap and setcap are
  # administrative operations that could be needed to recover a system.
@@ -29,7 +29,7 @@
  
  # common defines for libcap
  LIBTITLE=libcap
-@@ -47,8 +43,9 @@ MINOR=22
+@@ -47,12 +43,13 @@ MINOR=22
  KERNEL_HEADERS := $(topdir)/libcap/include
  IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
  
@@ -40,7 +40,13 @@
 +CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
  BUILD_CC := $(CC)
  BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- AR := ar
+-AR := ar
+-RANLIB := ranlib
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
 @@ -64,11 +61,11 @@ LDFLAGS := #-g
  SYSTEM_HEADERS = /usr/include
  INCS=$(topdir)/libcap/include/sys/capability.h
diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile
index 034353ad5..f45b642c9 100644
--- a/package/libcap/patches/patch-libcap_Makefile
+++ b/package/libcap/patches/patch-libcap_Makefile
@@ -5,7 +5,7 @@
  
  _makenames: _makenames.c cap_names.list.h
 -	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
++	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
  
  cap_names.h: _makenames
  	./_makenames > cap_names.h
diff --git a/package/libcap/patches/patch-pam_cap_Makefile b/package/libcap/patches/patch-pam_cap_Makefile
new file mode 100644
index 000000000..5608fece5
--- /dev/null
+++ b/package/libcap/patches/patch-pam_cap_Makefile
@@ -0,0 +1,10 @@
+--- libcap-2.22.orig/pam_cap/Makefile	2010-08-09 02:08:01.000000000 +0200
++++ libcap-2.22/pam_cap/Makefile	2013-11-08 16:29:05.000000000 +0100
+@@ -10,7 +10,6 @@ include ../Make.Rules
+ LDLIBS += -L../libcap -lcap
+ 
+ all: pam_cap.so
+-	$(MAKE) testcompile
+ 
+ install: all
+ 	mkdir -p -m 0755 $(LIBDIR)/security
-- 
cgit v1.2.3