Start Core Update 121
authorPeter Müller <peter.mueller@link38.eu>
Thu, 26 Apr 2018 15:06:51 +0000 (17:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 27 Apr 2018 10:04:21 +0000 (11:04 +0100)
Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
31 files changed:
config/rootfiles/core/121/exclude [moved from config/rootfiles/core/120/exclude with 100% similarity]
config/rootfiles/core/121/meta [moved from config/rootfiles/core/120/meta with 100% similarity]
config/rootfiles/core/121/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/120/exclude [new file with mode: 0644]
config/rootfiles/oldcore/120/filelists/Net_SSLeay [moved from config/rootfiles/core/120/filelists/Net_SSLeay with 100% similarity]
config/rootfiles/oldcore/120/filelists/apache2 [moved from config/rootfiles/core/120/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/120/filelists/apr [moved from config/rootfiles/core/120/filelists/apr with 100% similarity]
config/rootfiles/oldcore/120/filelists/aprutil [moved from config/rootfiles/core/120/filelists/aprutil with 100% similarity]
config/rootfiles/oldcore/120/filelists/bind [moved from config/rootfiles/core/120/filelists/bind with 100% similarity]
config/rootfiles/oldcore/120/filelists/curl [moved from config/rootfiles/core/120/filelists/curl with 100% similarity]
config/rootfiles/oldcore/120/filelists/cyrus-sasl [moved from config/rootfiles/core/120/filelists/cyrus-sasl with 100% similarity]
config/rootfiles/oldcore/120/filelists/dma [moved from config/rootfiles/core/120/filelists/dma with 100% similarity]
config/rootfiles/oldcore/120/filelists/files [moved from config/rootfiles/core/120/filelists/files with 100% similarity]
config/rootfiles/oldcore/120/filelists/gnupg [moved from config/rootfiles/core/120/filelists/gnupg with 100% similarity]
config/rootfiles/oldcore/120/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/120/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/120/filelists/libevent2 [moved from config/rootfiles/core/120/filelists/libevent2 with 100% similarity]
config/rootfiles/oldcore/120/filelists/logrotate [moved from config/rootfiles/core/120/filelists/logrotate with 100% similarity]
config/rootfiles/oldcore/120/filelists/ntp [moved from config/rootfiles/core/120/filelists/ntp with 100% similarity]
config/rootfiles/oldcore/120/filelists/openssh [moved from config/rootfiles/core/120/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/120/filelists/openssl [moved from config/rootfiles/core/120/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/120/filelists/openssl-compat [moved from config/rootfiles/core/120/filelists/openssl-compat with 100% similarity]
config/rootfiles/oldcore/120/filelists/openvpn [moved from config/rootfiles/core/120/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/120/filelists/python-typing [moved from config/rootfiles/core/120/filelists/python-typing with 100% similarity]
config/rootfiles/oldcore/120/filelists/snort [moved from config/rootfiles/core/120/filelists/snort with 100% similarity]
config/rootfiles/oldcore/120/filelists/strongswan [moved from config/rootfiles/core/120/filelists/strongswan with 100% similarity]
config/rootfiles/oldcore/120/filelists/unbound [moved from config/rootfiles/core/120/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/120/filelists/vnstat [moved from config/rootfiles/core/120/filelists/vnstat with 100% similarity]
config/rootfiles/oldcore/120/filelists/wget [moved from config/rootfiles/core/120/filelists/wget with 100% similarity]
config/rootfiles/oldcore/120/filelists/wpa_supplicant [moved from config/rootfiles/core/120/filelists/wpa_supplicant with 100% similarity]
config/rootfiles/oldcore/120/update.sh [moved from config/rootfiles/core/120/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
new file mode 100644 (file)
index 0000000..9986316
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=120
+
+# 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 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/120/exclude b/config/rootfiles/oldcore/120/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
@@ -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/make.sh b/make.sh
index 1f87386..85f101b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="120"                                                     # Core Level (Filename)
-PAKFIRE_CORE="120"                                             # Core Level (PAKFIRE)
+CORE="121"                                                     # Core Level (Filename)
+PAKFIRE_CORE="121"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir