X-Git-Url: http://git.ipfire.org/?p=people%2Fmfischer%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fglibc;fp=lfs%2Fglibc;h=d4b1eb0dd3cc5ed4a49f29827546c38bf2b6c6b9;hp=d2d3aff91a91405e8580e6d6c096f2597a89709b;hb=0506aa897353a84edf2ecfea09982f6509251ba6;hpb=75c18cc2af0c6fdd8ee4eab79a50f88588e9c8fa

diff --git a/lfs/glibc b/lfs/glibc
index d2d3aff91a..d4b1eb0dd3 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.33
+VER        = 2.35
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,9 +46,7 @@ else
 	--host=$(CROSSTARGET) \
 	--build=$(BUILDTARGET) \
 	--prefix=$(TOOLS_DIR) \
-	--with-headers=$(TOOLS_DIR)/include \
-	libc_cv_forced_unwind=yes \
-	libc_cv_c_cleanup=yes
+	--with-headers=$(TOOLS_DIR)/include
 endif
 
 ifeq "$(BUILD_ARCH)" "aarch64"
@@ -65,6 +63,14 @@ EXTRA_CONFIG += \
 	--enable-bind-now \
 	--disable-crypt
 
+ifeq "$(BUILD_ARCH)" "x86_64"
+	EXTRA_CONFIG += --enable-cet
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+	EXTRA_CONFIG += --enable-memory-tagging
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -73,7 +79,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 390bbd889c7e8e8a7041564cb6b27cca
+$(DL_FILE)_BLAKE2 = 623c728884f070cd87ffeb9203f74206197c52405ac9bc44f3dd519a3468b8e8ae2536c883e5d17d94417dbd1e91775de2e674314e4ff7424f9720026d6b7063
 
 install : $(TARGET)
 
@@ -81,10 +87,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -93,8 +99,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
 	@$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-	@$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+	@$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -105,10 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/glibc-build
 
-	# Security Fixes
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch
-
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
 
 ifneq "$(TOOLCHAIN)" "1"