[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cb1c8f108f7efb8fbe9aa8036e0d4e0d8c54aa59

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cb1c8f108f7efb8fbe9aa8036e0d4e0d8c54aa59

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 2786 bytes --]

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  cb1c8f108f7efb8fbe9aa8036e0d4e0d8c54aa59 (commit)
      from  19602b681f9b5d88578162319366e7efde768352 (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 cb1c8f108f7efb8fbe9aa8036e0d4e0d8c54aa59
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jan 14 21:10:15 2020 +0000

    set version in backupiso and also pakfire core to 140
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/140/filelists/files | 2 +-
 make.sh                                   | 2 +-
 src/scripts/backupiso                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
index 82c6e5ec0..2285170ff 100644
--- 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 f60277301..0d32f812b 100755
--- 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 7e8599f00..220e619d4 100644
--- 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)


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