From f8cae565578b1128cb909b0905b7b73b9f2841ea Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 27 Sep 2020 17:50:46 +0000
Subject: glibc: update to 2.32

---
 abs/core/glibc/PKGBUILD      |  24 ++++++---
 abs/core/glibc/bz20338.patch | 114 -------------------------------------------
 abs/core/glibc/bz26534.patch |  11 +++++
 3 files changed, 27 insertions(+), 122 deletions(-)
 delete mode 100644 abs/core/glibc/bz20338.patch
 create mode 100644 abs/core/glibc/bz26534.patch

diff --git a/abs/core/glibc/PKGBUILD b/abs/core/glibc/PKGBUILD
index 7cc6d22..aa8e37d 100644
--- a/abs/core/glibc/PKGBUILD
+++ b/abs/core/glibc/PKGBUILD
@@ -6,30 +6,31 @@
 
 pkgbase=glibc
 pkgname=(glibc lib32-glibc)
-pkgver=2.31
-pkgrel=5
+pkgver=2.32
+pkgrel=4
 arch=(x86_64)
 url='https://www.gnu.org/software/libc'
 license=(GPL LGPL)
 makedepends=(git gd lib32-gcc-libs python)
 options=(!strip staticlibs)
-#source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
-_commit=18fdba553dd9b907e9812b90d2cea593f776058f
-source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+#_commit=3de512be7ea6053255afed6154db9ee31d4e557a
+#source=(git+https://sourceware.org/git/glibc.git#commit=$_commit
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$pkgver.tar.xz{,.sig}
         locale.gen.txt
         locale-gen
         lib32-glibc.conf
         sdt.h sdt-config.h
-        bz20338.patch)
+        bz26534.patch)
 validpgpkeys=(7273542B39962DF7B299931416792B4EA25340F8 # Carlos O'Donell
               BC7C7372637EC10C57D7AA6579C43DFBF1CF2187) # Siddhesh Poyarekar
