Start Core Update 123
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 18 Jun 2018 15:43:04 +0000 (16:43 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 18 Jun 2018 15:43:04 +0000 (16:43 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
56 files changed:
config/rootfiles/core/123/exclude [moved from config/rootfiles/core/121/exclude with 100% similarity]
config/rootfiles/core/123/filelists/coreutils [new symlink]
config/rootfiles/core/123/filelists/files [new file with mode: 0644]
config/rootfiles/core/123/filelists/ipset [new symlink]
config/rootfiles/core/123/filelists/libgcrypt [new symlink]
config/rootfiles/core/123/filelists/tzdata [new symlink]
config/rootfiles/core/123/filelists/unbound [moved from config/rootfiles/core/121/filelists/unbound with 100% similarity]
config/rootfiles/core/123/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/121/exclude [new file with mode: 0644]
config/rootfiles/oldcore/121/filelists/acpid [moved from config/rootfiles/core/121/filelists/acpid with 100% similarity]
config/rootfiles/oldcore/121/filelists/apache2 [moved from config/rootfiles/core/121/filelists/apache2 with 100% similarity]
config/rootfiles/oldcore/121/filelists/apr [moved from config/rootfiles/core/121/filelists/apr with 100% similarity]
config/rootfiles/oldcore/121/filelists/aprutil [moved from config/rootfiles/core/121/filelists/aprutil with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/files [moved from config/rootfiles/core/121/filelists/armv5tel/files with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-multi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-initrd-rpi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-multi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-multi with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/linux-rpi [moved from config/rootfiles/core/121/filelists/armv5tel/linux-rpi with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/rpi-firmware [moved from config/rootfiles/core/121/filelists/armv5tel/rpi-firmware with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-kirkwood [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood with 100% similarity]
config/rootfiles/oldcore/121/filelists/armv5tel/u-boot-mkimage [moved from config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage with 100% similarity]
config/rootfiles/oldcore/121/filelists/beep [moved from config/rootfiles/core/121/filelists/beep with 100% similarity]
config/rootfiles/oldcore/121/filelists/ca-certificates [moved from config/rootfiles/core/121/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/121/filelists/cmake [moved from config/rootfiles/core/121/filelists/cmake with 100% similarity]
config/rootfiles/oldcore/121/filelists/crda [moved from config/rootfiles/core/121/filelists/crda with 100% similarity]
config/rootfiles/oldcore/121/filelists/dhcp [moved from config/rootfiles/core/121/filelists/dhcp with 100% similarity]
config/rootfiles/oldcore/121/filelists/files [moved from config/rootfiles/core/121/filelists/files with 100% similarity]
config/rootfiles/oldcore/121/filelists/flex [moved from config/rootfiles/core/121/filelists/flex with 100% similarity]
config/rootfiles/oldcore/121/filelists/i586/grub [moved from config/rootfiles/core/121/filelists/i586/grub with 100% similarity]
config/rootfiles/oldcore/121/filelists/i586/intel-microcode [moved from config/rootfiles/core/121/filelists/i586/intel-microcode with 100% similarity]
config/rootfiles/oldcore/121/filelists/i586/linux [moved from config/rootfiles/core/121/filelists/i586/linux with 100% similarity]
config/rootfiles/oldcore/121/filelists/i586/linux-initrd [moved from config/rootfiles/core/121/filelists/i586/linux-initrd with 100% similarity]
config/rootfiles/oldcore/121/filelists/iw [moved from config/rootfiles/core/121/filelists/iw with 100% similarity]
config/rootfiles/oldcore/121/filelists/jwhois [moved from config/rootfiles/core/121/filelists/jwhois with 100% similarity]
config/rootfiles/oldcore/121/filelists/libidn [moved from config/rootfiles/core/121/filelists/libidn with 100% similarity]
config/rootfiles/oldcore/121/filelists/linux-firmware [moved from config/rootfiles/core/121/filelists/linux-firmware with 100% similarity]
config/rootfiles/oldcore/121/filelists/multipath-tools [moved from config/rootfiles/core/121/filelists/multipath-tools with 100% similarity]
config/rootfiles/oldcore/121/filelists/openssl [moved from config/rootfiles/core/121/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/121/filelists/pcre [moved from config/rootfiles/core/121/filelists/pcre with 100% similarity]
config/rootfiles/oldcore/121/filelists/rng-tools [moved from config/rootfiles/core/121/filelists/rng-tools with 100% similarity]
config/rootfiles/oldcore/121/filelists/tar [moved from config/rootfiles/core/121/filelists/tar with 100% similarity]
config/rootfiles/oldcore/121/filelists/unbound [new symlink]
config/rootfiles/oldcore/121/filelists/wget [moved from config/rootfiles/core/121/filelists/wget with 100% similarity]
config/rootfiles/oldcore/121/filelists/x86_64/grub [moved from config/rootfiles/core/121/filelists/x86_64/grub with 100% similarity]
config/rootfiles/oldcore/121/filelists/x86_64/intel-microcode [moved from config/rootfiles/core/121/filelists/x86_64/intel-microcode with 100% similarity]
config/rootfiles/oldcore/121/filelists/x86_64/linux [moved from config/rootfiles/core/121/filelists/x86_64/linux with 100% similarity]
config/rootfiles/oldcore/121/filelists/x86_64/linux-initrd [moved from config/rootfiles/core/121/filelists/x86_64/linux-initrd with 100% similarity]
config/rootfiles/oldcore/121/filelists/xr819-firmware [moved from config/rootfiles/core/121/filelists/xr819-firmware with 100% similarity]
config/rootfiles/oldcore/121/filelists/xtables-addons [moved from config/rootfiles/core/121/filelists/xtables-addons with 100% similarity]
config/rootfiles/oldcore/121/filelists/xz [moved from config/rootfiles/core/121/filelists/xz with 100% similarity]
config/rootfiles/oldcore/121/meta [moved from config/rootfiles/core/121/meta with 100% similarity]
config/rootfiles/oldcore/121/update.sh [moved from config/rootfiles/core/121/update.sh with 100% similarity]
make.sh

diff --git a/config/rootfiles/core/123/filelists/coreutils b/config/rootfiles/core/123/filelists/coreutils
new file mode 120000 (symlink)
index 0000000..7351ed2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
new file mode 100644 (file)
index 0000000..2e8d796
--- /dev/null
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/123/filelists/ipset b/config/rootfiles/core/123/filelists/ipset
new file mode 120000 (symlink)
index 0000000..2b43691
--- /dev/null
@@ -0,0 +1 @@
+../../../common/ipset
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/libgcrypt b/config/rootfiles/core/123/filelists/libgcrypt
new file mode 120000 (symlink)
index 0000000..2df12a2
--- /dev/null
@@ -0,0 +1 @@
+../../../common/libgcrypt
\ No newline at end of file
diff --git a/config/rootfiles/core/123/filelists/tzdata b/config/rootfiles/core/123/filelists/tzdata
new file mode 120000 (symlink)
index 0000000..5a6e325
--- /dev/null
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh
new file mode 100644 (file)
index 0000000..1e9b1d1
--- /dev/null
@@ -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 <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=123
+
+# 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
+/etc/init.d/unbound restart
+
+# 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/121/exclude b/config/rootfiles/oldcore/121/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/config/rootfiles/oldcore/121/filelists/unbound b/config/rootfiles/oldcore/121/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/make.sh b/make.sh
index e8591f3..0238cc3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.21"                                                 # Version number
-CORE="121"                                                     # Core Level (Filename)
-PAKFIRE_CORE="120"                                             # Core Level (PAKFIRE)
+CORE="123"                                                     # Core Level (Filename)
+PAKFIRE_CORE="122"                                             # 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