set version in backupiso and also pakfire core to 140

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 82c6e5ec04410ce65acd1221a6a390d30e4fe09a..2285170ff8937b0d74115c4f2f0b6be1eeaac0f5 100644 (file)
--- a/config/rootfiles/core/140/filelists/files
+++ b/config/rootfiles/core/140/filelists/files
@@ -2,12 +2,12 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 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
 srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/local/bin/backupiso
 usr/sbin/convert-snort
 usr/sbin/setup

diff --git a/make.sh b/make.sh
index f6027730182af9bdec4035acb3866683793894e4..0d32f812bac5ed11f38cd70ef233f1deab675cb7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -27,7 +27,7 @@ SNAME="ipfire"                                                        # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
 CORE="140"                                                     # Core Level (Filename)
-PAKFIRE_CORE="139"                                             # Core Level (PAKFIRE)
+PAKFIRE_CORE="140"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir

diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 7e8599f00a3c34f6a94b337b30f02d34f01a158e..220e619d450d48f6e7a11d7006af9df662035a6a 100644 (file)
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # FIXME: edit this lines before release
-IPFVER=2.23
+IPFVER=2.25
 COREVER=$(cat /opt/pakfire/db/core/mine)
 
 arch=$(uname -m)