-md5sums=('SKIP'
+md5sums=('720c7992861c57cf97d66a2f36d8d1fa'
+         'SKIP'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf'
          '6e052f1cb693d5d3203f50f9d4e8c33b'
          '91fec3b7e75510ae2ac42533aa2e695e'
          '680df504c683640b02ed4a805797c0b2'
-         '430673eccc78e52c249aa4b0f1786450')
+         'fc57038c1297c7c11258e8dda1623ec2')
 
 prepare() {
   mkdir -p glibc-build lib32-glibc-build
@@ -194,11 +195,15 @@ package_glibc() {
   # libraries too. Useful for gdb's catch command.
   install -Dm644 "$srcdir/sdt.h" "$pkgdir/usr/include/sys/sdt.h"
   install -Dm644 "$srcdir/sdt-config.h" "$pkgdir/usr/include/sys/sdt-config.h"
+
+  # Provided by libxcrypt; keep the old shared library for backwards compatibility
+  rm -f "$pkgdir"/usr/include/crypt.h "$pkgdir"/usr/lib/libcrypt.{a,so}
 }
 
 package_lib32-glibc() {
   pkgdesc='GNU C Library (32-bit)'
   depends=("glibc=$pkgver")
+  options+=('!emptydirs')
 
   cd lib32-glibc-build
 
@@ -227,4 +232,7 @@ package_lib32-glibc() {
       -not -name 'libthread_db-*.so' \
       -name '*-*.so' -type f -exec strip $STRIP_SHARED {} + 2> /dev/null || true
   fi
+
+  # Provided by lib32-libxcrypt; keep the old shared library for backwards compatibility
+  rm -f "$pkgdir"/usr/lib32/libcrypt.{a,so}
 }
diff --git a/abs/core/glibc/bz20338.patch b/abs/core/glibc/bz20338.patch
deleted file mode 100644
index ddcc3ef..0000000
--- a/abs/core/glibc/bz20338.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
-From: David Michael <david.michael@coreos.com>
-Date: Thu, 15 Dec 2016 15:22:57 -0800
-Subject: [PATCH] gshadow: Sync fgetsgent_r.c with grp/fgetgrent_r.c
-
-	[BZ #20338]
-	* gshadow/fgetsgent_r.c: Include <libio/iolibio.h>.
-	(flockfile): New macro.
-	(funlockfile): Likewise.
-	(__fgetsgent_r): Sync with __fgetgrent_r.
-	* nss/nss_files/files-sgrp.c: Fix "fgetsgent_r.c" typo.
----
- gshadow/fgetsgent_r.c      | 35 ++++++++++++++++++++++++-----------
- nss/nss_files/files-sgrp.c |  2 +-
- 2 files changed, 25 insertions(+), 12 deletions(-)
-
-diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
-index b70f6fa..02cd33a 100644
---- a/gshadow/fgetsgent_r.c
-+++ b/gshadow/fgetsgent_r.c
-@@ -20,39 +20,44 @@
- #include <gshadow.h>
- #include <stdio.h>
- 
-+#include <libio/iolibio.h>
-+#define flockfile(s) _IO_flockfile (s)
-+#define funlockfile(s) _IO_funlockfile (s)
-+
- /* Define a line parsing function using the common code
-    used in the nss_files module.  */
- 
- #define STRUCTURE	sgrp
- #define ENTNAME		sgent
--#define	EXTERN_PARSER	1
-+#define EXTERN_PARSER	1
- struct sgent_data {};
- 
- #include <nss/nss_files/files-parse.c>
- 
- 
--/* Read one shadow entry from the given stream.  */
-+/* Read one entry from the given stream.  */
- int
- __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
- 	       struct sgrp **result)
- {
-   char *p;
-+  int parse_result;
- 
--  _IO_flockfile (stream);
-+  flockfile (stream);
-   do
-     {
-       buffer[buflen - 1] = '\xff';
-       p = fgets_unlocked (buffer, buflen, stream);
--      if (p == NULL && feof_unlocked (stream))
-+      if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream))
- 	{
--	  _IO_funlockfile (stream);
-+	  funlockfile (stream);
- 	  *result = NULL;
- 	  __set_errno (ENOENT);
- 	  return errno;
- 	}
--      if (p == NULL || buffer[buflen - 1] != '\xff')
-+      if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff')
- 	{
--	  _IO_funlockfile (stream);
-+	  funlockfile (stream);
- 	  *result = NULL;
- 	  __set_errno (ERANGE);
- 	  return errno;
-@@ -61,13 +66,21 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
-       /* Skip leading blanks.  */
-       while (isspace (*p))
- 	++p;
--    } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines.  */
-+    } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines.  */
- 	     /* Parse the line.  If it is invalid, loop to
- 		get the next line of the file to parse.  */
--	     || ! parse_line (buffer, (void *) resbuf, (void *) buffer, buflen,
--			      &errno));
-+	     || ! (parse_result = parse_line (p, resbuf,
-+					      (void *) buffer, buflen,
-+					      &errno)));
-+
-+  funlockfile (stream);
- 
--  _IO_funlockfile (stream);
-+  if (__builtin_expect (parse_result, 0) == -1)
-+    {
-+      /* The parser ran out of space.  */
-+      *result = NULL;
-+      return errno;
-+    }
- 
-   *result = resbuf;
-   return 0;
-diff --git a/nss/nss_files/files-sgrp.c b/nss/nss_files/files-sgrp.c
-index 15dc659..05c3805 100644
---- a/nss/nss_files/files-sgrp.c
-+++ b/nss/nss_files/files-sgrp.c
-@@ -23,7 +23,7 @@
- #define DATABASE	"gshadow"
- struct sgent_data {};
- 
--/* Our parser function is already defined in sgetspent_r.c, so use that
-+/* Our parser function is already defined in sgetsgent_r.c, so use that
-    to parse lines from the database file.  */
- #define EXTERN_PARSER
- #include "files-parse.c"
--- 
-2.7.4
-
diff --git a/abs/core/glibc/bz26534.patch b/abs/core/glibc/bz26534.patch
new file mode 100644
index 0000000..5a2fdd8
--- /dev/null
+++ b/abs/core/glibc/bz26534.patch
@@ -0,0 +1,11 @@
+--- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2020-08-25 15:08:15.049364392 +0200
++++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2020-08-25 15:08:20.012697875 +0200
+@@ -32,7 +32,7 @@
+       && CPU_FEATURE_USABLE_P (cpu_features, AVX2))
+     return OPTIMIZE (fma);
+
+-  if (CPU_FEATURE_USABLE_P (cpu_features, FMA))
++  if (CPU_FEATURE_USABLE_P (cpu_features, FMA4))
+     return OPTIMIZE (fma4);
+
+   return OPTIMIZE (sse2);
-- 
cgit v0.12

