From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sat, 6 Aug 2022 21:56:38 +0000 (+0200)
Subject: toolchain: glibc: Update to glibc 2.35
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e58b76effe6b167c49812372d5334f6f57546778;p=openwrt%2Fstaging%2Fblocktrron.git

toolchain: glibc: Update to glibc 2.35

This updates to glibc to version 2.35.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 106863a065..5acb13b5dc 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glibc
-PKG_VERSION:=2.34
+PKG_VERSION:=2.35
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4ab59ce4e5195f98b01748127248fed2b2b77b21
-PKG_MIRROR_HASH:=4df361a37a1f76244a77ca4ffb3b2d2774276a58aac46850c83f6c77e50dd16a
+PKG_SOURCE_VERSION:=813a8d01716d4e099ec57194a93b14fa08b4beca
+PKG_MIRROR_HASH:=8c8d92dde334f0e0f9a0949d25b2950db513ce8723c31ae0b0ef64730a00322f
 PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
diff --git a/toolchain/glibc/patches/050-Revert-Disallow-use-of-DES-encryption-functions-in-n.patch b/toolchain/glibc/patches/050-Revert-Disallow-use-of-DES-encryption-functions-in-n.patch
index 8cb8c80fd2..7dfc8a5582 100644
--- a/toolchain/glibc/patches/050-Revert-Disallow-use-of-DES-encryption-functions-in-n.patch
+++ b/toolchain/glibc/patches/050-Revert-Disallow-use-of-DES-encryption-functions-in-n.patch
@@ -627,7 +627,7 @@ provides them.
     range [FROM - N + 1, FROM - 1].  If N is odd the first byte in FROM
 --- a/stdlib/stdlib.h
 +++ b/stdlib/stdlib.h
-@@ -969,6 +969,12 @@ extern int getsubopt (char **__restrict
+@@ -971,6 +971,12 @@ extern int getsubopt (char **__restrict
  #endif
  
  
diff --git a/toolchain/glibc/patches/200-add-dl-search-paths.patch b/toolchain/glibc/patches/200-add-dl-search-paths.patch
index 08e901d2e6..fd4af3694a 100644
--- a/toolchain/glibc/patches/200-add-dl-search-paths.patch
+++ b/toolchain/glibc/patches/200-add-dl-search-paths.patch
@@ -2,7 +2,7 @@ add /usr/lib to default search path for the dynamic linker
 
 --- a/Makeconfig
 +++ b/Makeconfig
-@@ -610,6 +610,9 @@ else
+@@ -618,6 +618,9 @@ else
  default-rpath = $(libdir)
  endif