This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 9b86a7ec28bd2a2049e771b59dff817c0569e106 (commit) via f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (commit) via 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 (commit) via 271bac39a0b2999c843a5ec580438230d5398c74 (commit) via 4cba04ce288de78f8382fd88cd5538bb4e435724 (commit) via 3d476ab017763b44deff9206c97b7cfb548ffa7e (commit) via a58c5ca1f240132605ec86a9db58ae2e0e24d783 (commit) via a6c298b540787fa0feffbe5191855a54f6c8a178 (commit) via 99549950fa26674ec1807aeee0904f35cb930cd8 (commit) via ad62fda0addbd10573a30ce7a0ab6921b761f670 (commit) via 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 (commit) from 93d516bd7065e4a30a1a04bd3f1045b2b56864ad (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 9b86a7ec28bd2a2049e771b59dff817c0569e106 Merge: 93d516bd7 f29ff21cd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Jan 19 19:58:48 2019 +0100

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

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/oldcore/127/filelists/aarch64/files | 9 --------- .../oldcore/{124 => 127}/filelists/aarch64/files-aarch64 | 0 .../127/filelists/armv5tel/{files => files-armvtel} | 0 config/rootfiles/oldcore/{100 => 127}/filelists/bind | 0 config/rootfiles/oldcore/127/filelists/files | 2 ++ config/rootfiles/oldcore/127/update.sh | 16 +++++++++++++++- src/scripts/xt_geoip_update | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 config/rootfiles/oldcore/127/filelists/aarch64/files copy config/rootfiles/oldcore/{124 => 127}/filelists/aarch64/files-aarch64 (100%) rename config/rootfiles/oldcore/127/filelists/armv5tel/{files => files-armvtel} (100%) copy config/rootfiles/oldcore/{100 => 127}/filelists/bind (100%)

Difference in files: diff --git a/config/rootfiles/oldcore/127/filelists/aarch64/files b/config/rootfiles/oldcore/127/filelists/aarch64/files deleted file mode 100644 index d76f3915c..000000000 --- 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 index 000000000..6a00446f4 --- /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 index 000000000..48a0ebaef --- /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 4b001af63..e28d42006 100644 --- 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 4fe045ec9..e276e7e68 100644 --- 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 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 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)

hooks/post-receive -- IPFire 2.x development tree