upgpkg: glibc-git 2.29.r102.g462e83a4a0-1

refresh patches

4 files changed, 27 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86b197206ad8..1582d48e3d35 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glibc-git
 	pkgdesc = GNU C Library
-	pkgver = 2.28.r559.ga1b02ae763
+	pkgver = 2.29.r102.g462e83a4a0
 	pkgrel = 1
 	url = https://www.gnu.org/software/libc/
 	install = glibc-git.install
@@ -15,7 +15,7 @@ pkgbase = glibc-git
 	depends = tzdata
 	depends = filesystem
 	optdepends = gd: graph image generation with memusage
-	provides = glibc=2.28
+	provides = glibc=2.29
 	conflicts = glibc
 	options = staticlibs
 	backup = etc/gai.conf
@@ -26,8 +26,8 @@ pkgbase = glibc-git
 	source = bz20338.patch
 	sha256sums = SKIP
 	sha256sums = 05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de
-	sha256sums = 84ee34285796d7154a92cc6177920d1d9cac361f02c6ef164e13a121dec59d05
-	sha256sums = 959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a
+	sha256sums = 5cf67db2da1a8c421b44ed191c2822864ad6672695843409b02487da7addaf92
+	sha256sums = 7ff38c08e51c4a0a3d7fd2712cf435f700bef078fb8f4e7566424ae3d1754bab
 
 pkgname = glibc-git
 	options = staticlibs
diff --git a/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch b/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
index 7ccfbaec704a..f74c4c396604 100644
--- a/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
+++ b/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
@@ -1,4 +1,4 @@
-From e0cff4a2cace32698e9531bbdbd6e5ce59b5756a Mon Sep 17 00:00:00 2001
+From 9240b22420e122770ba06fdcd38c021361384e33 Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz@archlinux.org>
 Date: Fri, 28 Sep 2018 05:19:46 +0000
 Subject: [PATCH] Revert "elf: Correct absolute (SHN_ABS) symbol run-time
@@ -18,7 +18,7 @@ This reverts commit e7feec374c635b6a29d65c39ae5e1855528fed39.
  delete mode 100644 elf/tst-absolute-sym.c
 
 diff --git a/elf/Makefile b/elf/Makefile
-index 9cf5cd8dfd..1b144d67e2 100644
+index faec577d1c..62e961d655 100644
 --- a/elf/Makefile
 +++ b/elf/Makefile
 @@ -186,7 +186,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
@@ -27,7 +27,7 @@ index 9cf5cd8dfd..1b144d67e2 100644
  	 tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \
 -	 tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note \
 +	 tst-debug1 tst-main1 tst-absolute-zero tst-big-note \
- 	 tst-unwind-ctor tst-unwind-main
+ 	 tst-unwind-ctor tst-unwind-main tst-audit13
  #	 reldep9
  tests-internal += loadtest unload unload2 circleload1 \
 @@ -274,7 +274,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
@@ -36,9 +36,9 @@ index 9cf5cd8dfd..1b144d67e2 100644
  		tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \
 -		tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \
 +		tst-main1mod tst-libc_dlvsym-dso \
- 		tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib
+ 		tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib \
+ 		tst-audit13mod1
  # Most modules build with _ISOMAC defined, but those filtered out
- # depend on internal headers.
 diff --git a/elf/dl-addr.c b/elf/dl-addr.c
 index 9d285d76a7..0dd7d1dde9 100644
 --- a/elf/dl-addr.c
