Start Core Update 113

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/112/exclude b/config/rootfiles/core/113/exclude
similarity index 100%
rename from config/rootfiles/core/112/exclude
rename to config/rootfiles/core/113/exclude

diff --git a/config/rootfiles/core/113/filelists/files b/config/rootfiles/core/113/filelists/files
new file mode 100644 (file)
index 0000000..168c7d1
--- /dev/null
+++ b/config/rootfiles/core/113/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/langs

diff --git a/config/rootfiles/core/112/meta b/config/rootfiles/core/113/meta
similarity index 100%
rename from config/rootfiles/core/112/meta
rename to config/rootfiles/core/113/meta

diff --git a/config/rootfiles/core/113/update.sh b/config/rootfiles/core/113/update.sh
new file mode 100644 (file)
index 0000000..f3e0942
--- /dev/null
+++ b/config/rootfiles/core/113/update.sh
@@ -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=113
+
+# 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/112/exclude b/config/rootfiles/oldcore/112/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/112/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/112/filelists/armv5tel/binutils b/config/rootfiles/oldcore/112/filelists/armv5tel/binutils
similarity index 100%
rename from config/rootfiles/core/112/filelists/armv5tel/binutils
rename to config/rootfiles/oldcore/112/filelists/armv5tel/binutils

diff --git a/config/rootfiles/core/112/filelists/armv5tel/gcc b/config/rootfiles/oldcore/112/filelists/armv5tel/gcc
similarity index 100%
rename from config/rootfiles/core/112/filelists/armv5tel/gcc
rename to config/rootfiles/oldcore/112/filelists/armv5tel/gcc

diff --git a/config/rootfiles/core/112/filelists/armv5tel/glibc b/config/rootfiles/oldcore/112/filelists/armv5tel/glibc
similarity index 100%
rename from config/rootfiles/core/112/filelists/armv5tel/glibc
rename to config/rootfiles/oldcore/112/filelists/armv5tel/glibc

diff --git a/config/rootfiles/core/112/filelists/armv5tel/util-linux b/config/rootfiles/oldcore/112/filelists/armv5tel/util-linux
similarity index 100%
rename from config/rootfiles/core/112/filelists/armv5tel/util-linux
rename to config/rootfiles/oldcore/112/filelists/armv5tel/util-linux

diff --git a/config/rootfiles/core/112/filelists/autoconf b/config/rootfiles/oldcore/112/filelists/autoconf
similarity index 100%
rename from config/rootfiles/core/112/filelists/autoconf
rename to config/rootfiles/oldcore/112/filelists/autoconf

diff --git a/config/rootfiles/core/112/filelists/bc b/config/rootfiles/oldcore/112/filelists/bc
similarity index 100%
rename from config/rootfiles/core/112/filelists/bc
rename to config/rootfiles/oldcore/112/filelists/bc

diff --git a/config/rootfiles/core/112/filelists/boost b/config/rootfiles/oldcore/112/filelists/boost
similarity index 100%
rename from config/rootfiles/core/112/filelists/boost
rename to config/rootfiles/oldcore/112/filelists/boost

diff --git a/config/rootfiles/core/112/filelists/cmake b/config/rootfiles/oldcore/112/filelists/cmake
similarity index 100%
rename from config/rootfiles/core/112/filelists/cmake
rename to config/rootfiles/oldcore/112/filelists/cmake

diff --git a/config/rootfiles/core/112/filelists/files b/config/rootfiles/oldcore/112/filelists/files
similarity index 100%
rename from config/rootfiles/core/112/filelists/files
rename to config/rootfiles/oldcore/112/filelists/files

diff --git a/config/rootfiles/core/112/filelists/flex b/config/rootfiles/oldcore/112/filelists/flex
similarity index 100%
rename from config/rootfiles/core/112/filelists/flex
rename to config/rootfiles/oldcore/112/filelists/flex

