Merge branch 'next' into temp-c165-development

[people/pmueller/ipfire-2.x.git] / lfs / libcap

diff --git a/lfs/libcap b/lfs/libcap
index 78b5d34a2ca295d624dc23f646dad0f337dec808..63467062fcbbdfdb2ff9bad1ef39a2e6f9fcc2bb 100644 (file)
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.19
+VER        = 2.63
 
 THISAPP    = libcap-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 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 = eb1ff04d39bfa2342b8e78b0fd60dc2d
+$(DL_FILE)_MD5 = 18410cec436f827e698ee9ea16ada9b7
 
 install : $(TARGET)
 
@@ -69,11 +69,13 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @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
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       # Prevent a static library from being installed
+       cd $(DIR_APP) && sed -i '/install.*STALIBNAME/d' libcap/Makefile
+       cd $(DIR_APP) && make GOLANG=no
+       cd $(DIR_APP) && make install GOLANG=no
+       rm -vf /lib/libcap.so
+       ln -svf /lib/libcap.so.2.61 /usr/lib/libcap.so
        chmod +x /lib/libcap.so.*
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)