From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 11 Oct 2010 21:56:06 +0000 (+0200)
Subject: Updated libcap (2.19).
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~66
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0b2307b2f078e871cd416edd1dae0567084953f2

Updated libcap (2.19).
---

diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 710f1c2dd6..90e2365288 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,28 +1,40 @@
+#lib/libcap.a
 lib/libcap.so
 lib/libcap.so.1
-lib/libcap.so.1.10
-sbin/execcap
+lib/libcap.so.2
+lib/libcap.so.2.19
+lib/security/pam_cap.so
+sbin/capsh
+sbin/getcap
 sbin/getpcaps
-sbin/setpcaps
-sbin/sucap
+sbin/setcap
 #usr/include/sys/capability.h
 usr/lib/libnewt.so.0.51
-#usr/man/man2
-#usr/man/man2/capget.2
-#usr/man/man2/capset.2
-#usr/man/man3/_cap_names.3
-#usr/man/man3/cap_clear.3
-#usr/man/man3/cap_copy_ext.3
-#usr/man/man3/cap_copy_int.3
-#usr/man/man3/cap_dup.3
-#usr/man/man3/cap_free.3
-#usr/man/man3/cap_from_text.3
-#usr/man/man3/cap_get_flag.3
-#usr/man/man3/cap_get_proc.3
-#usr/man/man3/cap_init.3
-#usr/man/man3/cap_set_flag.3
-#usr/man/man3/cap_set_proc.3
-#usr/man/man3/cap_size.3
-#usr/man/man3/cap_to_text.3
-#usr/man/man3/capgetp.3
-#usr/man/man3/capsetp.3
+#usr/share/man/man1/capsh.1
+#usr/share/man/man3/cap_clear.3
+#usr/share/man/man3/cap_clear_flag.3
+#usr/share/man/man3/cap_compare.3
+#usr/share/man/man3/cap_copy_ext.3
+#usr/share/man/man3/cap_copy_int.3
+#usr/share/man/man3/cap_dup.3
+#usr/share/man/man3/cap_free.3
+#usr/share/man/man3/cap_from_name.3
+#usr/share/man/man3/cap_from_text.3
+#usr/share/man/man3/cap_get_fd.3
+#usr/share/man/man3/cap_get_file.3
+#usr/share/man/man3/cap_get_flag.3
+#usr/share/man/man3/cap_get_pid.3
+#usr/share/man/man3/cap_get_proc.3
+#usr/share/man/man3/cap_init.3
+#usr/share/man/man3/cap_set_fd.3
+#usr/share/man/man3/cap_set_file.3
+#usr/share/man/man3/cap_set_flag.3
+#usr/share/man/man3/cap_set_proc.3
+#usr/share/man/man3/cap_size.3
+#usr/share/man/man3/cap_to_name.3
+#usr/share/man/man3/cap_to_text.3
+#usr/share/man/man3/capgetp.3
+#usr/share/man/man3/capsetp.3
+#usr/share/man/man3/libcap.3
+#usr/share/man/man8/getcap.8
+#usr/share/man/man8/setcap.8
diff --git a/lfs/libcap b/lfs/libcap
index c56ae6bf34..78b5d34a2c 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.10
+VER        = 2.19
 
 THISAPP    = libcap-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c09eea823f67cfdde96177a959bc39b
+$(DL_FILE)_MD5 = eb1ff04d39bfa2342b8e78b0fd60dc2d
 
 install : $(TARGET)
 
@@ -69,11 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-syscall.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-shared.patch
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
+	# link for old binaries
+	ln -s libcap.so.2 /lib/libcap.so.1
 	chmod +x /lib/libcap.so.*
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)