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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 4046 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  33513817fa4eac7007fc4e39c348d7fffdfac20a (commit)
      from  dd676ffb49f9b5b6c9fe4178f86cd048fb789593 (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 33513817fa4eac7007fc4e39c348d7fffdfac20a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Mar 20 09:36:33 2016 +0100

    set version to IPFire 2.19 core100
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/100/filelists/files | 2 ++
 make.sh                                   | 4 ++--
 src/pakfire/pakfire.conf                  | 2 +-
 src/scripts/backupiso                     | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/100/filelists/files b/config/rootfiles/core/100/filelists/files
index 3608030..c75a26d 100644
--- a/config/rootfiles/core/100/filelists/files
+++ b/config/rootfiles/core/100/filelists/files
@@ -8,6 +8,7 @@ etc/rc.d/init.d/networking/dhcpcd.exe
 etc/rc.d/init.d/ntp
 etc/modprobe.d/nf_conntrack.conf
 lib/udev/rules.d/60-net.rules
+opt/pakfire/etc/pakfire.conf
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
@@ -20,6 +21,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/webaccess.cgi
 usr/bin/pgrep
+usr/local/bin/backupiso
 usr/local/bin/qosctrl
 usr/local/bin/timectrl
 usr/local/bin/wirelessctrl
diff --git a/make.sh b/make.sh
index 38e9229..da4bf16 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.17"							# Version number
+VERSION="2.19"							# Version number
 CORE="100"							# Core Level (Filename)
-PAKFIRE_CORE="99"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="100"						# 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/pakfire/pakfire.conf b/src/pakfire/pakfire.conf
index 1c74f3c..2f8f9cd 100644
--- a/src/pakfire/pakfire.conf
+++ b/src/pakfire/pakfire.conf
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info(a)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        #
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 08fba1a..014e8e9 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,8 +2,8 @@
 
 COREVER=$(cat /opt/pakfire/db/core/mine)
 # FIXME: edit this lines before release
-URL="http://download.ipfire.org/releases/ipfire-2.x/2.17-core$COREVER/"
-ISO="ipfire-2.17.i586-full-core$COREVER.iso"
+URL="http://download.ipfire.org/releases/ipfire-2.x/2.19-core$COREVER/"
+ISO="ipfire-2.19.i586-full-core$COREVER.iso"
 
 if [ -z $1 ]; then
 	echo usage: $0 backup-file


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