From 338087530c10ee9599b8421a66ebf7773755aa5a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Feb 2018 11:22:58 +0000 Subject: [PATCH] Start Core Update 119 Signed-off-by: Michael Tremer --- config/rootfiles/core/{118 => 119}/exclude | 0 config/rootfiles/core/119/filelists/files | 3 + config/rootfiles/core/{118 => 119}/meta | 0 config/rootfiles/core/119/update.sh | 62 +++++++++++++++++++ config/rootfiles/oldcore/118/exclude | 30 +++++++++ .../{core => oldcore}/118/filelists/bind | 0 .../{core => oldcore}/118/filelists/files | 0 .../{core => oldcore}/118/filelists/glib | 0 .../{core => oldcore}/118/filelists/gzip | 0 .../{core => oldcore}/118/filelists/hdparm | 0 .../118/filelists/i586/dmidecode | 0 .../{core => oldcore}/118/filelists/lz4 | 0 .../{core => oldcore}/118/filelists/openssh | 0 .../{core => oldcore}/118/filelists/poppler | 0 .../{core => oldcore}/118/filelists/sed | 0 .../{core => oldcore}/118/filelists/snort | 0 .../{core => oldcore}/118/filelists/squid | 0 .../{core => oldcore}/118/filelists/unbound | 0 .../{core => oldcore}/118/filelists/wget | 0 .../118/filelists/x86_64/dmidecode | 0 config/rootfiles/oldcore/118/meta | 1 + .../rootfiles/{core => oldcore}/118/update.sh | 0 make.sh | 2 +- 23 files changed, 97 insertions(+), 1 deletion(-) rename config/rootfiles/core/{118 => 119}/exclude (100%) create mode 100644 config/rootfiles/core/119/filelists/files rename config/rootfiles/core/{118 => 119}/meta (100%) create mode 100644 config/rootfiles/core/119/update.sh create mode 100644 config/rootfiles/oldcore/118/exclude rename config/rootfiles/{core => oldcore}/118/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/118/filelists/files (100%) rename config/rootfiles/{core => oldcore}/118/filelists/glib (100%) rename config/rootfiles/{core => oldcore}/118/filelists/gzip (100%) rename config/rootfiles/{core => oldcore}/118/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/118/filelists/i586/dmidecode (100%) rename config/rootfiles/{core => oldcore}/118/filelists/lz4 (100%) rename config/rootfiles/{core => oldcore}/118/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/118/filelists/poppler (100%) rename config/rootfiles/{core => oldcore}/118/filelists/sed (100%) rename config/rootfiles/{core => oldcore}/118/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/118/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/118/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/118/filelists/wget (100%) rename config/rootfiles/{core => oldcore}/118/filelists/x86_64/dmidecode (100%) create mode 100644 config/rootfiles/oldcore/118/meta rename config/rootfiles/{core => oldcore}/118/update.sh (100%) diff --git a/config/rootfiles/core/118/exclude b/config/rootfiles/core/119/exclude similarity index 100% rename from config/rootfiles/core/118/exclude rename to config/rootfiles/core/119/exclude diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files new file mode 100644 index 0000000000..168c7d188b --- /dev/null +++ b/config/rootfiles/core/119/filelists/files @@ -0,0 +1,3 @@ +etc/system-release +etc/issue +var/ipfire/langs diff --git a/config/rootfiles/core/118/meta b/config/rootfiles/core/119/meta similarity index 100% rename from config/rootfiles/core/118/meta rename to config/rootfiles/core/119/meta diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh new file mode 100644 index 0000000000..9e275ef8c4 --- /dev/null +++ b/config/rootfiles/core/119/update.sh @@ -0,0 +1,62 @@ +#!/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) 2017 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=119 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# 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/118/exclude b/config/rootfiles/oldcore/118/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/118/exclude @@ -0,0 +1,30 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +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/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/118/filelists/bind b/config/rootfiles/oldcore/118/filelists/bind similarity index 100% rename from config/rootfiles/core/118/filelists/bind rename to config/rootfiles/oldcore/118/filelists/bind diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/oldcore/118/filelists/files similarity index 100% rename from config/rootfiles/core/118/filelists/files rename to config/rootfiles/oldcore/118/filelists/files diff --git a/config/rootfiles/core/118/filelists/glib b/config/rootfiles/oldcore/118/filelists/glib similarity index 100% rename from config/rootfiles/core/118/filelists/glib rename to config/rootfiles/oldcore/118/filelists/glib diff --git a/config/rootfiles/core/118/filelists/gzip b/config/rootfiles/oldcore/118/filelists/gzip similarity index 100% rename from config/rootfiles/core/118/filelists/gzip rename to config/rootfiles/oldcore/118/filelists/gzip diff --git a/config/rootfiles/core/118/filelists/hdparm b/config/rootfiles/oldcore/118/filelists/hdparm similarity index 100% rename from config/rootfiles/core/118/filelists/hdparm rename to config/rootfiles/oldcore/118/filelists/hdparm diff --git a/config/rootfiles/core/118/filelists/i586/dmidecode b/config/rootfiles/oldcore/118/filelists/i586/dmidecode similarity index 100% rename from config/rootfiles/core/118/filelists/i586/dmidecode rename to config/rootfiles/oldcore/118/filelists/i586/dmidecode diff --git a/config/rootfiles/core/118/filelists/lz4 b/config/rootfiles/oldcore/118/filelists/lz4 similarity index 100% rename from config/rootfiles/core/118/filelists/lz4 rename to config/rootfiles/oldcore/118/filelists/lz4 diff --git a/config/rootfiles/core/118/filelists/openssh b/config/rootfiles/oldcore/118/filelists/openssh similarity index 100% rename from config/rootfiles/core/118/filelists/openssh rename to config/rootfiles/oldcore/118/filelists/openssh diff --git a/config/rootfiles/core/118/filelists/poppler b/config/rootfiles/oldcore/118/filelists/poppler similarity index 100% rename from config/rootfiles/core/118/filelists/poppler rename to config/rootfiles/oldcore/118/filelists/poppler diff --git a/config/rootfiles/core/118/filelists/sed b/config/rootfiles/oldcore/118/filelists/sed similarity index 100% rename from config/rootfiles/core/118/filelists/sed rename to config/rootfiles/oldcore/118/filelists/sed diff --git a/config/rootfiles/core/118/filelists/snort b/config/rootfiles/oldcore/118/filelists/snort similarity index 100% rename from config/rootfiles/core/118/filelists/snort rename to config/rootfiles/oldcore/118/filelists/snort diff --git a/config/rootfiles/core/118/filelists/squid b/config/rootfiles/oldcore/118/filelists/squid similarity index 100% rename from config/rootfiles/core/118/filelists/squid rename to config/rootfiles/oldcore/118/filelists/squid diff --git a/config/rootfiles/core/118/filelists/unbound b/config/rootfiles/oldcore/118/filelists/unbound similarity index 100% rename from config/rootfiles/core/118/filelists/unbound rename to config/rootfiles/oldcore/118/filelists/unbound diff --git a/config/rootfiles/core/118/filelists/wget b/config/rootfiles/oldcore/118/filelists/wget similarity index 100% rename from config/rootfiles/core/118/filelists/wget rename to config/rootfiles/oldcore/118/filelists/wget diff --git a/config/rootfiles/core/118/filelists/x86_64/dmidecode b/config/rootfiles/oldcore/118/filelists/x86_64/dmidecode similarity index 100% rename from config/rootfiles/core/118/filelists/x86_64/dmidecode rename to config/rootfiles/oldcore/118/filelists/x86_64/dmidecode diff --git a/config/rootfiles/oldcore/118/meta b/config/rootfiles/oldcore/118/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/118/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/oldcore/118/update.sh similarity index 100% rename from config/rootfiles/core/118/update.sh rename to config/rootfiles/oldcore/118/update.sh diff --git a/make.sh b/make.sh index 4fa48f20b2..a97e8afb9a 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="118" # Core Level (Filename) +CORE="119" # Core Level (Filename) PAKFIRE_CORE="118" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2