From c42237247aec6de190d135b61213054b8b7e2e22 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 24 Sep 2017 15:51:12 +0200 Subject: [PATCH] start core115 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/{114 => 115}/exclude | 0 config/rootfiles/core/115/filelists/files | 2 + .../core/115/filelists/wpa_supplicant | 1 + config/rootfiles/core/{114 => 115}/meta | 0 config/rootfiles/core/115/update.sh | 63 +++++++++++++++++++ config/rootfiles/oldcore/114/exclude | 30 +++++++++ .../{core => oldcore}/114/filelists/apache2 | 0 .../{core => oldcore}/114/filelists/apr | 0 .../{core => oldcore}/114/filelists/aprutil | 0 .../{core => oldcore}/114/filelists/files | 0 .../{core => oldcore}/114/filelists/gnutls | 0 .../{core => oldcore}/114/filelists/hdparm | 0 .../114/filelists/i586/strongswan-padlock | 0 .../{core => oldcore}/114/filelists/php | 0 .../{core => oldcore}/114/filelists/squid | 0 .../114/filelists/strongswan | 0 .../{core => oldcore}/114/filelists/unbound | 0 config/rootfiles/oldcore/114/meta | 1 + .../rootfiles/{core => oldcore}/114/update.sh | 0 make.sh | 2 +- 20 files changed, 98 insertions(+), 1 deletion(-) rename config/rootfiles/core/{114 => 115}/exclude (100%) create mode 100644 config/rootfiles/core/115/filelists/files create mode 120000 config/rootfiles/core/115/filelists/wpa_supplicant rename config/rootfiles/core/{114 => 115}/meta (100%) create mode 100644 config/rootfiles/core/115/update.sh create mode 100644 config/rootfiles/oldcore/114/exclude rename config/rootfiles/{core => oldcore}/114/filelists/apache2 (100%) rename config/rootfiles/{core => oldcore}/114/filelists/apr (100%) rename config/rootfiles/{core => oldcore}/114/filelists/aprutil (100%) rename config/rootfiles/{core => oldcore}/114/filelists/files (100%) rename config/rootfiles/{core => oldcore}/114/filelists/gnutls (100%) rename config/rootfiles/{core => oldcore}/114/filelists/hdparm (100%) rename config/rootfiles/{core => oldcore}/114/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/{core => oldcore}/114/filelists/php (100%) rename config/rootfiles/{core => oldcore}/114/filelists/squid (100%) rename config/rootfiles/{core => oldcore}/114/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/114/filelists/unbound (100%) create mode 100644 config/rootfiles/oldcore/114/meta rename config/rootfiles/{core => oldcore}/114/update.sh (100%) diff --git a/config/rootfiles/core/114/exclude b/config/rootfiles/core/115/exclude similarity index 100% rename from config/rootfiles/core/114/exclude rename to config/rootfiles/core/115/exclude diff --git a/config/rootfiles/core/115/filelists/files b/config/rootfiles/core/115/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/115/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/115/filelists/wpa_supplicant b/config/rootfiles/core/115/filelists/wpa_supplicant new file mode 120000 index 0000000000..1d04c03c01 --- /dev/null +++ b/config/rootfiles/core/115/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/114/meta b/config/rootfiles/core/115/meta similarity index 100% rename from config/rootfiles/core/114/meta rename to config/rootfiles/core/115/meta diff --git a/config/rootfiles/core/115/update.sh b/config/rootfiles/core/115/update.sh new file mode 100644 index 0000000000..31fc09d38a --- /dev/null +++ b/config/rootfiles/core/115/update.sh @@ -0,0 +1,63 @@ +#!/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=115 + +# 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/114/exclude b/config/rootfiles/oldcore/114/exclude new file mode 100644 index 0000000000..d6fd053b6e --- /dev/null +++ b/config/rootfiles/oldcore/114/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/114/filelists/apache2 b/config/rootfiles/oldcore/114/filelists/apache2 similarity index 100% rename from config/rootfiles/core/114/filelists/apache2 rename to config/rootfiles/oldcore/114/filelists/apache2 diff --git a/config/rootfiles/core/114/filelists/apr b/config/rootfiles/oldcore/114/filelists/apr similarity index 100% rename from config/rootfiles/core/114/filelists/apr rename to config/rootfiles/oldcore/114/filelists/apr diff --git a/config/rootfiles/core/114/filelists/aprutil b/config/rootfiles/oldcore/114/filelists/aprutil similarity index 100% rename from config/rootfiles/core/114/filelists/aprutil rename to config/rootfiles/oldcore/114/filelists/aprutil diff --git a/config/rootfiles/core/114/filelists/files b/config/rootfiles/oldcore/114/filelists/files similarity index 100% rename from config/rootfiles/core/114/filelists/files rename to config/rootfiles/oldcore/114/filelists/files diff --git a/config/rootfiles/core/114/filelists/gnutls b/config/rootfiles/oldcore/114/filelists/gnutls similarity index 100% rename from config/rootfiles/core/114/filelists/gnutls rename to config/rootfiles/oldcore/114/filelists/gnutls diff --git a/config/rootfiles/core/114/filelists/hdparm b/config/rootfiles/oldcore/114/filelists/hdparm similarity index 100% rename from config/rootfiles/core/114/filelists/hdparm rename to config/rootfiles/oldcore/114/filelists/hdparm diff --git a/config/rootfiles/core/114/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/114/filelists/i586/strongswan-padlock similarity index 100% rename from config/rootfiles/core/114/filelists/i586/strongswan-padlock rename to config/rootfiles/oldcore/114/filelists/i586/strongswan-padlock diff --git a/config/rootfiles/core/114/filelists/php b/config/rootfiles/oldcore/114/filelists/php similarity index 100% rename from config/rootfiles/core/114/filelists/php rename to config/rootfiles/oldcore/114/filelists/php diff --git a/config/rootfiles/core/114/filelists/squid b/config/rootfiles/oldcore/114/filelists/squid similarity index 100% rename from config/rootfiles/core/114/filelists/squid rename to config/rootfiles/oldcore/114/filelists/squid diff --git a/config/rootfiles/core/114/filelists/strongswan b/config/rootfiles/oldcore/114/filelists/strongswan similarity index 100% rename from config/rootfiles/core/114/filelists/strongswan rename to config/rootfiles/oldcore/114/filelists/strongswan diff --git a/config/rootfiles/core/114/filelists/unbound b/config/rootfiles/oldcore/114/filelists/unbound similarity index 100% rename from config/rootfiles/core/114/filelists/unbound rename to config/rootfiles/oldcore/114/filelists/unbound diff --git a/config/rootfiles/oldcore/114/meta b/config/rootfiles/oldcore/114/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/114/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/114/update.sh b/config/rootfiles/oldcore/114/update.sh similarity index 100% rename from config/rootfiles/core/114/update.sh rename to config/rootfiles/oldcore/114/update.sh diff --git a/make.sh b/make.sh index 73b7b380b2..815b25aca7 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="114" # Core Level (Filename) +CORE="115" # Core Level (Filename) PAKFIRE_CORE="114" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan -- 2.39.5