@@ -174,5 +174,5 @@ index 37cab6f06b..eb01538256 100644
  /* On some architectures a pointer to a function is not just a pointer
     to the actual code of the function but rather an architecture
 -- 
-2.20.1
+2.21.0
 
diff --git a/PKGBUILD b/PKGBUILD
index ee7d71e4fb54..21e6665ad37b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
 
 pkgname=glibc-git
-pkgver=2.28.r559.ga1b02ae763
+pkgver=2.29.r102.g462e83a4a0
 pkgrel=1
 pkgdesc='GNU C Library'
 arch=('i686' 'x86_64')
@@ -26,8 +26,11 @@ source=('git+https://sourceware.org/git/glibc.git'
         'bz20338.patch')
 sha256sums=('SKIP'
             '05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de'
-            '84ee34285796d7154a92cc6177920d1d9cac361f02c6ef164e13a121dec59d05'
-            '959d4f41edd004bddd9091c4d8c8c3aa07d79a04bfdb89d59f9f26fe5a74d32a')
+            '5cf67db2da1a8c421b44ed191c2822864ad6672695843409b02487da7addaf92'
+            '7ff38c08e51c4a0a3d7fd2712cf435f700bef078fb8f4e7566424ae3d1754bab')
+
+# remove default hardening for building libraries
+CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
 pkgver() {
     cd glibc
@@ -36,8 +39,6 @@ pkgver() {
 }
 
 prepare() {
-    mkdir -p build
-
     cd glibc
     # https://sourceware.org/bugzilla/show_bug.cgi?id=20338
     patch -p1 -i ../bz20338.patch
@@ -49,6 +50,7 @@ prepare() {
 }
 
 build() {
+    mkdir -p build
     cd build
 
     if [[ ${CARCH} = "i686" ]]; then
@@ -62,9 +64,6 @@ build() {
       printf 'rootsbindir=/usr/bin\n'
     } >> configparms
 
-    # remove fortify for building libraries
-    CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
-
     "$srcdir"/glibc/configure \
         --prefix=/usr \
         --libdir=/usr/lib \
diff --git a/bz20338.patch b/bz20338.patch
index d223e9f08882..ac2eedff299b 100644
--- a/bz20338.patch
+++ b/bz20338.patch
@@ -1,4 +1,4 @@
-From 74250a7cdf106d4ca7d9506e6d5dc7c448dc3434 Mon Sep 17 00:00:00 2001
+From e7d2660cfa942ad08f4398436332f46fd620ddd0 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
@@ -10,12 +10,12 @@ Subject: [PATCH] gshadow: Sync fgetsgent_r.c with grp/fgetgrent_r.c
 	(__fgetsgent_r): Sync with __fgetgrent_r.
 	* nss/nss_files/files-sgrp.c: Fix "fgetsgent_r.c" typo.
 ---
- gshadow/fgetsgent_r.c      | 35 ++++++++++++++++++++++++-----------
+ gshadow/fgetsgent_r.c      | 33 +++++++++++++++++++++++----------
  nss/nss_files/files-sgrp.c |  2 +-
- 2 files changed, 25 insertions(+), 12 deletions(-)
+ 2 files changed, 24 insertions(+), 11 deletions(-)
 
 diff --git a/gshadow/fgetsgent_r.c b/gshadow/fgetsgent_r.c
-index b70f6fa..02cd33a 100644
+index 19a663f048..32eb7a2365 100644
 --- a/gshadow/fgetsgent_r.c
 +++ b/gshadow/fgetsgent_r.c
 @@ -20,39 +20,44 @@
@@ -70,16 +70,12 @@ index b70f6fa..02cd33a 100644
  	  *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.  */
+@@ -64,10 +69,18 @@ __fgetsgent_r (FILE *stream, struct sgrp *resbuf, char *buffer, size_t buflen,
+     } 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_line (buffer, (void *) resbuf, (void *) buffer, buflen,
+-			      &errno));
 +	     || ! (parse_result = parse_line (p, resbuf,
 +					      (void *) buffer, buflen,
 +					      &errno)));
@@ -97,7 +93,7 @@ index b70f6fa..02cd33a 100644
    *result = resbuf;
    return 0;
 diff --git a/nss/nss_files/files-sgrp.c b/nss/nss_files/files-sgrp.c
-index 15dc659..05c3805 100644
+index 6fb880a4ba..9f66a4e327 100644
 --- a/nss/nss_files/files-sgrp.c
 +++ b/nss/nss_files/files-sgrp.c
 @@ -23,7 +23,7 @@
@@ -110,5 +106,5 @@ index 15dc659..05c3805 100644
  #define EXTERN_PARSER
  #include "files-parse.c"
 -- 
-2.7.4
+2.21.0