From 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Jan 2019 07:52:17 +0100 Subject: [PATCH 01/10] core127: fix updater for aarch64 and armv5tel if a arch specific filelist has the same name as the common the common filelist was ignored Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/filelists/aarch64/files | 9 --------- .../filelists/{armv5tel/files => aarch64/files-aarch64} | 0 .../rootfiles/core/127/filelists/armv5tel/files-armvtel | 2 ++ 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 config/rootfiles/core/127/filelists/aarch64/files rename config/rootfiles/core/127/filelists/{armv5tel/files => aarch64/files-aarch64} (100%) create mode 100644 config/rootfiles/core/127/filelists/armv5tel/files-armvtel diff --git a/config/rootfiles/core/127/filelists/aarch64/files b/config/rootfiles/core/127/filelists/aarch64/files deleted file mode 100644 index d76f3915c..000000000 --- a/config/rootfiles/core/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/core/127/filelists/armv5tel/files b/config/rootfiles/core/127/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/files rename to config/rootfiles/core/127/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/127/filelists/armv5tel/files-armvtel b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr From ad62fda0addbd10573a30ce7a0ab6921b761f670 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Jan 2019 13:53:06 +0100 Subject: [PATCH 02/10] core127: add general-functions.pl to updater Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index 4b001af63..758f9c537 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -17,4 +17,5 @@ srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl var/ipfire/backup/include +var/ipfire/general-functions.pl var/ipfire/geoip-functions.pl From 99549950fa26674ec1807aeee0904f35cb930cd8 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 18 Jan 2019 13:53:39 +0100 Subject: [PATCH 03/10] core127: set reboot needed flag Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 4fe045ec9..8960ed46a 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -58,6 +58,9 @@ sysctl -p # Re-run depmod depmod -a +# This update needs a reboot... +touch /var/run/need_reboot + # Finish /etc/init.d/fireinfo start sendprofile From a6c298b540787fa0feffbe5191855a54f6c8a178 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 10:00:54 +0100 Subject: [PATCH 04/10] core127: add bind to update Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/filelists/bind | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/127/filelists/bind diff --git a/config/rootfiles/core/127/filelists/bind b/config/rootfiles/core/127/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/127/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file From a58c5ca1f240132605ec86a9db58ae2e0e24d783 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 10:01:40 +0100 Subject: [PATCH 05/10] core127: add xt_geoip_update to update Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/filelists/files | 1 + 1 file changed, 1 insertion(+) diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index 758f9c537..e28d42006 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -16,6 +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 From 3d476ab017763b44deff9206c97b7cfb548ffa7e Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 10:02:17 +0100 Subject: [PATCH 06/10] core127: add ovpn ca changes to update Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/update.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 8960ed46a..33604fc72 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -48,6 +48,11 @@ 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 +chmod nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr + # Start services /etc/init.d/unbound restart /etc/init.d/squid start From 4cba04ce288de78f8382fd88cd5538bb4e435724 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 12:08:07 +0100 Subject: [PATCH 07/10] core127: fix typo Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 33604fc72..537d9e8a4 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -51,7 +51,7 @@ 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 -chmod nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr +chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr # Start services /etc/init.d/unbound restart From 271bac39a0b2999c843a5ec580438230d5398c74 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 15:16:43 +0100 Subject: [PATCH 08/10] xt_geoip_updte: fix download url the maxmind server delivers an old version if there are two slashes before the database filename. Signed-off-by: Arne Fitzenreiter --- src/scripts/xt_geoip_update | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 73484c7a0..b45c5b343 100644 --- 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 # +# Copyright (C) 2019 IPFire Development Team # # # # 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) From 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 17:20:51 +0100 Subject: [PATCH 09/10] core127: ovpn ca index.txt is also missing on some installations Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/update.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 537d9e8a4..b5c72ad4e 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/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 . # +# Copyright (C) 2019 IPFire-Team . # # # ############################################################################ # @@ -48,10 +48,13 @@ 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 +# 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 From f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 17:24:47 +0100 Subject: [PATCH 10/10] core127: run xt_geoip_update Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/127/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index b5c72ad4e..e276e7e68 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -66,6 +66,9 @@ 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