]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 16 Dec 2019 08:04:29 +0000 (09:04 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 16 Dec 2019 08:04:29 +0000 (09:04 +0100)
34 files changed:
config/rootfiles/core/139/filelists/i586/intel-microcode [deleted symlink]
config/rootfiles/core/140/exclude [moved from config/rootfiles/core/139/exclude with 100% similarity]
config/rootfiles/core/140/filelists/files [new file with mode: 0644]
config/rootfiles/core/140/meta [new file with mode: 0644]
config/rootfiles/core/140/update.sh [new file with mode: 0644]
config/rootfiles/oldcore/139/exclude [new file with mode: 0644]
config/rootfiles/oldcore/139/filelists/aarch64/python [moved from config/rootfiles/core/139/filelists/aarch64/python with 100% similarity]
config/rootfiles/oldcore/139/filelists/armv5tel/python [moved from config/rootfiles/core/139/filelists/armv5tel/python with 100% similarity]
config/rootfiles/oldcore/139/filelists/bash [moved from config/rootfiles/core/139/filelists/bash with 100% similarity]
config/rootfiles/oldcore/139/filelists/ca-certificates [moved from config/rootfiles/core/139/filelists/ca-certificates with 100% similarity]
config/rootfiles/oldcore/139/filelists/cpio [moved from config/rootfiles/core/139/filelists/cpio with 100% similarity]
config/rootfiles/oldcore/139/filelists/ddns [moved from config/rootfiles/core/139/filelists/ddns with 100% similarity]
config/rootfiles/oldcore/139/filelists/files [moved from config/rootfiles/core/139/filelists/files with 97% similarity]
config/rootfiles/oldcore/139/filelists/hwdata [moved from config/rootfiles/core/139/filelists/hwdata with 100% similarity]
config/rootfiles/oldcore/139/filelists/i586/intel-microcode [new symlink]
config/rootfiles/oldcore/139/filelists/i586/openssl-sse2 [moved from config/rootfiles/core/139/filelists/i586/openssl-sse2 with 100% similarity]
config/rootfiles/oldcore/139/filelists/i586/python [moved from config/rootfiles/core/139/filelists/i586/python with 100% similarity]
config/rootfiles/oldcore/139/filelists/linux-firmware-new_files [moved from config/rootfiles/core/139/filelists/linux-firmware-new_files with 100% similarity]
config/rootfiles/oldcore/139/filelists/logwatch [moved from config/rootfiles/core/139/filelists/logwatch with 100% similarity]
config/rootfiles/oldcore/139/filelists/lz4 [moved from config/rootfiles/core/139/filelists/lz4 with 100% similarity]
config/rootfiles/oldcore/139/filelists/openssh [moved from config/rootfiles/core/139/filelists/openssh with 100% similarity]
config/rootfiles/oldcore/139/filelists/openssl [moved from config/rootfiles/core/139/filelists/openssl with 100% similarity]
config/rootfiles/oldcore/139/filelists/openvpn [moved from config/rootfiles/core/139/filelists/openvpn with 100% similarity]
config/rootfiles/oldcore/139/filelists/readline [moved from config/rootfiles/core/139/filelists/readline with 100% similarity]
config/rootfiles/oldcore/139/filelists/readline-compat [moved from config/rootfiles/core/139/filelists/readline-compat with 100% similarity]
config/rootfiles/oldcore/139/filelists/squid [moved from config/rootfiles/core/139/filelists/squid with 100% similarity]
config/rootfiles/oldcore/139/filelists/unbound [moved from config/rootfiles/core/139/filelists/unbound with 100% similarity]
config/rootfiles/oldcore/139/filelists/x86_64/intel-microcode [moved from config/rootfiles/core/139/filelists/x86_64/intel-microcode with 100% similarity]
config/rootfiles/oldcore/139/filelists/x86_64/python [moved from config/rootfiles/core/139/filelists/x86_64/python with 100% similarity]
config/rootfiles/oldcore/139/meta [new file with mode: 0644]
config/rootfiles/oldcore/139/update.sh [moved from config/rootfiles/core/139/update.sh with 100% similarity]
html/cgi-bin/credits.cgi
make.sh
src/initscripts/system/leds

diff --git a/config/rootfiles/core/139/filelists/i586/intel-microcode b/config/rootfiles/core/139/filelists/i586/intel-microcode
deleted file mode 120000 (symlink)
index 1c5bc57..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/140/filelists/files b/config/rootfiles/core/140/filelists/files
new file mode 100644 (file)
index 0000000..ce4e517
--- /dev/null
@@ -0,0 +1,4 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/core/140/meta b/config/rootfiles/core/140/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/140/update.sh b/config/rootfiles/core/140/update.sh
new file mode 100644 (file)
index 0000000..27b0329
--- /dev/null
@@ -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
diff --git a/config/rootfiles/oldcore/139/exclude b/config/rootfiles/oldcore/139/exclude
new file mode 100644 (file)
index 0000000..b221598
--- /dev/null
@@ -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
similarity index 97%
rename from config/rootfiles/core/139/filelists/files
rename to config/rootfiles/oldcore/139/filelists/files
index 7a05c13fe6385df7b92bdd131e106d29c55474e9..8a16facad2196410b5a9507c32f22b61cff38609 100644 (file)
@@ -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
diff --git a/config/rootfiles/oldcore/139/filelists/i586/intel-microcode b/config/rootfiles/oldcore/139/filelists/i586/intel-microcode
new file mode 120000 (symlink)
index 0000000..f03e847
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/139/meta b/config/rootfiles/oldcore/139/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
index bf3d6f4cdce0149a08726e61b15b62c9c34c6c90..a132b0a4aabb381441fb5a184181f1c92d1203d6 100644 (file)
@@ -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,
diff --git a/make.sh b/make.sh
index 771c5ff894a0a6c00bd02107df16f669ea5a7f52..64b08b7d9bbdedf19dffab9133a3bba20de875ce 100755 (executable)
--- a/make.sh
+++ b/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)
-PAKFIRE_CORE="138"                                             # Core Level (PAKFIRE)
+CORE="140"                                                     # Core Level (Filename)
+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
index 3c3b4204a645633e84a40281600e3dfdd6addebe..08a73f6bae1fbff5fe2b30732cec77b3c0f4b468 100644 (file)
@@ -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_netdev_trigger apu:2 ${RED_DEV} rx
-               setup_netdev_trigger apu:3 ${RED_DEV} tx
+               setup_heartbeat_trigger ${APULED}1
+               setup_netdev_trigger ${APULED}2 ${RED_DEV} rx
+               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
-               enable_led apu:1
-               disable_led_trigger apu:2
-               disable_led_trigger apu:3
+               disable_led_trigger ${APULED}1
+               enable_led ${APULED}1
+               disable_led_trigger ${APULED}2
+               disable_led_trigger ${APULED}3
 
                # Geos LED stop
                disable_led_trigger geos:1