diff --git a/config/rootfiles/core/112/filelists/fuse b/config/rootfiles/oldcore/112/filelists/fuse
similarity index 100%
rename from config/rootfiles/core/112/filelists/fuse
rename to config/rootfiles/oldcore/112/filelists/fuse

diff --git a/config/rootfiles/core/112/filelists/gawk b/config/rootfiles/oldcore/112/filelists/gawk
similarity index 100%
rename from config/rootfiles/core/112/filelists/gawk
rename to config/rootfiles/oldcore/112/filelists/gawk

diff --git a/config/rootfiles/core/112/filelists/gnutls b/config/rootfiles/oldcore/112/filelists/gnutls
similarity index 100%
rename from config/rootfiles/core/112/filelists/gnutls
rename to config/rootfiles/oldcore/112/filelists/gnutls

diff --git a/config/rootfiles/core/112/filelists/i586/binutils b/config/rootfiles/oldcore/112/filelists/i586/binutils
similarity index 100%
rename from config/rootfiles/core/112/filelists/i586/binutils
rename to config/rootfiles/oldcore/112/filelists/i586/binutils

diff --git a/config/rootfiles/core/112/filelists/i586/gcc b/config/rootfiles/oldcore/112/filelists/i586/gcc
similarity index 100%
rename from config/rootfiles/core/112/filelists/i586/gcc
rename to config/rootfiles/oldcore/112/filelists/i586/gcc

diff --git a/config/rootfiles/core/112/filelists/i586/glibc b/config/rootfiles/oldcore/112/filelists/i586/glibc
similarity index 100%
rename from config/rootfiles/core/112/filelists/i586/glibc
rename to config/rootfiles/oldcore/112/filelists/i586/glibc

diff --git a/config/rootfiles/core/112/filelists/i586/python b/config/rootfiles/oldcore/112/filelists/i586/python
similarity index 100%
rename from config/rootfiles/core/112/filelists/i586/python
rename to config/rootfiles/oldcore/112/filelists/i586/python

diff --git a/config/rootfiles/core/112/filelists/i586/util-linux b/config/rootfiles/oldcore/112/filelists/i586/util-linux
similarity index 100%
rename from config/rootfiles/core/112/filelists/i586/util-linux
rename to config/rootfiles/oldcore/112/filelists/i586/util-linux

diff --git a/config/rootfiles/core/112/filelists/kbd b/config/rootfiles/oldcore/112/filelists/kbd
similarity index 100%
rename from config/rootfiles/core/112/filelists/kbd
rename to config/rootfiles/oldcore/112/filelists/kbd

diff --git a/config/rootfiles/core/112/filelists/libarchive b/config/rootfiles/oldcore/112/filelists/libarchive
similarity index 100%
rename from config/rootfiles/core/112/filelists/libarchive
rename to config/rootfiles/oldcore/112/filelists/libarchive

diff --git a/config/rootfiles/core/112/filelists/libgcrypt b/config/rootfiles/oldcore/112/filelists/libgcrypt
similarity index 100%
rename from config/rootfiles/core/112/filelists/libgcrypt
rename to config/rootfiles/oldcore/112/filelists/libgcrypt

diff --git a/config/rootfiles/core/112/filelists/libgpg-error b/config/rootfiles/oldcore/112/filelists/libgpg-error
similarity index 100%
rename from config/rootfiles/core/112/filelists/libgpg-error
rename to config/rootfiles/oldcore/112/filelists/libgpg-error

diff --git a/config/rootfiles/core/112/filelists/libxml2 b/config/rootfiles/oldcore/112/filelists/libxml2
similarity index 100%
rename from config/rootfiles/core/112/filelists/libxml2
rename to config/rootfiles/oldcore/112/filelists/libxml2

diff --git a/config/rootfiles/core/112/filelists/ncurses b/config/rootfiles/oldcore/112/filelists/ncurses
similarity index 100%
rename from config/rootfiles/core/112/filelists/ncurses
rename to config/rootfiles/oldcore/112/filelists/ncurses

