rpi-firmware: ignore user from tarball

[people/pmueller/ipfire-2.x.git] / lfs / glibc

diff --git a/lfs/glibc b/lfs/glibc
index 751c3da6478b2e7f65f7cd6b7cfba4f766cb934a..5dbc386d7699b88621909d039ad467caf32751e0 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.32
+VER        = 2.33
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -55,6 +55,10 @@ ifeq "$(BUILD_ARCH)" "aarch64"
        CFLAGS += -Wno-error=maybe-uninitialized
 endif
 
+ifeq "$(BUILD_ARCH)" "i586"
+       EXTRA_CONFIG += libc_cv_include_x86_isa_level=no
+endif
+
 # Add some general configuration flags
 EXTRA_CONFIG += \
        --disable-profile \
@@ -73,7 +77,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 720c7992861c57cf97d66a2f36d8d1fa
+$(DL_FILE)_MD5 = 390bbd889c7e8e8a7041564cb6b27cca
 
 install : $(TARGET)
 
@@ -105,6 +109,10 @@ $(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"