From 11a1a874e9e682fb681e36c776027ea129e3dc67 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 15 Oct 2014 19:48:16 +0200 Subject: [PATCH] Create Core Update 85 --- config/rootfiles/core/{84 => 85}/exclude | 0 config/rootfiles/core/85/filelists/files | 3 + config/rootfiles/core/85/filelists/openssl | 1 + config/rootfiles/core/{84 => 85}/meta | 0 config/rootfiles/core/85/update.sh | 56 +++++++++++++++++++ config/rootfiles/oldcore/84/exclude | 20 +++++++ .../{core => oldcore}/84/filelists/bash | 0 .../{core => oldcore}/84/filelists/dnsmasq | 0 .../{core => oldcore}/84/filelists/files | 0 .../{core => oldcore}/84/filelists/readline | 0 .../{core => oldcore}/84/filelists/squid | 0 config/rootfiles/oldcore/84/meta | 1 + .../rootfiles/{core => oldcore}/84/update.sh | 0 make.sh | 4 +- 14 files changed, 83 insertions(+), 2 deletions(-) rename config/rootfiles/core/{84 => 85}/exclude (100%) create mode 100644 config/rootfiles/core/85/filelists/files create mode 120000 config/rootfiles/core/85/filelists/openssl rename config/rootfiles/core/{84 => 85}/meta (100%) create mode 100644 config/rootfiles/core/85/update.sh create mode 100644 config/rootfiles/oldcore/84/exclude rename config/rootfiles/{core => oldcore}/84/filelists/bash (100%) rename config/rootfiles/{core => oldcore}/84/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/84/filelists/files (100%) rename config/rootfiles/{core => oldcore}/84/filelists/readline (100%) rename config/rootfiles/{core => oldcore}/84/filelists/squid (100%) create mode 100644 config/rootfiles/oldcore/84/meta rename config/rootfiles/{core => oldcore}/84/update.sh (100%) diff --git a/config/rootfiles/core/84/exclude b/config/rootfiles/core/85/exclude similarity index 100% rename from config/rootfiles/core/84/exclude rename to config/rootfiles/core/85/exclude diff --git a/config/rootfiles/core/85/filelists/files b/config/rootfiles/core/85/filelists/files new file mode 100644 index 0000000000..168c7d188b --- /dev/null +++ b/config/rootfiles/core/85/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/85/filelists/openssl b/config/rootfiles/core/85/filelists/openssl new file mode 120000 index 0000000000..e011a9266c --- /dev/null +++ b/config/rootfiles/core/85/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/84/meta b/config/rootfiles/core/85/meta similarity index 100% rename from config/rootfiles/core/84/meta rename to config/rootfiles/core/85/meta diff --git a/config/rootfiles/core/85/update.sh b/config/rootfiles/core/85/update.sh new file mode 100644 index 0000000000..ec9ac63e79 --- /dev/null +++ b/config/rootfiles/core/85/update.sh @@ -0,0 +1,56 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2014 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Remove old core updates from pakfire cache to save space... +core=85 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Remove old files + +# Extract files +extract_files + +# Start services + +# Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/84/exclude b/config/rootfiles/oldcore/84/exclude new file mode 100644 index 0000000000..18e9b4d243 --- /dev/null +++ b/config/rootfiles/oldcore/84/exclude @@ -0,0 +1,20 @@ +boot/config.txt +etc/collectd.custom +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/ovpn +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/84/filelists/bash b/config/rootfiles/oldcore/84/filelists/bash similarity index 100% rename from config/rootfiles/core/84/filelists/bash rename to config/rootfiles/oldcore/84/filelists/bash diff --git a/config/rootfiles/core/84/filelists/dnsmasq b/config/rootfiles/oldcore/84/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/84/filelists/dnsmasq rename to config/rootfiles/oldcore/84/filelists/dnsmasq diff --git a/config/rootfiles/core/84/filelists/files b/config/rootfiles/oldcore/84/filelists/files similarity index 100% rename from config/rootfiles/core/84/filelists/files rename to config/rootfiles/oldcore/84/filelists/files diff --git a/config/rootfiles/core/84/filelists/readline b/config/rootfiles/oldcore/84/filelists/readline similarity index 100% rename from config/rootfiles/core/84/filelists/readline rename to config/rootfiles/oldcore/84/filelists/readline diff --git a/config/rootfiles/core/84/filelists/squid b/config/rootfiles/oldcore/84/filelists/squid similarity index 100% rename from config/rootfiles/core/84/filelists/squid rename to config/rootfiles/oldcore/84/filelists/squid diff --git a/config/rootfiles/oldcore/84/meta b/config/rootfiles/oldcore/84/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/84/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/84/update.sh b/config/rootfiles/oldcore/84/update.sh similarity index 100% rename from config/rootfiles/core/84/update.sh rename to config/rootfiles/oldcore/84/update.sh diff --git a/make.sh b/make.sh index 23ef2b66e4..d942711636 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="84" # Core Level (Filename) -PAKFIRE_CORE="83" # Core Level (PAKFIRE) +CORE="85" # Core Level (Filename) +PAKFIRE_CORE="84" # 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 -- 2.39.2