diff --git a/config/rootfiles/core/112/filelists/reiserfsprogs b/config/rootfiles/oldcore/112/filelists/reiserfsprogs
similarity index 100%
rename from config/rootfiles/core/112/filelists/reiserfsprogs
rename to config/rootfiles/oldcore/112/filelists/reiserfsprogs

diff --git a/config/rootfiles/core/112/filelists/sudo b/config/rootfiles/oldcore/112/filelists/sudo
similarity index 100%
rename from config/rootfiles/core/112/filelists/sudo
rename to config/rootfiles/oldcore/112/filelists/sudo

diff --git a/config/rootfiles/core/112/filelists/tzdata b/config/rootfiles/oldcore/112/filelists/tzdata
similarity index 100%
rename from config/rootfiles/core/112/filelists/tzdata
rename to config/rootfiles/oldcore/112/filelists/tzdata

diff --git a/config/rootfiles/core/112/filelists/unbound b/config/rootfiles/oldcore/112/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/112/filelists/unbound
rename to config/rootfiles/oldcore/112/filelists/unbound

diff --git a/config/rootfiles/core/112/filelists/web-user-interface b/config/rootfiles/oldcore/112/filelists/web-user-interface
similarity index 100%
rename from config/rootfiles/core/112/filelists/web-user-interface
rename to config/rootfiles/oldcore/112/filelists/web-user-interface

diff --git a/config/rootfiles/core/112/filelists/x86_64/binutils b/config/rootfiles/oldcore/112/filelists/x86_64/binutils
similarity index 100%
rename from config/rootfiles/core/112/filelists/x86_64/binutils
rename to config/rootfiles/oldcore/112/filelists/x86_64/binutils

diff --git a/config/rootfiles/core/112/filelists/x86_64/gcc b/config/rootfiles/oldcore/112/filelists/x86_64/gcc
similarity index 100%
rename from config/rootfiles/core/112/filelists/x86_64/gcc
rename to config/rootfiles/oldcore/112/filelists/x86_64/gcc

diff --git a/config/rootfiles/core/112/filelists/x86_64/glibc b/config/rootfiles/oldcore/112/filelists/x86_64/glibc
similarity index 100%
rename from config/rootfiles/core/112/filelists/x86_64/glibc
rename to config/rootfiles/oldcore/112/filelists/x86_64/glibc

diff --git a/config/rootfiles/core/112/filelists/x86_64/python b/config/rootfiles/oldcore/112/filelists/x86_64/python
similarity index 100%
rename from config/rootfiles/core/112/filelists/x86_64/python
rename to config/rootfiles/oldcore/112/filelists/x86_64/python

diff --git a/config/rootfiles/core/112/filelists/x86_64/util-linux b/config/rootfiles/oldcore/112/filelists/x86_64/util-linux
similarity index 100%
rename from config/rootfiles/core/112/filelists/x86_64/util-linux
rename to config/rootfiles/oldcore/112/filelists/x86_64/util-linux

diff --git a/config/rootfiles/oldcore/112/meta b/config/rootfiles/oldcore/112/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/112/meta
@@ -0,0 +1 @@
+DEPS=""

diff --git a/config/rootfiles/core/112/update.sh b/config/rootfiles/oldcore/112/update.sh
similarity index 100%
rename from config/rootfiles/core/112/update.sh
rename to config/rootfiles/oldcore/112/update.sh

diff --git a/make.sh b/make.sh
index 663f23fbb9dc27f5c5bdbe71d26216dfe74577ce..f2a8b2baead33940ef5c5e4f5e33fe73191efea7 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.19"                                                 # Version number
-CORE="112"                                                     # Core Level (Filename)
+CORE="113"                                                     # Core Level (Filename)
 PAKFIRE_CORE="112"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan