Update to Glibc 2.31

Took a while to figure out why i couldn't build wine-lol but i got there....

3 files changed, 5 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a0af20439e87..cd0e2450b672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wine-lol-glibc
 	pkgdesc = GNU C Library patched for wine-lol
-	pkgver = 2.30
+	pkgver = 2.31
 	pkgrel = 1
 	url = https://www.gnu.org/software/libc
 	arch = x86_64
@@ -16,13 +16,11 @@ pkgbase = wine-lol-glibc
 	optdepends = gd: for memusagestat
 	options = !strip
 	options = staticlibs
-	source = https://ftp.gnu.org/gnu/glibc/glibc-2.30.tar.xz
+	source = https://ftp.gnu.org/gnu/glibc/glibc-2.31.tar.xz
 	source = bz20338.patch
-	source = file-truncated-while-reading-soname-after-patchelf.patch
 	source = wine-lol-poc1-glibc.diff::https://bugs.winehq.org/attachment.cgi?id=64482
-	md5sums = 2b1dbdf27b28620752956c061d62f60c
+	md5sums = 78a720f17412f3c3282be5a6f3363ec6
 	md5sums = 430673eccc78e52c249aa4b0f1786450
-	md5sums = 0820504d2e83ee15f74a656771361872
 	md5sums = 65e6d204ab9ad787c8dce999c4ba5c17
 
 pkgname = wine-lol-glibc
diff --git a/PKGBUILD b/PKGBUILD
index b1ad99f0bd35..e61f44c487e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=wine-lol-glibc
 pkgdesc='GNU C Library patched for wine-lol'
-pkgver=2.30
+pkgver=2.31
 pkgrel=1
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
@@ -20,11 +20,9 @@ options=(!strip staticlibs)
 #source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
 source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz
         bz20338.patch
-        file-truncated-while-reading-soname-after-patchelf.patch
         wine-lol-poc1-glibc.diff::https://bugs.winehq.org/attachment.cgi?id=64482)
-md5sums=('2b1dbdf27b28620752956c061d62f60c'
+md5sums=('78a720f17412f3c3282be5a6f3363ec6'
          '430673eccc78e52c249aa4b0f1786450'
-         '0820504d2e83ee15f74a656771361872'
          '65e6d204ab9ad787c8dce999c4ba5c17')
 
 prepare() {
diff --git a/file-truncated-while-reading-soname-after-patchelf.patch b/file-truncated-while-reading-soname-after-patchelf.patch
deleted file mode 100644
index 4c21284bf0b0..000000000000
--- a/file-truncated-while-reading-soname-after-patchelf.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-[PATCH] ldconfig: file truncated while reading soname after patchelf [BZ #23964]
-
-The way loadaddr is computed from the first LOAD segment in process_elf_file
-assumes .dynstr is also contained in that segment. That is not necessarily
-true, especially for libraries that have been touched by patchelf.
-
-With this patch, the address read from the dynamic segment is checked against
-all applicable segments instead of only the first one.
-
-       [BZ #23964]
-       * elf/readelflib.c: Fix resolving of loadaddr for .dynstr vaddr.
----
- elf/readelflib.c | 33 ++++++++++++++++-----------------
- 1 file changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/elf/readelflib.c b/elf/readelflib.c
-index 5a1e2dc2df..bc1195c175 100644
---- a/elf/readelflib.c
-+++ b/elf/readelflib.c
-@@ -98,11 +98,6 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
- 
-       switch (segment->p_type)
- 	{
--	case PT_LOAD:
--	  if (loadaddr == (ElfW(Addr)) -1)
--	    loadaddr = segment->p_vaddr - segment->p_offset;
--	  break;
--
- 	case PT_DYNAMIC:
- 	  if (dynamic_addr)
- 	    error (0, 0, _("more than one dynamic segment\n"));
-@@ -176,11 +171,6 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
- 	}
- 
-     }
--  if (loadaddr == (ElfW(Addr)) -1)
--    {
--      /* Very strange. */
--      loadaddr = 0;
--    }
- 
-   /* Now we can read the dynamic sections.  */
-   if (dynamic_size == 0)
-@@ -190,22 +180,31 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
-   check_ptr (dynamic_segment);
- 
-   /* Find the string table.  */
--  dynamic_strings = NULL;
-   for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
-        ++dyn_entry)
-     {
-       check_ptr (dyn_entry);
-       if (dyn_entry->d_tag == DT_STRTAB)
--	{
--	  dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
--	  check_ptr (dynamic_strings);
--	  break;
--	}
-+        break;
-     }
- 
--  if (dynamic_strings == NULL)
-+  for (i = 0, segment = elf_pheader;i < elf_header->e_phnum; i++, segment++)
-+  {
-+    ElfW(Addr) vaddr = dyn_entry->d_un.d_ptr;
-+    if (segment->p_type == PT_LOAD &&
-+        vaddr >= segment->p_vaddr &&
-+        vaddr < segment->p_vaddr + segment->p_filesz)
-+    {
-+      loadaddr = segment->p_vaddr - segment->p_offset;
-+      break;
-+    }
-+  }
-+  if (loadaddr == (ElfW(Addr)) -1)
-     return 1;
- 
-+  dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
-+  check_ptr (dynamic_strings);
-+
-   /* Now read the DT_NEEDED and DT_SONAME entries.  */
-   for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
-        ++dyn_entry)
--- 
-2.19.2
-