Start Core Update 110

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

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

diff --git a/config/rootfiles/core/109/filelists/bind b/config/rootfiles/core/110/filelists/bind
similarity index 100%
rename from config/rootfiles/core/109/filelists/bind
rename to config/rootfiles/core/110/filelists/bind

diff --git a/config/rootfiles/core/110/filelists/cairo b/config/rootfiles/core/110/filelists/cairo
new file mode 120000 (symlink)
index 0000000..bf48d25
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/cairo
@@ -0,0 +1 @@
+../../../common/cairo
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/files b/config/rootfiles/core/110/filelists/files
new file mode 100644 (file)
index 0000000..670b9ae
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/files
@@ -0,0 +1,8 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/libssp.so.0
+usr/lib/libssp.so.0.0.0
+usr/local/bin/xt_geoip_update
+var/ipfire/langs

diff --git a/config/rootfiles/core/110/filelists/fontconfig b/config/rootfiles/core/110/filelists/fontconfig
new file mode 120000 (symlink)
index 0000000..6daeffd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/fontconfig
@@ -0,0 +1 @@
+../../../common/fontconfig
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/freetype b/config/rootfiles/core/110/filelists/freetype
new file mode 120000 (symlink)
index 0000000..79ec5c4
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/freetype
@@ -0,0 +1 @@
+../../../common/freetype
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/gnutls b/config/rootfiles/core/110/filelists/gnutls
new file mode 120000 (symlink)
index 0000000..8dbe60b
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/lcms2 b/config/rootfiles/core/110/filelists/lcms2
new file mode 120000 (symlink)
index 0000000..f72a394
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/lcms2
@@ -0,0 +1 @@
+../../../common/lcms2
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/openssh b/config/rootfiles/core/110/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/pixman b/config/rootfiles/core/110/filelists/pixman
new file mode 120000 (symlink)
index 0000000..fdb6346
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/pixman
@@ -0,0 +1 @@
+../../../common/pixman
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/poppler b/config/rootfiles/core/110/filelists/poppler
new file mode 120000 (symlink)
index 0000000..39aa6c2
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
\ No newline at end of file

diff --git a/config/rootfiles/core/110/filelists/qpdf b/config/rootfiles/core/110/filelists/qpdf
new file mode 120000 (symlink)
index 0000000..2d6c43d
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/qpdf
@@ -0,0 +1 @@
+../../../common/qpdf
\ No newline at end of file

diff --git a/config/rootfiles/core/109/filelists/squid b/config/rootfiles/core/110/filelists/squid
similarity index 100%
rename from config/rootfiles/core/109/filelists/squid
rename to config/rootfiles/core/110/filelists/squid

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

diff --git a/config/rootfiles/core/110/filelists/wget b/config/rootfiles/core/110/filelists/wget
new file mode 120000 (symlink)
index 0000000..fcb57df
--- /dev/null
+++ b/config/rootfiles/core/110/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file

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

diff --git a/config/rootfiles/core/110/update.sh b/config/rootfiles/core/110/update.sh
new file mode 100644 (file)
index 0000000..84e0ddf
--- /dev/null
+++ b/config/rootfiles/core/110/update.sh
@@ -0,0 +1,67 @@
+#!/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=110
+
+# 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/squid stop
+/etc/init.d/unbound stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/sshd restart
+/etc/init.d/squid start
+
+# 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/109/exclude b/config/rootfiles/oldcore/109/exclude
new file mode 100644 (file)
index 0000000..d6fd053
--- /dev/null
+++ b/config/rootfiles/oldcore/109/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/109/filelists/GeoIP b/config/rootfiles/oldcore/109/filelists/GeoIP
similarity index 100%
rename from config/rootfiles/core/109/filelists/GeoIP
rename to config/rootfiles/oldcore/109/filelists/GeoIP

diff --git a/config/rootfiles/oldcore/109/filelists/bind b/config/rootfiles/oldcore/109/filelists/bind
new file mode 120000 (symlink)
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file

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

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

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

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

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

diff --git a/config/rootfiles/oldcore/109/filelists/squid b/config/rootfiles/oldcore/109/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

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

diff --git a/config/rootfiles/oldcore/109/filelists/unbound b/config/rootfiles/oldcore/109/filelists/unbound
new file mode 120000 (symlink)
index 0000000..66adf09
--- /dev/null
+++ b/config/rootfiles/oldcore/109/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file

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

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

diff --git a/make.sh b/make.sh
index c5e8dc395345871d0342478723db4fb0c5937802..f5e792a9a91855b62f946e0c983e8102ffa23a4a 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="109"                                                     # Core Level (Filename)
+CORE="110"                                                     # Core Level (Filename)
 PAKFIRE_CORE="109"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan