From b450e7e3e6f47734e7282bf37953912b9ef6c740 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 14 Mar 2019 13:15:03 +0000 Subject: [PATCH] Start Core Update 130 Signed-off-by: Michael Tremer --- config/rootfiles/core/{129 => 130}/exclude | 0 config/rootfiles/core/130/filelists/files | 5 ++ config/rootfiles/core/130/update.sh | 64 +++++++++++++++++++ config/rootfiles/oldcore/129/exclude | 28 ++++++++ .../129/filelists/aarch64/u-boot | 0 .../129/filelists/armv5tel/u-boot | 0 .../{core => oldcore}/129/filelists/bind | 0 .../{core => oldcore}/129/filelists/files | 0 .../{core => oldcore}/129/filelists/groff | 0 .../129/filelists/i586/openssl-sse2 | 0 .../{core => oldcore}/129/filelists/ipset | 0 .../{core => oldcore}/129/filelists/knot | 0 .../{core => oldcore}/129/filelists/less | 0 .../{core => oldcore}/129/filelists/libgcrypt | 0 .../{core => oldcore}/129/filelists/openssl | 0 .../{core => oldcore}/129/filelists/openvpn | 0 .../{core => oldcore}/129/filelists/squid | 0 .../129/filelists/strongswan | 0 .../{core => oldcore}/129/filelists/tar | 0 .../{core => oldcore}/129/filelists/unbound | 0 .../129/filelists/wpa_supplicant | 0 .../rootfiles/{core => oldcore}/129/update.sh | 0 make.sh | 4 +- 23 files changed, 99 insertions(+), 2 deletions(-) rename config/rootfiles/core/{129 => 130}/exclude (100%) create mode 100644 config/rootfiles/core/130/filelists/files create mode 100644 config/rootfiles/core/130/update.sh create mode 100644 config/rootfiles/oldcore/129/exclude rename config/rootfiles/{core => oldcore}/129/filelists/aarch64/u-boot (100%) rename config/rootfiles/{core => oldcore}/129/filelists/armv5tel/u-boot (100%) rename config/rootfiles/{core => oldcore}/129/filelists/bind (100%) rename config/rootfiles/{core => oldcore}/129/filelists/files (100%) rename config/rootfiles/{core => oldcore}/129/filelists/groff (100%) rename config/rootfiles/{core => oldcore}/129/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/129/filelists/ipset (100%) rename config/rootfiles/{core => oldcore}/129/filelists/knot (100%) rename config/rootfiles/{core => oldcore}/129/filelists/less (100%) rename config/rootfiles/{core => oldcore}/129/filelists/libgcrypt (100%) rename config/rootfiles/{core => oldcore}/129/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/129/filelists/openvpn (100%) rename config/rootfiles/{core => oldcore}/129/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/129/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/129/filelists/tar (100%) rename config/rootfiles/{core => oldcore}/129/filelists/unbound (100%) rename config/rootfiles/{core => oldcore}/129/filelists/wpa_supplicant (100%) rename config/rootfiles/{core => oldcore}/129/update.sh (100%) diff --git a/config/rootfiles/core/129/exclude b/config/rootfiles/core/130/exclude similarity index 100% rename from config/rootfiles/core/129/exclude rename to config/rootfiles/core/130/exclude diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files new file mode 100644 index 0000000000..b5ce7f004f --- /dev/null +++ b/config/rootfiles/core/130/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh new file mode 100644 index 0000000000..93530cb531 --- /dev/null +++ b/config/rootfiles/core/130/update.sh @@ -0,0 +1,64 @@ +#!/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) 2019 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=130 + +# 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 + +# Remove files + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Start services + +# This update needs 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/129/exclude b/config/rootfiles/oldcore/129/exclude new file mode 100644 index 0000000000..b221598781 --- /dev/null +++ b/config/rootfiles/oldcore/129/exclude @@ -0,0 +1,28 @@ +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/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/129/filelists/aarch64/u-boot b/config/rootfiles/oldcore/129/filelists/aarch64/u-boot similarity index 100% rename from config/rootfiles/core/129/filelists/aarch64/u-boot rename to config/rootfiles/oldcore/129/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/129/filelists/armv5tel/u-boot b/config/rootfiles/oldcore/129/filelists/armv5tel/u-boot similarity index 100% rename from config/rootfiles/core/129/filelists/armv5tel/u-boot rename to config/rootfiles/oldcore/129/filelists/armv5tel/u-boot diff --git a/config/rootfiles/core/129/filelists/bind b/config/rootfiles/oldcore/129/filelists/bind similarity index 100% rename from config/rootfiles/core/129/filelists/bind rename to config/rootfiles/oldcore/129/filelists/bind diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/oldcore/129/filelists/files similarity index 100% rename from config/rootfiles/core/129/filelists/files rename to config/rootfiles/oldcore/129/filelists/files diff --git a/config/rootfiles/core/129/filelists/groff b/config/rootfiles/oldcore/129/filelists/groff similarity index 100% rename from config/rootfiles/core/129/filelists/groff rename to config/rootfiles/oldcore/129/filelists/groff diff --git a/config/rootfiles/core/129/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/129/filelists/i586/openssl-sse2 similarity index 100% rename from config/rootfiles/core/129/filelists/i586/openssl-sse2 rename to config/rootfiles/oldcore/129/filelists/i586/openssl-sse2 diff --git a/config/rootfiles/core/129/filelists/ipset b/config/rootfiles/oldcore/129/filelists/ipset similarity index 100% rename from config/rootfiles/core/129/filelists/ipset rename to config/rootfiles/oldcore/129/filelists/ipset diff --git a/config/rootfiles/core/129/filelists/knot b/config/rootfiles/oldcore/129/filelists/knot similarity index 100% rename from config/rootfiles/core/129/filelists/knot rename to config/rootfiles/oldcore/129/filelists/knot diff --git a/config/rootfiles/core/129/filelists/less b/config/rootfiles/oldcore/129/filelists/less similarity index 100% rename from config/rootfiles/core/129/filelists/less rename to config/rootfiles/oldcore/129/filelists/less diff --git a/config/rootfiles/core/129/filelists/libgcrypt b/config/rootfiles/oldcore/129/filelists/libgcrypt similarity index 100% rename from config/rootfiles/core/129/filelists/libgcrypt rename to config/rootfiles/oldcore/129/filelists/libgcrypt diff --git a/config/rootfiles/core/129/filelists/openssl b/config/rootfiles/oldcore/129/filelists/openssl similarity index 100% rename from config/rootfiles/core/129/filelists/openssl rename to config/rootfiles/oldcore/129/filelists/openssl diff --git a/config/rootfiles/core/129/filelists/openvpn b/config/rootfiles/oldcore/129/filelists/openvpn similarity index 100% rename from config/rootfiles/core/129/filelists/openvpn rename to config/rootfiles/oldcore/129/filelists/openvpn diff --git a/config/rootfiles/core/129/filelists/squid b/config/rootfiles/oldcore/129/filelists/squid similarity index 100% rename from config/rootfiles/core/129/filelists/squid rename to config/rootfiles/oldcore/129/filelists/squid diff --git a/config/rootfiles/core/129/filelists/strongswan b/config/rootfiles/oldcore/129/filelists/strongswan similarity index 100% rename from config/rootfiles/core/129/filelists/strongswan rename to config/rootfiles/oldcore/129/filelists/strongswan diff --git a/config/rootfiles/core/129/filelists/tar b/config/rootfiles/oldcore/129/filelists/tar similarity index 100% rename from config/rootfiles/core/129/filelists/tar rename to config/rootfiles/oldcore/129/filelists/tar diff --git a/config/rootfiles/core/129/filelists/unbound b/config/rootfiles/oldcore/129/filelists/unbound similarity index 100% rename from config/rootfiles/core/129/filelists/unbound rename to config/rootfiles/oldcore/129/filelists/unbound diff --git a/config/rootfiles/core/129/filelists/wpa_supplicant b/config/rootfiles/oldcore/129/filelists/wpa_supplicant similarity index 100% rename from config/rootfiles/core/129/filelists/wpa_supplicant rename to config/rootfiles/oldcore/129/filelists/wpa_supplicant diff --git a/config/rootfiles/core/129/update.sh b/config/rootfiles/oldcore/129/update.sh similarity index 100% rename from config/rootfiles/core/129/update.sh rename to config/rootfiles/oldcore/129/update.sh diff --git a/make.sh b/make.sh index 3453c6719e..079f02eaf2 100755 --- a/make.sh +++ b/make.sh @@ -24,8 +24,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.21" # Version number -CORE="129" # Core Level (Filename) +VERSION="2.23" # Version number +CORE="130" # Core Level (Filename) PAKFIRE_CORE="129" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.2