Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/149/update.sh b/config/rootfiles/oldcore/149/update.sh
index 50add169b4df06630e0e1d4da1353cddeb6ec810..38f80529f48a6b78e5576e3fe53ef86c33d9af98 100644 (file)
--- a/config/rootfiles/oldcore/149/update.sh
+++ b/config/rootfiles/oldcore/149/update.sh
@@ -43,6 +43,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Restart init to allow clean unmout at reboot
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 

diff --git a/lfs/binutils b/lfs/binutils
index 334adad25891459f58e4c62cb58daaced4c0118b..6db2e990f07e1269e804ffe2dec331272d2352d3 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
   CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
   CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+  CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+  CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
 
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \

diff --git a/lfs/ccache b/lfs/ccache
index 94d7bd149e5383c76186993d699ab3531dbd6e6f..1361f3ed07a58783845db13eeab713c3b5de2cc3 100644 (file)
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #
@@ -34,10 +34,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
 
 ifeq "$(PASS)" "1"
        CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+       CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
        CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
        CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
        CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
        CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+       CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+       CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
 endif
 
 ###############################################################################

diff --git a/lfs/gcc b/lfs/gcc
index 7cbc8e9e84e112063ebeab553220a3964a7a5371..3aa147ce813247da7cc0af876064ca13c67165ae 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #
@@ -44,6 +44,8 @@ CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 ifeq "$(PASS)" "1"
 CFLAGS    := $(patsubst -mindirect-branch=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfunction-return=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+CFLAGS    := $(patsubst -fcf-protection,,$(CFLAGS))
 endif
 
 CXXFLAGS  := $(CFLAGS)

diff --git a/lfs/glibc b/lfs/glibc
index 802c372a904bf283fe2d3bd26b220d058b7fa2fe..281c290dcd2b7d92d14138ff57cc45c8c60351b2 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #

diff --git a/make.sh b/make.sh
index 4a9dd3cb66129db3d9d85f6071992645efa879d8..33c5de5cdb285ae1097bc2b8582bb09d260f6fdd 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"                       # Git Branch
 GIT_TAG="$(git tag | tail -1)"                                 # Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"                        # Last commit
 
-TOOLCHAINVER=20200814
+TOOLCHAINVER=20200924
 
 ###############################################################################
 #
@@ -153,7 +153,7 @@ configure_build() {
                        BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
-                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
+                       CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
                        ;;
 
                aarch64)