make.sh: update IPFire and Toolchain verion

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 0a38212e7c8fed06bf572f3b41bf872538a354dd..a76ec6678ef9a5d0c62b7bc1e07a2d31e8318338 100644 (file)
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -5,6 +5,8 @@ var/ipfire/langs
 etc/rc.d/init.d/networking/red.up/06-safe-search
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/suricata
+opt/pakfire/etc/pakfire.conf
 opt/pakfire/lib/functions.pl
 srv/web/ipfire/cgi-bin/ids.cgi
 usr/sbin/convert-snort
+usr/sbin/setup

diff --git a/make.sh b/make.sh
index e1ac4c6b941fa2215ff0c33c00c05c1a2441d78c..43050262c05690ff1dc6b8e500d5ff9f8bfc1d39 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
-VERSION="2.23"                                                 # Version number
+VERSION="2.25"                                                 # Version number
 CORE="140"                                                     # Core Level (Filename)
 PAKFIRE_CORE="139"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
@@ -38,7 +38,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 
-TOOLCHAINVER=20190814
+TOOLCHAINVER=20200108
 
 ###############################################################################
 #