From f1f1114a8bd7a24a6d62c9ff47b75be29aef4dcd Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 15 Apr 2014 21:25:24 +0200 Subject: [PATCH] Build Core Update 76. --- config/rootfiles/core/76/exclude | 17 ++++++ config/rootfiles/core/76/filelists/files | 2 + .../core/76/filelists/i586/strongswan-padlock | 1 + config/rootfiles/core/76/filelists/strongswan | 1 + config/rootfiles/core/76/meta | 1 + config/rootfiles/core/76/update.sh | 58 +++++++++++++++++++ make.sh | 4 +- 7 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 config/rootfiles/core/76/exclude create mode 100644 config/rootfiles/core/76/filelists/files create mode 120000 config/rootfiles/core/76/filelists/i586/strongswan-padlock create mode 120000 config/rootfiles/core/76/filelists/strongswan create mode 100644 config/rootfiles/core/76/meta create mode 100644 config/rootfiles/core/76/update.sh diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/exclude new file mode 100644 index 0000000000..321a931ca5 --- /dev/null +++ b/config/rootfiles/core/76/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files new file mode 100644 index 0000000000..409e5fe8ac --- /dev/null +++ b/config/rootfiles/core/76/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/76/filelists/i586/strongswan-padlock b/config/rootfiles/core/76/filelists/i586/strongswan-padlock new file mode 120000 index 0000000000..2412824fb2 --- /dev/null +++ b/config/rootfiles/core/76/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/76/filelists/strongswan b/config/rootfiles/core/76/filelists/strongswan new file mode 120000 index 0000000000..90c727e265 --- /dev/null +++ b/config/rootfiles/core/76/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/76/meta b/config/rootfiles/core/76/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/76/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/76/update.sh b/config/rootfiles/core/76/update.sh new file mode 100644 index 0000000000..c05b652841 --- /dev/null +++ b/config/rootfiles/core/76/update.sh @@ -0,0 +1,58 @@ +#!/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) 2013 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=76 +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 + +# Start services +if grep -q "ENABLED=on" /var/ipfire/vpn/settings 2>/dev/null; then + /etc/init.d/ipsec start +fi + +# Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 0e20908c31..de2830c32b 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="75" # Core Level (Filename) -PAKFIRE_CORE="75" # Core Level (PAKFIRE) +CORE="76" # Core Level (Filename) +PAKFIRE_CORE="76" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir -- 2.39.5