glibc: version bump 2.30 -> 2.31-29-gde371d1581f3

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

20 files changed, 63 insertions, 96 deletions

diff --git a/fixup_ptxconfigs.sh b/fixup_ptxconfigs.sh
index 7c410cd..32436f0 100755
--- a/fixup_ptxconfigs.sh
+++ b/fixup_ptxconfigs.sh
@@ -329,6 +329,10 @@ fixup()
 	    PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
 	    PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
 	    ;;
+	2.31)
+	    PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
+	    PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
+	    ;;
     esac
 
     case "${PTXCONF_UCLIBC_VERSION}" in
diff --git a/patches/glibc-2.30/0001-rtld-Check-__libc_enable_secure-before-honoring-LD_P.patch b/patches/glibc-2.30/0001-rtld-Check-__libc_enable_secure-before-honoring-LD_P.patch
deleted file mode 100644
index 951849f..0000000
--- a/patches/glibc-2.30/0001-rtld-Check-__libc_enable_secure-before-honoring-LD_P.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <mwk@0x04.net>
-Date: Thu, 21 Nov 2019 00:20:15 +0100
-Subject: [PATCH] rtld: Check __libc_enable_secure before honoring
- LD_PREFER_MAP_32BIT_EXEC (CVE-2019-19126) [BZ #25204]
-
-The problem was introduced in glibc 2.23, in commit
-b9eb92ab05204df772eb4929eccd018637c9f3e9
-("Add Prefer_MAP_32BIT_EXEC to map executable pages with MAP_32BIT").
-
-(cherry picked from commit d5dfad4326fc683c813df1e37bbf5cf920591c8e)
----
- NEWS                                            | 10 ++++++++++
- sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h |  3 ++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index ee9ed4de5a3f..ea2dd3c68721 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,16 @@ See the end for copying conditions.
- Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
- using `glibc' in the "product" field.
- 
-+Version 2.30.1
-+
-+Security related changes:
-+
-+CVE-2019-19126: ld.so failed to ignore the LD_PREFER_MAP_32BIT_EXEC
-+  environment variable during program execution after a security
-+  transition, allowing local attackers to restrict the possible mapping
-+  addresses for loaded libraries and thus bypass ASLR for a setuid
-+  program.  Reported by Marcin Kościelnicki.
-+
- Version 2.30
- 
- Major new features:
-diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-index 975cbe2950e2..df2cdfdb6b32 100644
---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
-@@ -31,7 +31,8 @@
-    environment variable, LD_PREFER_MAP_32BIT_EXEC.  */
- #define EXTRA_LD_ENVVARS \
-   case 21:								  \
--    if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0)		  \
-+    if (!__libc_enable_secure						  \
-+	&& memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0)		  \
-       GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \
- 	|= bit_arch_Prefer_MAP_32BIT_EXEC;				  \
-     break;
diff --git a/patches/glibc-2.30/0100-add-install-lib-all-target.patch b/patches/glibc-2.31-29-gde371d1581f3/0100-add-install-lib-all-target.patch
index 16e024c..5434a8d 100644
--- a/patches/glibc-2.30/0100-add-install-lib-all-target.patch
+++ b/patches/glibc-2.31-29-gde371d1581f3/0100-add-install-lib-all-target.patch
@@ -16,7 +16,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 6 insertions(+)
 
 diff --git a/Makerules b/Makerules
-index 83bdd3a44d0d..7ce7ef401451 100644
+index 1e9c18f0d866..3a18622df52b 100644
 --- a/Makerules
 +++ b/Makerules
 @@ -944,6 +944,12 @@ installed-libcs := $(foreach o,$(filter-out .os,$(object-suffixes-for-libc)),\
diff --git a/patches/glibc-2.30/0101-don-t-regen-docs-if-perl-is-not-found.patch b/patches/glibc-2.31-29-gde371d1581f3/0101-don-t-regen-docs-if-perl-is-not-found.patch
index 866164d..17fbfcd 100644
--- a/patches/glibc-2.30/0101-don-t-regen-docs-if-perl-is-not-found.patch
+++ b/patches/glibc-2.31-29-gde371d1581f3/0101-don-t-regen-docs-if-perl-is-not-found.patch
@@ -15,7 +15,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 5 insertions(+)
 
 diff --git a/manual/Makefile b/manual/Makefile
-index 4f76ee85d285..7fd1ee5251f4 100644
+index c61e11dcd71d..a4997f2ae746 100644
 --- a/manual/Makefile
 +++ b/manual/Makefile
 @@ -102,9 +102,14 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err
diff --git a/patches/glibc-2.30/0200-Hack-around-mips-args-to-host-gcc.patch b/patches/glibc-2.31-29-gde371d1581f3/0200-Hack-around-mips-args-to-host-gcc.patch
index 5cc5c41..5cc5c41 100644
--- a/patches/glibc-2.30/0200-Hack-around-mips-args-to-host-gcc.patch
+++ b/patches/glibc-2.31-29-gde371d1581f3/0200-Hack-around-mips-args-to-host-gcc.patch
diff --git a/patches/glibc-2.30/series b/patches/glibc-2.31-29-gde371d1581f3/series
index 5ae6822..da5b65b 100644
--- a/patches/glibc-2.30/series
+++ b/patches/glibc-2.31-29-gde371d1581f3/series
@@ -1,10 +1,9 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 #tag:upstream --start-number 1
-0001-rtld-Check-__libc_enable_secure-before-honoring-LD_P.patch
 #tag:build-system --start-number 100
 0100-add-install-lib-all-target.patch
 0101-don-t-regen-docs-if-perl-is-not-found.patch
 #tag:hacks --start-number 200
 0200-Hack-around-mips-args-to-host-gcc.patch
-# a8c1bfa2c01be94508e22cf62d160585  - git-ptx-patches magic
+# 093247f87c0e3ded1431e29c27443f99  - git-ptx-patches magic
diff --git a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 35514ee..069afad 100644
--- a/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/aarch64-v8a-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 3945f7c..f78f1e9 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index f38f553..aa557f0 100644
--- a/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-1136jfs-linux-gnueabihf_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 80cb31e..bb190d1 100644
--- a/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v4t-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index a0f4e04..384a73d 100644
--- a/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v5te-linux-gnueabi_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 68b984b..851bb39 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabi_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index e688bc8..79d3212 100644
--- a/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/arm-v7a-linux-gnueabihf_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/i586-unknown-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/i586-unknown-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index e918d78..ccd7616 100644
--- a/ptxconfigs/i586-unknown-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/i586-unknown-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/i686-atom-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/i686-atom-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index d9f138e..d48ffd8 100644
--- a/ptxconfigs/i686-atom-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/i686-atom-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 46c0209..a5bed11 100644
--- a/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/mips-softfloat-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index d29533b..f872d80 100644
--- a/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/mipsel-softfloat-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 5655a8e..1a16367 100644
--- a/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/powerpc-603e-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/riscv64-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/riscv64-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 3a06076..bca69d5 100644
--- a/ptxconfigs/riscv64-linux-gnu_gcc-10.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/riscv64-linux-gnu_gcc-10.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"
diff --git a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
index 8e3b0c2..4dc2bf9 100644
--- a/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.30_binutils-2.32_kernel-5.0-sanitized.ptxconfig
+++ b/ptxconfigs/x86_64-unknown-linux-gnu_gcc-10.0.1_clang-8.0.1_glibc-2.31_binutils-2.32_kernel-5.0-sanitized.ptxconfig
@@ -39,10 +39,11 @@ PTXCONF_GLIBC_HEADERS=y
 PTXCONF_GLIBC_CRT=y
 PTXCONF_GLIBC_FIRST=y
 PTXCONF_GLIBC=y
-PTXCONF_GLIBC_VERSION="2.30"
-PTXCONF_GLIBC_MD5="afb5a260b80ce040443cb32cba0dd8c0"
+PTXCONF_GLIBC_VERSION="2.31"
+PTXCONF_GLIBC_DL_VERSION="2.31-29-gde371d1581f3"
+PTXCONF_GLIBC_MD5="a675d277516d2fd43c9a8bc32d257874"
 PTXCONF_GLIBC_LICENSE="GPL-2.0-or-later AND LGPL-2.1-or-later"
-PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=cfc0ed77a9f62fa62eded042ebe31d72"
+PTXCONF_GLIBC_LICENSE_FILES="file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c file://LICENSES;md5=1541fd8f5e8f1579512bf05f533371ba"
 PTXCONF_GLIBC_TIMESTAMP=""
 PTXCONF_GLIBC_SERIES=""
 PTXCONF_GLIBC_ENABLE_KERNEL="3.16"