From 80c2d64c36008a04d8fc7618357a08e56abe5317a6cb97e8866d5583bc0622e6 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 19 Apr 2020 13:07:33 +0000
Subject: [PATCH] Accepting request 793891 from
 home:marxin:branches:Base:System

- Add fix-57962.patch in order to fix bug #57962.

OBS-URL: https://build.opensuse.org/request/show/793891
OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=68
---
 fix-57962.patch | 30 ++++++++++++++++++++++++++++++
 make.changes    |  5 +++++
 make.spec       |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 fix-57962.patch

diff --git a/fix-57962.patch b/fix-57962.patch
new file mode 100644
index 0000000..0a0f310
--- /dev/null
+++ b/fix-57962.patch
@@ -0,0 +1,30 @@
+diff --git a/lib/findprog-in.c b/lib/findprog-in.c
+index c254f2f..d89ec00 100644
+--- a/lib/findprog-in.c
++++ b/lib/findprog-in.c
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/stat.h>
+ 
+ #include "filename.h"
+ #include "concat-filename.h"
+@@ -190,6 +191,7 @@ find_in_given_path (const char *progname, const char *path,
+           dir = ".";
+ 
+         /* Try all platform-dependent suffixes.  */
++        struct stat st;
+         for (i = 0; i < sizeof (suffixes) / sizeof (suffixes[0]); i++)
+           {
+             const char *suffix = suffixes[i];
+@@ -208,7 +210,8 @@ find_in_given_path (const char *progname, const char *path,
+                    use it.  On other systems, let's hope that this program
+                    is not installed setuid or setgid, so that it is ok to
+                    call access() despite its design flaw.  */
+-                if (eaccess (progpathname, X_OK) == 0)
++                if (eaccess (progpathname, X_OK) == 0 &&
++                        stat(progpathname, &st) == 0 && S_ISREG(st.st_mode))
+                   {
+                     /* Found!  */
+                     if (strcmp (progpathname, progname) == 0)
diff --git a/make.changes b/make.changes
index d42e515..57eb2b0 100644
--- a/make.changes
+++ b/make.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 14 13:30:14 UTC 2020 - Martin Liška <mliska@suse.cz>
+
+- Add fix-57962.patch in order to fix bug #57962.
+
 -------------------------------------------------------------------
 Sat Feb 22 19:55:41 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/make.spec b/make.spec
index c49e83a..308f77b 100644
--- a/make.spec
+++ b/make.spec
@@ -28,6 +28,7 @@ Source1:        http://ftp.gnu.org/gnu/make/make-%{version}.tar.gz.sig
 # keyring downloaded from https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make&download=1
 Source2:        %{name}.keyring
 Patch1:         make-testcases_timeout.diff
+Patch2:         fix-57962.patch
 Patch5:         test-driver.patch
 Patch64:        make-library-search-path.diff
 BuildRequires:  autoconf
@@ -45,6 +46,7 @@ The GNU make command with extensive documentation.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 %patch5 -p1
 if [ %{_lib} = lib64 ]; then
 %patch64 -p1