From 89741dae7202fc2bc0e3f283239b8ca5251b669dd80d963c31e98d5a26c68203 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Tue, 7 Nov 2017 10:03:35 +0000
Subject: [PATCH] Accepting request 539476 from home:Andreas_Schwab:Factory

- glob-lstat.patch: Do not assume glibc glob internals

OBS-URL: https://build.opensuse.org/request/show/539476
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=57
---
 glob-lstat.patch | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
 make.changes     |  5 ++++
 make.spec        |  4 ++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 glob-lstat.patch

diff --git a/glob-lstat.patch b/glob-lstat.patch
new file mode 100644
index 0000000..39e3b55
--- /dev/null
+++ b/glob-lstat.patch
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: [PATCH] glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do.  GNU 'make' should not get in
+the way of this.  See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9b99..c343e4c29c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
+-- 
+2.15.0
+
diff --git a/make.changes b/make.changes
index fe7916b..151c65a 100644
--- a/make.changes
+++ b/make.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov  6 08:52:40 UTC 2017 - schwab@suse.de
+
+- glob-lstat.patch: Do not assume glibc glob internals
+
 -------------------------------------------------------------------
 Wed Oct 18 09:09:44 UTC 2017 - bwiedemann@suse.com
 
diff --git a/make.spec b/make.spec
index f5183f6..e44207f 100644
--- a/make.spec
+++ b/make.spec
@@ -28,8 +28,9 @@ Source1:        http://ftp.gnu.org/gnu/make/make-%{version}.tar.bz2.sig
 # keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make
 Source2:        %{name}.keyring
 Patch1:         make-testcases_timeout.diff
-# FEATURE-OPENSUSE sort glob https://savannah.gnu.org/bugs/index.php?52076
+# PATCH-FEATURE-OPENSUSE sort glob https://savannah.gnu.org/bugs/index.php?52076
 Patch2:         make-sorted-glob.patch
+Patch3:         glob-lstat.patch
 Patch64:        make-library-search-path.diff
 Requires(post): %{install_info_prereq}
 Requires(preun): %{install_info_prereq}
@@ -46,6 +47,7 @@ The GNU make command with extensive documentation.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 if [ %{_lib} == lib64 ]; then
 %patch64 -p1
 fi