libcap: update to 2.18

4 files changed, 27 insertions, 39 deletions

diff --git a/libcap/.footprint b/libcap/.footprint
index 657fe0c86..01a332d67 100644
--- a/libcap/.footprint
+++ b/libcap/.footprint
@@ -1,13 +1,21 @@
+drwxr-xr-x	root/root	lib/
+lrwxrwxrwx	root/root	lib/libcap.so.2 -> libcap.so.2.18
+-rw-r--r--	root/root	lib/libcap.so.2.18
+drwxr-xr-x	root/root	sbin/
+-rwxr-xr-x	root/root	sbin/capsh
+-rwxr-xr-x	root/root	sbin/getcap
+-rwxr-xr-x	root/root	sbin/getpcaps
+-rwxr-xr-x	root/root	sbin/setcap
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/sys/
 -rw-r--r--	root/root	usr/include/sys/capability.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libcap.a
-lrwxrwxrwx	root/root	usr/lib/libcap.so -> libcap.so.2
-lrwxrwxrwx	root/root	usr/lib/libcap.so.2 -> libcap.so.2.17
--rw-r--r--	root/root	usr/lib/libcap.so.2.17
+lrwxrwxrwx	root/root	usr/lib/libcap.so -> ../../lib/libcap.so.2.18
 drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/capsh.1.gz
 drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/cap_clear.3.gz
 -rw-r--r--	root/root	usr/man/man3/cap_clear_flag.3.gz
@@ -34,8 +42,6 @@ drwxr-xr-x	root/root	usr/man/man3/
 -rw-r--r--	root/root	usr/man/man3/capgetp.3.gz
 -rw-r--r--	root/root	usr/man/man3/capsetp.3.gz
 -rw-r--r--	root/root	usr/man/man3/libcap.3.gz
-drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/capsh
--rwxr-xr-x	root/root	usr/sbin/getcap
--rwxr-xr-x	root/root	usr/sbin/getpcaps
--rwxr-xr-x	root/root	usr/sbin/setcap
+drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/getcap.8.gz
+-rw-r--r--	root/root	usr/man/man8/setcap.8.gz
diff --git a/libcap/.md5sum b/libcap/.md5sum
index 7ae8394d7..adcd7894b 100644
--- a/libcap/.md5sum
+++ b/libcap/.md5sum
@@ -1,2 +1 @@
-0d1cee9631768d29b43f450832668687  libcap-2.17-makefile.patch
-fa8c3841ce491b379de316a195e65da2  libcap-2.17.tar.gz
+869c453e29abc9231294747b28164f6e  libcap-2.18.tar.bz2
diff --git a/libcap/Pkgfile b/libcap/Pkgfile
index c4730a5d6..d1f5faca0 100644
--- a/libcap/Pkgfile
+++ b/libcap/Pkgfile
@@ -1,26 +1,23 @@
 # Description: POSIX.1e capabilities library
-# URL: http://linux.kernel.org/pub/linux/libs/security/linux-privs/
+# URL: http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/README
 # Maintainer: Antti Nykanen, aon at iki dot fi
 # Depends on: libattr
 
 name=libcap
-version=2.17
+version=2.18
 release=1
-source=(ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/libcap-$version.tar.gz
-	$name-$version-makefile.patch)
+source=(ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-$version.tar.bz2)
 
 build () {
-	cd libcap-$version
-	
-	patch -p0 -i $SRC/$name-$version-makefile.patch
+    cd libcap-$version
 
-	make
-	make \
-		INCDIR=$PKG/usr/include \
-		LIBDIR=$PKG/usr/lib \
-		SBINDIR=$PKG/usr/sbin \
-		MANDIR=$PKG/usr/man install
+    sed -i '/^CFLAGS :=/s/:/\?/' Make.Rules 
 
-	# man8 is empty, cap{set,get}(2) come from core/man-pages
-	rm -rf $PKG/usr/man/man{2,8}
+    make
+    make DESTDIR=$PKG man_prefix=/usr install
+
+    install -d $PKG/usr/lib
+    mv $PKG/lib/libcap.a $PKG/usr/lib
+    rm $PKG/lib/libcap.so
+    ln -s ../../lib/libcap.so.$version $PKG/usr/lib/libcap.so
 }
diff --git a/libcap/libcap-2.17-makefile.patch b/libcap/libcap-2.17-makefile.patch
deleted file mode 100644
index 529c437a5..000000000
--- a/libcap/libcap-2.17-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libcap/Makefile~	2008-12-04 09:03:12.000000000 +0200
-+++ libcap/Makefile	2009-01-12 17:17:07.000000000 +0200
-@@ -27,11 +27,6 @@
- 
- all: $(MINLIBNAME) $(STALIBNAME)
- 
--ifeq ($(shell gperf --version > /dev/null 2>&1 && echo yes),yes)
--USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
--INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
--endif
--
- _makenames: _makenames.c cap_names.list.h
- 	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
-