Merge remote-tracking branch 'origin/master' into next

diff --git a/config/rootfiles/oldcore/127/filelists/aarch64/files b/config/rootfiles/oldcore/127/filelists/aarch64/files
deleted file mode 100644 (file)
index d76f391..0000000
--- a/config/rootfiles/oldcore/127/filelists/aarch64/files
+++ /dev/null
@@ -1,9 +0,0 @@
-boot/boot.cmd
-boot/boot.scr
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-var/ipfire/langs
-etc/rc.d/init.d/aws
-etc/rc.d/init.d/unbound
-srv/web/ipfire/cgi-bin/dnsforward.cgi

diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files b/config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64
similarity index 100%
rename from config/rootfiles/oldcore/127/filelists/armv5tel/files
rename to config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64

diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
new file mode 100644 (file)
index 0000000..6a00446
--- /dev/null
+++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr

diff --git a/config/rootfiles/oldcore/127/filelists/bind b/config/rootfiles/oldcore/127/filelists/bind
new file mode 120000 (symlink)
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/127/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file

diff --git a/config/rootfiles/oldcore/127/filelists/files b/config/rootfiles/oldcore/127/filelists/files
index 4b001af63a6fb4952d1e292fdd9e7d52dcbe2b5a..e28d4200615b7e9e4057d406c50070f9e5d054a2 100644 (file)
--- a/config/rootfiles/oldcore/127/filelists/files
+++ b/config/rootfiles/oldcore/127/filelists/files
@@ -16,5 +16,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 usr/lib/firewall/firewall-lib.pl
+usr/local/bin/xt_geoip_update
 var/ipfire/backup/include
+var/ipfire/general-functions.pl
 var/ipfire/geoip-functions.pl

diff --git a/config/rootfiles/oldcore/127/update.sh b/config/rootfiles/oldcore/127/update.sh
index 4fe045ec99938d3a15128eba18576ac0aa2142ff..e276e7e684d0498221b635e411605359b989267d 100644 (file)
--- a/config/rootfiles/oldcore/127/update.sh
+++ b/config/rootfiles/oldcore/127/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2018 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2019 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -48,6 +48,14 @@ ldconfig
 # Regenerate squid configuration file
 sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi
 
+# If not exist create ovpn ca index.txt(.attr) and fix rights
+touch /var/ipfire/ovpn/ca/index.txt.attr
+chmod 644 /var/ipfire/ovpn/ca/index.txt.attr
+chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr
+touch /var/ipfire/ovpn/ca/index.txt
+chmod 644 /var/ipfire/ovpn/ca/index.txt
+chown nobody:nobody /var/ipfire/ovpn/ca/index.txt
+
 # Start services
 /etc/init.d/unbound restart
 /etc/init.d/squid start
@@ -58,6 +66,12 @@ sysctl -p
 # Re-run depmod
 depmod -a
 
+# Update xt_geoip
+/usr/local/bin/xt_geoip_update
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
 # Finish
 /etc/init.d/fireinfo start
 sendprofile

diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update
index 73484c7a0671dba1eb100cb67c0e7e8594da5276..b45c5b3436d693e94675ead62fc831b7a59e85e4 100644 (file)
--- a/src/scripts/xt_geoip_update
+++ b/src/scripts/xt_geoip_update
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014 IPFire Development Team <info@ipfire.org>                #
+# Copyright (C) 2019 IPFire Development Team <info@ipfire.org>                #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin
 DEST_PATH=/usr/share/xt_geoip
 DB_PATH=/var/lib/GeoIP
 
-DL_URL=http://geolite.maxmind.com/download/geoip/database/
+DL_URL=http://geolite.maxmind.com/download/geoip/database
 DL_FILE=GeoLite2-Country-CSV.zip
 
 eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings)