upgpkg: glibc-git 2.30.r51.gf615e3fced-1

refresh patch so it still applies

3 files changed, 15 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1582d48e3d35..3f2d75669e13 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = glibc-git
 	pkgdesc = GNU C Library
-	pkgver = 2.29.r102.g462e83a4a0
+	pkgver = 2.30.r51.gf615e3fced
 	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.29
+	provides = glibc=2.30
 	conflicts = glibc
 	options = staticlibs
 	backup = etc/gai.conf
@@ -26,7 +26,7 @@ pkgbase = glibc-git
 	source = bz20338.patch
 	sha256sums = SKIP
 	sha256sums = 05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de
-	sha256sums = 5cf67db2da1a8c421b44ed191c2822864ad6672695843409b02487da7addaf92
+	sha256sums = 52499da026e43c294c84af5af32b18ca304727fe1098a35f2bc7b6bafc096dd6
 	sha256sums = 7ff38c08e51c4a0a3d7fd2712cf435f700bef078fb8f4e7566424ae3d1754bab
 
 pkgname = glibc-git
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 f74c4c396604..df8c21e353b1 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 9240b22420e122770ba06fdcd38c021361384e33 Mon Sep 17 00:00:00 2001
+From 7d0f675e8f8a21ccfb2b153194edeb5094425fa7 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,27 +18,27 @@ This reverts commit e7feec374c635b6a29d65c39ae5e1855528fed39.
  delete mode 100644 elf/tst-absolute-sym.c
 
 diff --git a/elf/Makefile b/elf/Makefile
-index faec577d1c..62e961d655 100644
+index d470e41402..2ff8fe3d7f 100644
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -186,7 +186,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
+@@ -190,7 +190,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
  	 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \
  	 tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload \
  	 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-audit13
+ 	 tst-unwind-ctor tst-unwind-main tst-audit13 \
+ 	 tst-sonamemove-link tst-sonamemove-dlopen tst-dlopen-aout
  #	 reldep9
- tests-internal += loadtest unload unload2 circleload1 \
-@@ -274,7 +274,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
+@@ -276,7 +276,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
  		tst-audit12mod1 tst-audit12mod2 tst-audit12mod3 tst-auditmod12 \
  		tst-latepthreadmod $(tst-tls-many-dynamic-modules) \
  		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-audit13mod1
- # Most modules build with _ISOMAC defined, but those filtered out
+ 		tst-audit13mod1 tst-sonamemove-linkmod1 \
+ 		tst-sonamemove-runmod1 tst-sonamemove-runmod2
 diff --git a/elf/dl-addr.c b/elf/dl-addr.c
 index 9d285d76a7..0dd7d1dde9 100644
 --- a/elf/dl-addr.c
@@ -160,7 +160,7 @@ index c641f7ecdf..0000000000
 -
 -#include <support/test-driver.c>
 diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
-index 37cab6f06b..eb01538256 100644
+index b1fc5c31f9..41f3415e6c 100644
 --- a/sysdeps/generic/ldsodefs.h
 +++ b/sysdeps/generic/ldsodefs.h
 @@ -72,8 +72,7 @@ typedef struct link_map *lookup_t;
@@ -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.21.0
+2.23.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 21e6665ad37b..b4cd375a6d81 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.29.r102.g462e83a4a0
+pkgver=2.30.r51.gf615e3fced
 pkgrel=1
 pkgdesc='GNU C Library'
 arch=('i686' 'x86_64')
@@ -26,7 +26,7 @@ source=('git+https://sourceware.org/git/glibc.git'
         'bz20338.patch')
 sha256sums=('SKIP'
             '05fbb88877cdddc99ef25e48304d6e5ac236660c20925d461cb4e90ebcb3b7de'
-            '5cf67db2da1a8c421b44ed191c2822864ad6672695843409b02487da7addaf92'
+            '52499da026e43c294c84af5af32b18ca304727fe1098a35f2bc7b6bafc096dd6'
             '7ff38c08e51c4a0a3d7fd2712cf435f700bef078fb8f4e7566424ae3d1754bab')
 
 # remove default hardening for building libraries