Merge branch 'master' into next

diff --combined config/rootfiles/oldcore/123/filelists/files
index 3ff006fe5baed8f2fe161466df01bea236f18693,e2be472f63d4538afc09dea53d834b0489561fd8..e2be472f63d4538afc09dea53d834b0489561fd8
--- 1/config/rootfiles/oldcore/123/filelists/files
--- 2/config/rootfiles/core/123/filelists/files
+++ b/config/rootfiles/oldcore/123/filelists/files
@@@ -13,6 -13,8 +13,8 @@@ srv/web/ipfire/cgi-bin/ovpnmain.cg
  srv/web/ipfire/cgi-bin/proxy.cgi
  srv/web/ipfire/cgi-bin/vpnmain.cgi
  usr/local/bin/backupiso
+ usr/lib/libssp.so.0
+ usr/lib/libssp.so.0.0.0
  usr/sbin/dhclient
  usr/share/GeoIP/GeoIP.dat
  var/ipfire/backup/bin/backup.pl

diff --combined config/rootfiles/oldcore/123/filelists/i586/openssl-sse2
index 0000000000000000000000000000000000000000,f424713d6cb581803624487de681c16ad9eee73d..f424713d6cb581803624487de681c16ad9eee73d
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/123/filelists/i586/openssl-sse2
+++ b/config/rootfiles/oldcore/123/filelists/i586/openssl-sse2
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../../common/i586/openssl-sse2

diff --combined config/rootfiles/oldcore/123/filelists/xtables-addons
index 0000000000000000000000000000000000000000,2e24c4298bf0cc1f403ce5e52014319d3a86fb63..2e24c4298bf0cc1f403ce5e52014319d3a86fb63
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/123/filelists/xtables-addons
+++ b/config/rootfiles/oldcore/123/filelists/xtables-addons
@@@ -1,0 -1,1 +1,1 @@@
+ ../../../common/xtables-addons

diff --combined config/rootfiles/oldcore/123/update.sh
index 76eff74bb349571a884204cf62327c0ecdcad7a9,964a238628bc1bb40b800bb2857d1cd28370927a..964a238628bc1bb40b800bb2857d1cd28370927a
--- 1/config/rootfiles/oldcore/123/update.sh
--- 2/config/rootfiles/core/123/update.sh
+++ b/config/rootfiles/oldcore/123/update.sh
@@@ -34,6 -34,9 +34,9 @@@ don
  # Stop services
  /etc/init.d/squid stop
  
+ # remove old xtables modules / some are renamend
+ rm -rf /lib/xtables
+ 
  # Extract files
  extract_files