[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e165e3225d819875292ced4696a037509a0f5499

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e165e3225d819875292ced4696a037509a0f5499

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2908 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  e165e3225d819875292ced4696a037509a0f5499 (commit)
       via  55847c6d3a9f9b56193633c1486cbe256266538e (commit)
      from  748aa8f286a351a1c6c241dc52dbeeac8263934d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e165e3225d819875292ced4696a037509a0f5499
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 7 21:20:58 2021 +0000

    libcap: Fix symlink to libcap.so
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 55847c6d3a9f9b56193633c1486cbe256266538e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Apr 7 22:28:39 2021 +0100

    core156: Ship functions.pl
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/libcap            | 1 -
 config/rootfiles/core/156/filelists/files | 1 +
 lfs/libcap                                | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 651b1ed0f..a3bfbc157 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,5 +1,4 @@
 #lib/libcap.a
-lib/libcap.so
 lib/libcap.so.2
 lib/libcap.so.2.49
 #lib/libpsx.a
diff --git a/config/rootfiles/core/156/filelists/files b/config/rootfiles/core/156/filelists/files
index 7dfa5a044..68a41b2cd 100644
--- a/config/rootfiles/core/156/filelists/files
+++ b/config/rootfiles/core/156/filelists/files
@@ -9,6 +9,7 @@ srv/web/ipfire/cgi-bin/netovpnsrv.cgi
 srv/web/ipfire/cgi-bin/zoneconf.cgi
 srv/web/ipfire/html/include/rrdimage.js
 srv/web/ipfire/html/themes/ipfire/include/css/style.css
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
 var/ipfire/graphs.pl
 var/ipfire/header.pl
 var/ipfire/network-functions.pl
diff --git a/lfs/libcap b/lfs/libcap
index 85d379024..fd131949d 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -74,7 +74,8 @@ $(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
-	ln -svf /lib/libcap.so.2.25 /usr/lib/libcap.so
+	rm -vf /lib/libcap.so
+	ln -svf /lib/libcap.so.2.49 /usr/lib/libcap.so
 	chmod +x /lib/libcap.so.*
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)


hooks/post-receive
--
IPFire 2.x development tree