Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

config/rootfiles/common/libjpeg

@@ -12,13 +12,13 @@
 #usr/lib/libjpeg.a
 #usr/lib/libjpeg.la
 #usr/lib/libjpeg.so
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.1.0
+usr/lib/libjpeg.so.8
+usr/lib/libjpeg.so.8.0.2
 #usr/lib/libturbojpeg.a
 #usr/lib/libturbojpeg.la
 #usr/lib/libturbojpeg.so
 usr/lib/libturbojpeg.so.0
-usr/lib/libturbojpeg.so.0.0.0
+usr/lib/libturbojpeg.so.0.1.0
 #usr/man/man1/cjpeg.1
 #usr/man/man1/djpeg.1
 #usr/man/man1/jpegtran.1
@@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.0
 #usr/share/doc/structure.txt
 #usr/share/doc/usage.txt
 #usr/share/doc/wizard.txt
+#usr/share/man/man1/cjpeg.1
+#usr/share/man/man1/djpeg.1
+#usr/share/man/man1/jpegtran.1
+#usr/share/man/man1/rdjpgcom.1
+#usr/share/man/man1/wrjpgcom.1
+#usr/share/doc/libjpeg-turbo
+#usr/share/doc/libjpeg-turbo/README
+#usr/share/doc/libjpeg-turbo/README-turbo.txt
+#usr/share/doc/libjpeg-turbo/example.c
+#usr/share/doc/libjpeg-turbo/libjpeg.txt
+#usr/share/doc/libjpeg-turbo/structure.txt
+#usr/share/doc/libjpeg-turbo/usage.txt
+#usr/share/doc/libjpeg-turbo/wizard.txt

config/rootfiles/common/libjpeg-compat

@@ -0,0 +1,3 @@
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.1.0
+usr/lib/libturbojpeg.so.0.0.0

config/rootfiles/core/106/filelists/attr

@@ -0,0 +1 @@
+../../../common/attr

config/rootfiles/core/106/filelists/diffutils

@@ -0,0 +1 @@
+../../../common/diffutils

config/rootfiles/core/106/filelists/ed

@@ -0,0 +1 @@
+../../../common/ed

config/rootfiles/core/106/filelists/expat

@@ -0,0 +1 @@
+../../../common/expat

config/rootfiles/core/106/filelists/file

@@ -0,0 +1 @@
+../../../common/file

config/rootfiles/core/106/filelists/files

@@ -0,0 +1,17 @@
+etc/system-release
+etc/issue
+etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/network
+etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders
+etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders
+etc/rc.d/init.d/unbound
+etc/rc.d/rc0.d/K79unbound
+etc/rc.d/rc3.d/S21unbound
+etc/rc.d/rc6.d/K79unbound
+srv/web/ipfire/cgi-bin/dns.cgi
+srv/web/ipfire/cgi-bin/dnsforward.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/hosts.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/pppsetup.cgi
+srv/web/ipfire/cgi-bin/services.cgi

config/rootfiles/core/106/filelists/flex

@@ -0,0 +1 @@
+../../../common/flex

config/rootfiles/core/106/filelists/gawk

@@ -0,0 +1 @@
+../../../common/gawk

config/rootfiles/core/106/filelists/gettext

@@ -0,0 +1 @@
+../../../common/gettext

config/rootfiles/core/106/filelists/gnupg

@@ -0,0 +1 @@
+../../../common/gnupg

config/rootfiles/core/106/filelists/i586/strongswan-padlock

@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock

config/rootfiles/core/106/filelists/iproute2

@@ -0,0 +1 @@
+../../../common/iproute2

config/rootfiles/core/106/filelists/ipset

@@ -0,0 +1 @@
+../../../common/ipset

config/rootfiles/core/106/filelists/libgpg-error

@@ -0,0 +1 @@
+../../../common/libgpg-error

config/rootfiles/core/106/filelists/libjpeg

@@ -0,0 +1 @@
+../../../common/libjpeg

config/rootfiles/core/106/filelists/libjpeg-compat

@@ -0,0 +1 @@
+../../../common/libjpeg-compat

config/rootfiles/core/106/filelists/libmnl

@@ -0,0 +1 @@
+../../../common/libmnl

config/rootfiles/core/106/filelists/libnetfilter_conntrack

@@ -0,0 +1 @@
+../../../common/libnetfilter_conntrack

config/rootfiles/core/106/filelists/misc-progs

@@ -0,0 +1 @@
+../../../common/misc-progs

config/rootfiles/core/106/filelists/python-daemon

@@ -0,0 +1 @@
+../../../common/python-daemon

config/rootfiles/core/106/filelists/python-docutils

@@ -0,0 +1 @@
+../../../common/python-docutils

config/rootfiles/core/106/filelists/python-inotify

@@ -0,0 +1 @@
+../../../common/python-inotify

config/rootfiles/core/106/filelists/python-ipaddress

@@ -0,0 +1 @@
+../../../common/python-ipaddress

config/rootfiles/core/106/filelists/smartmontools

@@ -0,0 +1 @@
+../../../common/smartmontools

config/rootfiles/core/106/filelists/squid

@@ -0,0 +1 @@
+../../../common/squid

config/rootfiles/core/106/filelists/strongswan

@@ -0,0 +1 @@
+../../../common/strongswan

config/rootfiles/core/106/filelists/unbound

@@ -0,0 +1 @@
+../../../common/unbound

config/rootfiles/core/106/filelists/usb_modeswitch

@@ -0,0 +1 @@
+../../../common/usb_modeswitch

config/rootfiles/core/106/filelists/usb_modeswitch_data

@@ -0,0 +1 @@
+../../../common/usb_modeswitch_data

config/rootfiles/core/106/update.sh

@@ -0,0 +1,91 @@
+#!/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) 2016 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=106
+
+function exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# 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/ipsec stop
+/etc/init.d/dnsmasq stop
+
+# Extract files
+extract_files
+
+# Delete dnsmasq
+rm -vf \
+	/etc/rc.d/init.d/dnsmasq \
+	/etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq \
+	/etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq \
+	/usr/sbin/dnsmasq
+
+# update linker config
+ldconfig
+
+grep -q unbound-anchor /var/spool/cron/root.orig || cat <<EOF >> /var/spool/cron/root.orig
+
+# Update DNS trust anchor
+%daily,random * * @runas(nobody) /usr/sbin/unbound-anchor -a /var/lib/unbound/root.key -c /etc/unbound/icannbundle.pem
+EOF
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Start services
+/etc/init.d/unbound start
+/etc/init.d/squid start
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec start
+fi
+
+# 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

config/rootfiles/oldcore/105/exclude

@@ -0,0 +1,28 @@
+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/state/dhcp/dhcpd.leases
+var/updatecache

config/rootfiles/oldcore/105/filelists/i586/openssl-sse2

@@ -0,0 +1 @@
+../../../../common/i586/openssl-sse2

config/rootfiles/oldcore/105/filelists/openssl

@@ -0,0 +1 @@
+../../../common/openssl

config/rootfiles/oldcore/105/meta

@@ -0,0 +1 @@
+DEPS=""