From: Michael Tremer Date: Mon, 28 Nov 2016 21:48:21 +0000 (+0000) Subject: Start Core Update 108 X-Git-Tag: v2.19-core108~16 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=49750f72dee50a2103ead403b16630b67a838231 Start Core Update 108 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/108/exclude b/config/rootfiles/core/108/exclude new file mode 100644 index 0000000000..7ddeae0ba3 --- /dev/null +++ b/config/rootfiles/core/108/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/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/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/108/filelists/files b/config/rootfiles/core/108/filelists/files new file mode 100644 index 0000000000..9fc9dbd8f8 --- /dev/null +++ b/config/rootfiles/core/108/filelists/files @@ -0,0 +1,4 @@ +etc/system-release +etc/issue +etc/unbound/unbound.conf +srv/web/ipfire/cgi-bin/fwhosts.cgi diff --git a/config/rootfiles/core/108/filelists/i586/strongswan-padlock b/config/rootfiles/core/108/filelists/i586/strongswan-padlock new file mode 120000 index 0000000000..2412824fb2 --- /dev/null +++ b/config/rootfiles/core/108/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/108/filelists/strongswan b/config/rootfiles/core/108/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/108/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/107/meta b/config/rootfiles/core/108/meta similarity index 100% rename from config/rootfiles/core/107/meta rename to config/rootfiles/core/108/meta diff --git a/config/rootfiles/core/108/update.sh b/config/rootfiles/core/108/update.sh new file mode 100644 index 0000000000..045f7e7fa3 --- /dev/null +++ b/config/rootfiles/core/108/update.sh @@ -0,0 +1,66 @@ +#!/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) 2016 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=108 + +# 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 +/etc/init.d/ipsec stop + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# Start services +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# 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/core/107/exclude b/config/rootfiles/oldcore/107/exclude similarity index 100% rename from config/rootfiles/core/107/exclude rename to config/rootfiles/oldcore/107/exclude diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood b/config/rootfiles/oldcore/107/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/107/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/oldcore/107/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/107/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/107/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/107/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/107/filelists/armv5tel/linux-rpi b/config/rootfiles/oldcore/107/filelists/armv5tel/linux-rpi similarity index 100% rename from config/rootfiles/core/107/filelists/armv5tel/linux-rpi rename to config/rootfiles/oldcore/107/filelists/armv5tel/linux-rpi diff --git a/config/rootfiles/core/107/filelists/files b/config/rootfiles/oldcore/107/filelists/files similarity index 100% rename from config/rootfiles/core/107/filelists/files rename to config/rootfiles/oldcore/107/filelists/files diff --git a/config/rootfiles/core/107/filelists/hdparm b/config/rootfiles/oldcore/107/filelists/hdparm similarity index 100% rename from config/rootfiles/core/107/filelists/hdparm rename to config/rootfiles/oldcore/107/filelists/hdparm diff --git a/config/rootfiles/core/107/filelists/i586/linux b/config/rootfiles/oldcore/107/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/107/filelists/i586/linux rename to config/rootfiles/oldcore/107/filelists/i586/linux diff --git a/config/rootfiles/core/107/filelists/libjpeg b/config/rootfiles/oldcore/107/filelists/libjpeg similarity index 100% rename from config/rootfiles/core/107/filelists/libjpeg rename to config/rootfiles/oldcore/107/filelists/libjpeg diff --git a/config/rootfiles/core/107/filelists/libjpeg-compat b/config/rootfiles/oldcore/107/filelists/libjpeg-compat similarity index 100% rename from config/rootfiles/core/107/filelists/libjpeg-compat rename to config/rootfiles/oldcore/107/filelists/libjpeg-compat diff --git a/config/rootfiles/core/107/filelists/squid b/config/rootfiles/oldcore/107/filelists/squid similarity index 100% rename from config/rootfiles/core/107/filelists/squid rename to config/rootfiles/oldcore/107/filelists/squid diff --git a/config/rootfiles/core/107/filelists/x86_64/linux b/config/rootfiles/oldcore/107/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/107/filelists/x86_64/linux rename to config/rootfiles/oldcore/107/filelists/x86_64/linux diff --git a/config/rootfiles/oldcore/107/meta b/config/rootfiles/oldcore/107/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/oldcore/107/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/107/update.sh b/config/rootfiles/oldcore/107/update.sh similarity index 100% rename from config/rootfiles/core/107/update.sh rename to config/rootfiles/oldcore/107/update.sh diff --git a/make.sh b/make.sh index 4b7beb87e5..4c5996afa0 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="107" # Core Level (Filename) +CORE="108" # Core Level (Filename) PAKFIRE_CORE="107" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan