Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

config/rootfiles/core/73/filelists/php

@@ -0,0 +1 @@
+../../../common/php

config/rootfiles/oldcore/73/filelists/files

@@ -1,8 +1,11 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/squid
 srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
 srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/routing.cgi
+srv/web/ipfire/cgi-bin/wirelessclient.cgi
 srv/web/ipfire/html/redirect.cgi
 srv/web/ipfire/html/redirect-templates/
 var/ipfire/header.pl

config/rootfiles/oldcore/73/update.sh

@@ -53,6 +53,11 @@ extract_files
 #Update Language cache
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 
+# Remove invalid fetchmail symlinks when postfix is installed.
+if [ ! -e "/etc/rc.d/init.d/fetchmail" ]; then
+	rm -f /etc/rc.d/rc*.d/*fetchmail
+fi
+
 sync
 
 # This update need a reboot...

config/rootfiles/packages/tor

@@ -5,7 +5,7 @@ etc/rc.d/rc0.d/K40tor
 etc/rc.d/rc3.d/S60tor
 etc/rc.d/rc6.d/K40tor
 #etc/tor
-etc/tor/tor-tsocks.conf
+#etc/tor/tor-tsocks.conf
 etc/tor/torrc
 srv/web/ipfire/cgi-bin/tor.cgi
 usr/bin/tor
@@ -25,6 +25,7 @@ usr/local/bin/torctrl
 usr/share/tor
 usr/share/tor/defaults-torrc
 usr/share/tor/geoip
+usr/share/tor/geoip6
 var/ipfire/backup/addons/includes/tor
 var/ipfire/menu.d/EX-tor.menu
 var/ipfire/tor