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, core149 has been updated
       via  0f7a8e02c7ae3cfd6ab5612289a4c99bcadcdfe1 (commit)
       via  cf58f6593148f55b2016e2a18af75925271ef1b7 (commit)
       via  d83422d1c06058b66762477d9dcd008ff70bf485 (commit)
      from  5eab2b3893538800a2f0aa9433028508a3ca7c0f (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/index.cgi | 2 +-
 lfs/binutils           | 2 ++
 lfs/ccache             | 5 ++++-
 lfs/gcc                | 4 +++-
 lfs/glibc              | 2 +-
 make.sh                | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 8e7207d0c..5aec4c594 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -547,7 +547,7 @@ if ( ! -e "/var/ipfire/main/send_profile") {
 
 # Legacy architecture
 my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname();
-if ($machine =~ m/^i?86$/) {
+if ($machine =~ m/^i.86$/) {
 	$warnmessage .= "<li>$Lang::tr{'legacy architecture warning'}</li>";
 }
 
diff --git a/lfs/binutils b/lfs/binutils
index 334adad25..6db2e990f 100644
--- 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 94d7bd149..1361f3ed0 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 7cbc8e9e8..3aa147ce8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 802c372a9..281c290dc 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info(a)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 2a6198e05..ab90e5143 100755
--- 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)


hooks/post-receive
--
IPFire 2.x development tree