Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

config/rootfiles/common/stage2

@@ -4,8 +4,6 @@ bin/grep
 bin/pwd
 bin/stty
 #boot
-dev/null
-dev/console
 etc/bashrc
 etc/certparams
 etc/e2fsck.conf
@@ -54,8 +52,6 @@ mnt
 root/ipfire
 #sbin
 #srv
-#sys
-tmp
 #usr/bin/perl
 #usr/include
 #usr/lib
@@ -69,9 +65,10 @@ usr/local/bin/httpscert
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash
-usr/local/bin/run-parts
-usr/local/bin/scanhd
 usr/local/bin/rebuild-initrd
+usr/local/bin/run-parts
+#usr/local/bin/sanedloop
+usr/local/bin/scanhd
 usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
@@ -79,12 +76,9 @@ usr/local/bin/vpn-watch
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
-#usr/local/share
 #usr/local/share/doc
 #usr/local/share/info
 #usr/local/share/locale
-#usr/local/share/man
-#usr/local/share/man/man1
 #usr/local/share/man/man2
 #usr/local/share/man/man3
 #usr/local/share/man/man4
@@ -99,6 +93,8 @@ usr/local/bin/vpn-watch
 #usr/sbin
 #usr/share
 #usr/share/doc
+#usr/share/doc/licenses
+usr/share/doc/licenses/GPLv3
 #usr/share/info
 #usr/share/locale
 #usr/share/man
@@ -126,6 +122,7 @@ var/log/btmp
 var/log/calamaris
 var/log/counter
 var/log/lastlog
+#var/log/net-traffic.log
 var/log/wtmp
 var/mail
 #var/opt
@@ -133,6 +130,6 @@ var/run
 var/run/utmp
 #var/spool
 var/tmp
-#usr/local/bin/asterisk
-#usr/local/bin/sanedloop
-#var/log/net-traffic.log
+dev/null
+dev/console
+tmp

config/rootfiles/core/44/filelists/files

@@ -5,14 +5,21 @@ etc/rc.d/init.d/firewall
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/networking/dhcpcd.exe
 srv/web/ipfire/cgi-bin/extrahd.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/speed.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/images/urlfilter/copy.gif
 var/ipfire/general-functions.pl
 var/ipfire/extrahd/bin/extrahd.pl
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
+var/ipfire/langs/fr.pl
+var/ipfire/langs/es.pl
 usr/local/bin/timectrl
 usr/local/bin/rebuild-initrd
 usr/local/bin/scanhd
 usr/local/sbin/setup
 usr/bin/ldd
+usr/share/doc/licenses/GPLv3

config/rootfiles/core/44/update.sh

@@ -201,3 +201,4 @@ rm -rf /etc/sysconfig/lm_sensors
 /usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg"
 /usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!"
 /usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** "
+touch /var/run/need_reboot

config/rootfiles/oldcore/42/exclude

@@ -0,0 +1,3 @@
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf

config/rootfiles/packages/clamav

@@ -10,15 +10,15 @@ usr/bin/sigtool
 #usr/lib/libclamav.la
 usr/lib/libclamav.so
 usr/lib/libclamav.so.6
-usr/lib/libclamav.so.6.1.4
+usr/lib/libclamav.so.6.1.7
 #usr/lib/libclamunrar.la
 usr/lib/libclamunrar.so
 usr/lib/libclamunrar.so.6
-usr/lib/libclamunrar.so.6.1.4
+usr/lib/libclamunrar.so.6.1.7
 #usr/lib/libclamunrar_iface.la
 usr/lib/libclamunrar_iface.so
 usr/lib/libclamunrar_iface.so.6
-usr/lib/libclamunrar_iface.so.6.1.4
+usr/lib/libclamunrar_iface.so.6.1.7
 #usr/lib/pkgconfig/libclamav.pc
 usr/sbin/clamd
 usr/share/clamav

config/rootfiles/packages/ipfireseeder

@@ -1,5 +1,5 @@
 etc/rc.d/init.d/ipfireseeder
 #var/ipfire/seeder
-var/ipfire/seeder/ipfire-2.7.i586-full-core42.iso.torrent
+var/ipfire/seeder/ipfire-2.7.i586-full-core43.iso.torrent
 #var/log/seeder
 var/log/seeder/info