core104: Include recent changes

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

diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
index f23aceae4ec2e125242b93733f2046ae88e3ff28..9aeb79e8a448097b5ccf81cb54341ce0e97826e7 100644 (file)
--- a/config/rootfiles/core/104/filelists/files
+++ b/config/rootfiles/core/104/filelists/files
@@ -4,3 +4,7 @@ etc/collectd.conf
 etc/httpd/conf/global.conf
 opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
+var/ipfire/updatexlrator/bin/download

diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh
index 46842e84207f2412dc32c00619fd6cacc19c0a57..d00b487d012d5c4fa1073d98c3b138905bd8067f 100644 (file)
--- a/config/rootfiles/core/104/update.sh
+++ b/config/rootfiles/core/104/update.sh
@@ -53,7 +53,7 @@ rm -f /bin/groups /lib/libshadow.so.0*
 ldconfig
 
 # Update Language cache
-#/usr/local/bin/update-lang-cache
+/usr/local/bin/update-lang-cache
 
 # Start services
 /etc/init.d/dnsmasq restart

diff --git a/lfs/tor b/lfs/tor
index 4cecf23993cc6e611ed3f66b462f174d81bf24ed..a00ff2596525ac0696b5a09816a2ea8116234c2d 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 16
+PAK_VER    = 17
 
 DEPS       = ""