From 4b046d735d28012d215276ea08272f298e1e8ba1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 28 Sep 2015 14:08:17 +0100 Subject: [PATCH] Start Core Update 95 Signed-off-by: Michael Tremer --- config/rootfiles/core/{94 => 95}/exclude | 0 config/rootfiles/core/95/filelists/files | 4 ++ config/rootfiles/core/{94 => 95}/meta | 0 config/rootfiles/core/95/update.sh | 57 +++++++++++++++++++ config/rootfiles/oldcore/94/exclude | 22 +++++++ .../94/filelists/armv5tel/glibc | 0 .../{core => oldcore}/94/filelists/bind | 0 .../{core => oldcore}/94/filelists/chkconfig | 0 .../{core => oldcore}/94/filelists/coreutils | 0 .../{core => oldcore}/94/filelists/dma | 0 .../{core => oldcore}/94/filelists/dnsmasq | 0 .../{core => oldcore}/94/filelists/file | 0 .../{core => oldcore}/94/filelists/files | 0 .../{core => oldcore}/94/filelists/fireinfo | 0 .../{core => oldcore}/94/filelists/hdparm | 0 .../{core => oldcore}/94/filelists/i586/glibc | 0 .../{core => oldcore}/94/filelists/iproute2 | 0 .../{core => oldcore}/94/filelists/libgcrypt | 0 .../94/filelists/libgpg-error | 0 .../{core => oldcore}/94/filelists/openssh | 0 .../{core => oldcore}/94/filelists/pcre | 0 .../94/filelists/perl-Email-Date-Format | 0 .../94/filelists/perl-MIME-Lite | 0 .../{core => oldcore}/94/filelists/rrdtool | 0 .../{core => oldcore}/94/filelists/setup | 0 .../{core => oldcore}/94/filelists/squid | 0 config/rootfiles/oldcore/94/meta | 1 + .../rootfiles/{core => oldcore}/94/update.sh | 0 make.sh | 2 +- 29 files changed, 85 insertions(+), 1 deletion(-) rename config/rootfiles/core/{94 => 95}/exclude (100%) create mode 100644 config/rootfiles/core/95/filelists/files rename config/rootfiles/core/{94 => 95}/meta (100%) create mode 100644 config/rootfiles/core/95/update.sh create mode 100644 config/rootfiles/oldcore/94/exclude rename config/rootfiles/{core => oldcore}/94/filelists/armv5tel/glibc (100%) rename config/rootfiles/{core => oldcore}/94/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/94/filelists/chkconfig (100%) rename config/rootfiles/{core => oldcore}/94/filelists/coreutils (100%) rename config/rootfiles/{core => oldcore}/94/filelists/dma (100%) rename config/rootfiles/{core => oldcore}/94/filelists/dnsmasq (100%) rename config/rootfiles/{core => oldcore}/94/filelists/file (100%) rename config/rootfiles/{core => oldcore}/94/filelists/files (100%) rename config/rootfiles/{core => oldcore}/94/filelists/fireinfo (100%) rename config/rootfiles/{core => oldcore}/94/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/94/filelists/i586/glibc (100%) rename config/rootfiles/{core => oldcore}/94/filelists/iproute2 (100%) rename config/rootfiles/{core => oldcore}/94/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/94/filelists/libgpg-error (100%) rename config/rootfiles/{core => oldcore}/94/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/94/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/94/filelists/perl-Email-Date-Format (100%) rename config/rootfiles/{core => oldcore}/94/filelists/perl-MIME-Lite (100%) rename config/rootfiles/{core => oldcore}/94/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/94/filelists/setup (100%) rename config/rootfiles/{core => oldcore}/94/filelists/squid (100%) create mode 100644 config/rootfiles/oldcore/94/meta rename config/rootfiles/{core => oldcore}/94/update.sh (100%) diff --git a/config/rootfiles/core/94/exclude b/config/rootfiles/core/95/exclude similarity index 100% rename from config/rootfiles/core/94/exclude rename to config/rootfiles/core/95/exclude diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files new file mode 100644 index 0000000000..d2cda944b3 --- /dev/null +++ b/config/rootfiles/core/95/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/vpnmain.cgi +var/ipfire/langs diff --git a/config/rootfiles/core/94/meta b/config/rootfiles/core/95/meta similarity index 100% rename from config/rootfiles/core/94/meta rename to config/rootfiles/core/95/meta diff --git a/config/rootfiles/core/95/update.sh b/config/rootfiles/core/95/update.sh new file mode 100644 index 0000000000..258a62fbc3 --- /dev/null +++ b/config/rootfiles/core/95/update.sh @@ -0,0 +1,57 @@ +#!/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) 2015 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=95 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/94/exclude b/config/rootfiles/oldcore/94/exclude new file mode 100644 index 0000000000..4c7aa5a5ad --- /dev/null +++ b/config/rootfiles/oldcore/94/exclude @@ -0,0 +1,22 @@ +boot/config.txt +etc/alternatives +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/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/94/filelists/armv5tel/glibc b/config/rootfiles/oldcore/94/filelists/armv5tel/glibc similarity index 100% rename from config/rootfiles/core/94/filelists/armv5tel/glibc rename to config/rootfiles/oldcore/94/filelists/armv5tel/glibc diff --git a/config/rootfiles/core/94/filelists/bind b/config/rootfiles/oldcore/94/filelists/bind similarity index 100% rename from config/rootfiles/core/94/filelists/bind rename to config/rootfiles/oldcore/94/filelists/bind diff --git a/config/rootfiles/core/94/filelists/chkconfig b/config/rootfiles/oldcore/94/filelists/chkconfig similarity index 100% rename from config/rootfiles/core/94/filelists/chkconfig rename to config/rootfiles/oldcore/94/filelists/chkconfig diff --git a/config/rootfiles/core/94/filelists/coreutils b/config/rootfiles/oldcore/94/filelists/coreutils similarity index 100% rename from config/rootfiles/core/94/filelists/coreutils rename to config/rootfiles/oldcore/94/filelists/coreutils diff --git a/config/rootfiles/core/94/filelists/dma b/config/rootfiles/oldcore/94/filelists/dma similarity index 100% rename from config/rootfiles/core/94/filelists/dma rename to config/rootfiles/oldcore/94/filelists/dma diff --git a/config/rootfiles/core/94/filelists/dnsmasq b/config/rootfiles/oldcore/94/filelists/dnsmasq similarity index 100% rename from config/rootfiles/core/94/filelists/dnsmasq rename to config/rootfiles/oldcore/94/filelists/dnsmasq diff --git a/config/rootfiles/core/94/filelists/file b/config/rootfiles/oldcore/94/filelists/file similarity index 100% rename from config/rootfiles/core/94/filelists/file rename to config/rootfiles/oldcore/94/filelists/file diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/oldcore/94/filelists/files similarity index 100% rename from config/rootfiles/core/94/filelists/files rename to config/rootfiles/oldcore/94/filelists/files diff --git a/config/rootfiles/core/94/filelists/fireinfo b/config/rootfiles/oldcore/94/filelists/fireinfo similarity index 100% rename from config/rootfiles/core/94/filelists/fireinfo rename to config/rootfiles/oldcore/94/filelists/fireinfo diff --git a/config/rootfiles/core/94/filelists/hdparm b/config/rootfiles/oldcore/94/filelists/hdparm similarity index 100% rename from config/rootfiles/core/94/filelists/hdparm rename to config/rootfiles/oldcore/94/filelists/hdparm diff --git a/config/rootfiles/core/94/filelists/i586/glibc b/config/rootfiles/oldcore/94/filelists/i586/glibc similarity index 100% rename from config/rootfiles/core/94/filelists/i586/glibc rename to config/rootfiles/oldcore/94/filelists/i586/glibc diff --git a/config/rootfiles/core/94/filelists/iproute2 b/config/rootfiles/oldcore/94/filelists/iproute2 similarity index 100% rename from config/rootfiles/core/94/filelists/iproute2 rename to config/rootfiles/oldcore/94/filelists/iproute2 diff --git a/config/rootfiles/core/94/filelists/libgcrypt b/config/rootfiles/oldcore/94/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/94/filelists/libgcrypt rename to config/rootfiles/oldcore/94/filelists/libgcrypt diff --git a/config/rootfiles/core/94/filelists/libgpg-error b/config/rootfiles/oldcore/94/filelists/libgpg-error similarity index 100% rename from config/rootfiles/core/94/filelists/libgpg-error rename to config/rootfiles/oldcore/94/filelists/libgpg-error diff --git a/config/rootfiles/core/94/filelists/openssh b/config/rootfiles/oldcore/94/filelists/openssh similarity index 100% rename from config/rootfiles/core/94/filelists/openssh rename to config/rootfiles/oldcore/94/filelists/openssh diff --git a/config/rootfiles/core/94/filelists/pcre b/config/rootfiles/oldcore/94/filelists/pcre similarity index 100% rename from config/rootfiles/core/94/filelists/pcre rename to config/rootfiles/oldcore/94/filelists/pcre diff --git a/config/rootfiles/core/94/filelists/perl-Email-Date-Format b/config/rootfiles/oldcore/94/filelists/perl-Email-Date-Format similarity index 100% rename from config/rootfiles/core/94/filelists/perl-Email-Date-Format rename to config/rootfiles/oldcore/94/filelists/perl-Email-Date-Format diff --git a/config/rootfiles/core/94/filelists/perl-MIME-Lite b/config/rootfiles/oldcore/94/filelists/perl-MIME-Lite similarity index 100% rename from config/rootfiles/core/94/filelists/perl-MIME-Lite rename to config/rootfiles/oldcore/94/filelists/perl-MIME-Lite diff --git a/config/rootfiles/core/94/filelists/rrdtool b/config/rootfiles/oldcore/94/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/94/filelists/rrdtool rename to config/rootfiles/oldcore/94/filelists/rrdtool diff --git a/config/rootfiles/core/94/filelists/setup b/config/rootfiles/oldcore/94/filelists/setup similarity index 100% rename from config/rootfiles/core/94/filelists/setup rename to config/rootfiles/oldcore/94/filelists/setup diff --git a/config/rootfiles/core/94/filelists/squid b/config/rootfiles/oldcore/94/filelists/squid similarity index 100% rename from config/rootfiles/core/94/filelists/squid rename to config/rootfiles/oldcore/94/filelists/squid diff --git a/config/rootfiles/oldcore/94/meta b/config/rootfiles/oldcore/94/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/94/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/94/update.sh b/config/rootfiles/oldcore/94/update.sh similarity index 100% rename from config/rootfiles/core/94/update.sh rename to config/rootfiles/oldcore/94/update.sh diff --git a/make.sh b/make.sh index c5cf466929..95877a4d7f 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.17" # Version number -CORE="94" # Core Level (Filename) +CORE="95" # Core Level (Filename) PAKFIRE_CORE="94" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2