Merge branch 'master' into next

This commit is contained in:
Arne Fitzenreiter
2018-08-29 07:43:06 +02:00
6 changed files with 11 additions and 4 deletions

View File

@@ -13,6 +13,8 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
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

View File

@@ -0,0 +1 @@
../../../../common/i586/openssl-sse2

View File

@@ -0,0 +1 @@
../../../common/xtables-addons

View File

@@ -34,6 +34,9 @@ done
# Stop services
/etc/init.d/squid stop
# remove old xtables modules / some are renamend
rm -rf /lib/xtables
# Extract files
extract_files