libcap: Drop compat library link

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index be9dc580e17d8bb2ef2c8fdbdeeeb3bf30cfac1c..651b1ed0fa012a20c73d5dbdd77623c580778b36 100644 (file)
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,6 +1,5 @@
 #lib/libcap.a
 lib/libcap.so
-lib/libcap.so.1
 lib/libcap.so.2
 lib/libcap.so.2.49
 #lib/libpsx.a

diff --git a/config/rootfiles/core/156/update.sh b/config/rootfiles/core/156/update.sh
index ff84a070340f28b8ff3faa1f4f9517f337bdc3dc..d078c01cd1b3aee084997310e4892c133177b65c 100644 (file)
--- a/config/rootfiles/core/156/update.sh
+++ b/config/rootfiles/core/156/update.sh
@@ -33,6 +33,7 @@ done
 
 # Remove files
 rm -vf \
+       /lib/libcap.so.1 \
        /srv/web/ipfire/html/include/snortupdateutility.js \
        /usr/bin/gawk-4.1.4 \
        /usr/bin/igawk

diff --git a/lfs/libcap b/lfs/libcap
index 5c2d843ad3921425af8b28cf2eb073c92cb917f9..85d379024b62d0255243d11a10d26c316e3416c0 100644 (file)
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -74,8 +74,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && sed -i '/install.*STALIBNAME/d' libcap/Makefile
        cd $(DIR_APP) && make GOLANG=no
        cd $(DIR_APP) && make install GOLANG=no
-       # links for old binaries
-       ln -svf libcap.so.2 /lib/libcap.so.1
        ln -svf /lib/libcap.so.2.25 /usr/lib/libcap.so
        chmod +x /lib/libcap.so.*
        @rm -rf $(DIR_APP)