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

config/rootfiles/core/139/filelists/i586/intel-microcode

@@ -1 +0,0 @@
-../x86_64/intel-microcode

config/rootfiles/core/140/filelists/files

@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs

config/rootfiles/core/140/meta

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

config/rootfiles/core/140/update.sh

@@ -0,0 +1,75 @@
+#!/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) 2019 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=140
+
+exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	# don't start pakfire again at error
+	killall -KILL pak_update
+	/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
+
+
+# Remove files
+
+# 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

config/rootfiles/oldcore/139/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/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

config/rootfiles/oldcore/139/filelists/files

@@ -5,6 +5,7 @@ var/ipfire/langs
 etc/httpd/conf/vhosts.d/ipfire-interface.conf
 etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
 etc/rc.d/init.d/functions
+etc/rc.d/init.d/leds
 etc/rc.d/init.d/networking/dhcpcd.exe
 etc/rc.d/init.d/networking/red
 etc/rc.d/init.d/networking/functions.network

config/rootfiles/oldcore/139/filelists/i586/intel-microcode

@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode

config/rootfiles/oldcore/139/meta

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

html/cgi-bin/credits.cgi

@@ -76,15 +76,15 @@ Alf Høgemark,
 Ben Schweikert,
 Peter Pfeiffer,
 Daniel Glanzmann,
-Heiner Schmeling,
 Daniel Weismüller,
+Heiner Schmeling,
 Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
+Stephan Feddersen,
 Joern-Ingo Weigert,
 Alexander Koch,
-Stephan Feddersen,
 Wolfgang Apolinarski,
 Alfred Haas,
 Lars Schuhmacher,
@@ -100,6 +100,7 @@ Alex Koch,
 Dominik Hassler,
 Larsen,
 Gabriel Rolland,
+Tim FitzGeorge,
 Anton D. Seliverstov,
 Bernhard Bittner,
 David Kleuker,
@@ -109,7 +110,6 @@ Jorrit de Jonge,
 Jörn-Ingo Weigert,
 Przemek Zdroik,
 Ramax Lo,
-Tim FitzGeorge,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,

make.sh

@@ -26,8 +26,8 @@ NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.23"							# Version number
-CORE="139"							# Core Level (Filename)
+CORE="140"							# Core Level (Filename)
-PAKFIRE_CORE="138"						# Core Level (PAKFIRE)
+PAKFIRE_CORE="139"						# 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

src/initscripts/system/leds

@@ -60,6 +60,25 @@ enable_led ()
 	fi
 }
 
+#Handle new APU ACPI Leds introduced on APU2 with bios 4.10.0.0
+if [ -e /sys/class/leds/apu1:green:led1 ]; then
+	APULED="apu1:green:led";
+else if [ -e /sys/class/leds/apu2:green:led1 ]; then
+	APULED="apu2:green:led";
+else if [ -e /sys/class/leds/apu3:green:led1 ]; then
+	APULED="apu3:green:led";
+else if [ -e /sys/class/leds/apu4:green:led1 ]; then
+	APULED="apu4:green:led";
+else if [ -e /sys/class/leds/apu5:green:led1 ]; then
+	APULED="apu5:green:led";
+else
+	APULED="apu:";
+fi
+fi
+fi
+fi
+fi
+
 case "${1}" in
 	start)
 		# Alix LED start
@@ -68,9 +87,9 @@ case "${1}" in
 		setup_netdev_trigger alix:3 ${RED_DEV} tx
 
 		# Apu LED start
-		setup_heartbeat_trigger apu:1
+		setup_heartbeat_trigger ${APULED}1
-		setup_netdev_trigger apu:2 ${RED_DEV} rx
+		setup_netdev_trigger ${APULED}2 ${RED_DEV} rx
-		setup_netdev_trigger apu:3 ${RED_DEV} tx
+		setup_netdev_trigger ${APULED}3 ${RED_DEV} tx
 
 		# Geos LED start
 		setup_heartbeat_trigger geos:1
@@ -115,10 +134,10 @@ case "${1}" in
 		disable_led_trigger alix:3
 
 		# Apu LED stop
-		disable_led_trigger apu:1
+		disable_led_trigger ${APULED}1
-		enable_led apu:1
+		enable_led ${APULED}1
-		disable_led_trigger apu:2
+		disable_led_trigger ${APULED}2
-		disable_led_trigger apu:3
+		disable_led_trigger ${APULED}3
 
 		# Geos LED stop
 		disable_led_trigger geos:1