[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 50f75f88068420c66a64661120ab24f32feda22a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 50f75f88068420c66a64661120ab24f32feda22a (commit) via 5c21f1a0784c73aa9c1cdf387f2940efb11ddf67 (commit) via b14c24ca90e048cf65bd32b5d431c435e24d5610 (commit) via 5c3f3da55921a8f027d06d69df8bde19fef0c478 (commit) via 675c9ca558f3d354127c4746fed187b3ff4380cd (commit) via 0b58804370ce8ee1350b85d30e1577e7dfaec90f (commit) via ad594123b6dd1115138a70ed15e59f3d43a91021 (commit) via 56d37c8dbfe5793212163814e6ca34b9ee6d34e2 (commit) via 7fd195938f0e4f48168148e2ca3f16e91d895241 (commit) via 80b1dc64f2020c2771fd43460e6a07f348f0b4d9 (commit) via baa97123726d5e9d58af27595e7c9ad9bafa2a46 (commit) from 611c2b7103f6921a2cb11be26c799d7613793cfb (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 50f75f88068420c66a64661120ab24f32feda22a Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 11:20:34 2021 +0000
core154: Ship kmod
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5c21f1a0784c73aa9c1cdf387f2940efb11ddf67 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 11:20:09 2021 +0000
kmod: Update to 28
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b14c24ca90e048cf65bd32b5d431c435e24d5610 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 30 17:55:35 2020 +0000
make.sh: Build zstd earlier in stage2
Since programs from the toolchain are linked against this, we need to make this library available in stage 2, too.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5c3f3da55921a8f027d06d69df8bde19fef0c478 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 11:14:30 2021 +0000
core154: Ship SSH initscript
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 675c9ca558f3d354127c4746fed187b3ff4380cd Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 11:12:03 2021 +0000
ssh: Ignore any errors when stopping daemon
The SSH init script only kills the main daemon which leads to any child processes (for remaining connections) being untouched.
killproc returns 4 (unknown error) when not all processes were killed which is not intended here. Therefore we ignore the error and do not pause the shut down process for a minute.
Fixes: #12544 Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0b58804370ce8ee1350b85d30e1577e7dfaec90f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 10:54:07 2021 +0000
core154: Ship initscript functions
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ad594123b6dd1115138a70ed15e59f3d43a91021 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 10:53:15 2021 +0000
core154: Ship header.pl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 56d37c8dbfe5793212163814e6ca34b9ee6d34e2 Author: Leo-Andres Hofmann hofmann@leo-andres.de Date: Tue Jan 12 19:11:14 2021 +0100
header.pl: Remove duplicate "IpInSubnet" function
This function is deprecated. The commonly used and maintained "IpInSubnet" function can be found in general-functions.pl.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7fd195938f0e4f48168148e2ca3f16e91d895241 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 7 14:55:59 2021 +0100
strace: update to 5.10
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 80b1dc64f2020c2771fd43460e6a07f348f0b4d9 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 10:44:16 2021 +0000
AWS: Ensure the product UUID is uppercase
Newer kernels seem to return this in lowercase format which makes the comparison to "EC2" fail.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit baa97123726d5e9d58af27595e7c9ad9bafa2a46 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 13 10:42:38 2021 +0000
AWS: Hypervisor UUID has been dropped from newer kernels
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/header.pl | 22 +++------------------- config/rootfiles/common/kmod | 2 +- config/rootfiles/core/154/filelists/files | 3 +++ .../{oldcore/125 => core/154}/filelists/kmod | 0 lfs/kmod | 7 ++++--- lfs/strace | 8 ++++---- make.sh | 2 +- src/initscripts/system/functions | 10 +++------- src/initscripts/system/sshd | 2 +- 9 files changed, 20 insertions(+), 36 deletions(-) copy config/rootfiles/{oldcore/125 => core/154}/filelists/kmod (100%)
Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index e2e6fd689..5684c01c5 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -311,22 +311,6 @@ sub getcgihash { return; }
- -# Test if IP is within a subnet -# Call: IpInSubnet (Addr, Subnet, Subnet Mask) -# Subnet can be an IP of the subnet: 10.0.0.0 or 10.0.0.1 -# Everything in dottted notation -# Return: TRUE/FALSE -sub IpInSubnet -{ - $ip = unpack('N', inet_aton(shift)); - $start = unpack('N', inet_aton(shift)); - $mask = unpack('N', inet_aton(shift)); - $start &= $mask; # base of subnet... - $end = $start + ~$mask; - return (($ip >= $start) && ($ip <= $end)); -} - sub escape($) { my $s = shift; return HTML::Entities::encode_entities($s); @@ -559,13 +543,13 @@ sub colorize { return "<font color='".${Header::colourovpn}."'>".$string."</font>"; } elsif ( $string =~ "lo" or $string =~ "127.0.0.0" ){ return "<font color='".${Header::colourfw}."'>".$string."</font>"; - } elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){ + } elsif ( $string =~ $ethsettings{'GREEN_DEV'} or &General::IpInSubnet($string2,$ethsettings{'GREEN_NETADDRESS'},$ethsettings{'GREEN_NETMASK'}) ){ return "<font color='".${Header::colourgreen}."'>".$string."</font>"; } elsif ( $string =~ "ppp0" or $string =~ $ethsettings{'RED_DEV'} or $string =~ "0.0.0.0" or $string =~ $ethsettings{'RED_ADDRESS'} ){ return "<font color='".${Header::colourred}."'>".$string."</font>"; - } elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){ + } elsif ( $ethsettings{'CONFIG_TYPE'}>1 and ( $string =~ $ethsettings{'BLUE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'BLUE_NETADDRESS'},$ethsettings{'BLUE_NETMASK'}) )){ return "<font color='".${Header::colourblue}."'>".$string."</font>"; - } elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){ + } elsif ( $ethsettings{'CONFIG_TYPE'}>2 and ( $string =~ $ethsettings{'ORANGE_DEV'} or &General::IpInSubnet($string2,$ethsettings{'ORANGE_NETADDRESS'},$ethsettings{'ORANGE_NETMASK'}) )){ return "<font color='".${Header::colourorange}."'>".$string."</font>"; } else { return $string; diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod index ff9cda26d..56806fd1f 100644 --- a/config/rootfiles/common/kmod +++ b/config/rootfiles/common/kmod @@ -9,6 +9,6 @@ sbin/rmmod #usr/lib/libkmod.la #usr/lib/libkmod.so usr/lib/libkmod.so.2 -usr/lib/libkmod.so.2.3.4 +usr/lib/libkmod.so.2.3.6 #usr/lib/pkgconfig/libkmod.pc #usr/share/bash-completion/completions/kmod diff --git a/config/rootfiles/core/154/filelists/files b/config/rootfiles/core/154/filelists/files index 524b92b42..a30521c94 100644 --- a/config/rootfiles/core/154/filelists/files +++ b/config/rootfiles/core/154/filelists/files @@ -1,6 +1,8 @@ etc/system-release etc/issue etc/os-release +etc/rc.d/init.d/functions +etc/rc.d/init.d/sshd etc/rc.d/init.d/unbound etc/rc.d/init.d/wlanclient opt/pakfire/lib/functions.sh @@ -19,4 +21,5 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi usr/local/bin/sshctrl var/ipfire/extrahd/bin/extrahd.pl var/ipfire/general-functions.pl +var/ipfire/header.pl var/ipfire/langs diff --git a/config/rootfiles/core/154/filelists/kmod b/config/rootfiles/core/154/filelists/kmod new file mode 120000 index 000000000..0020e197e --- /dev/null +++ b/config/rootfiles/core/154/filelists/kmod @@ -0,0 +1 @@ +../../../common/kmod \ No newline at end of file diff --git a/lfs/kmod b/lfs/kmod index 39e350c02..3d9acd899 100644 --- a/lfs/kmod +++ b/lfs/kmod @@ -24,7 +24,7 @@
include Config
-VER = 26 +VER = 28
THISAPP = kmod-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1129c243199bdd7db01b55a61aa19601 +$(DL_FILE)_MD5 = 0a2b887b1b3dfb8c0b3f41f598203e56
install : $(TARGET)
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-manpages \ --with-openssl \ --with-xz \ - --with-zlib + --with-zlib \ + --with-zstd
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/strace b/lfs/strace index ec26bd299..c6ea35876 100644 --- a/lfs/strace +++ b/lfs/strace @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 5.5 +VER = 5.10 SUP_ARCHES = x86_64 i586 armv5tel
THISAPP = strace-$(VER) @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 3 +PAK_VER = 4
DEPS = elfutils
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dbce2e84632b39a4ed86b9fc60447af9 +$(DL_FILE)_MD5 = 5f9f87f9afa282e7512f67a129287d6c
install : $(TARGET)
diff --git a/make.sh b/make.sh index 86359ce15..a9db53edf 100755 --- a/make.sh +++ b/make.sh @@ -1079,6 +1079,7 @@ buildbase() { lfsmake2 tzdata lfsmake2 cleanup-toolchain lfsmake2 zlib + lfsmake2 zstd lfsmake2 binutils lfsmake2 gmp lfsmake2 gmp-compat @@ -1391,7 +1392,6 @@ buildipfire() { lfsmake2 spandsp lfsmake2 lz4 lfsmake2 lzo - lfsmake2 zstd lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 71edf500b..d610a524d 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -793,17 +793,13 @@ running_on_hypervisor() { running_on_ec2() { local uuid
- # Check if the hypervisor UUID starts with ec2 - if [ -r "/sys/hypervisor/uuid" ]; then - uuid=$(</sys/hypervisor/uuid) - - [ "${uuid:0:3}" = "ec2" ] && return 0 - fi - # Check if the DMI product UUID starts with EC2 if [ -r "/sys/devices/virtual/dmi/id/product_uuid" ]; then uuid=$(</sys/devices/virtual/dmi/id/product_uuid)
+ # Convert the UUID as uppercase + uuid="${uuid^^}" + [ "${uuid:0:3}" = "EC2" ] && return 0 fi
diff --git a/src/initscripts/system/sshd b/src/initscripts/system/sshd index c3c02adc1..d0d859118 100644 --- a/src/initscripts/system/sshd +++ b/src/initscripts/system/sshd @@ -37,7 +37,7 @@ case "$1" in
stop) boot_mesg "Stopping SSH Server..." - killproc -p "/var/run/sshd.pid" /usr/sbin/sshd + killproc -p "/var/run/sshd.pid" /usr/sbin/sshd || true ;;
reload)
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer