Accepting request 795530 from Base:System
OBS-URL: https://build.opensuse.org/request/show/795530 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/make?expand=0&rev=45
This commit is contained in:
commit
bb59fc33fa
30
fix-57962.patch
Normal file
30
fix-57962.patch
Normal file
@ -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)
|
@ -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>
|
Sat Feb 22 19:55:41 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
@ -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
|
# keyring downloaded from https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make&download=1
|
||||||
Source2: %{name}.keyring
|
Source2: %{name}.keyring
|
||||||
Patch1: make-testcases_timeout.diff
|
Patch1: make-testcases_timeout.diff
|
||||||
|
Patch2: fix-57962.patch
|
||||||
Patch5: test-driver.patch
|
Patch5: test-driver.patch
|
||||||
Patch64: make-library-search-path.diff
|
Patch64: make-library-search-path.diff
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
@ -45,6 +46,7 @@ The GNU make command with extensive documentation.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
if [ %{_lib} = lib64 ]; then
|
if [ %{_lib} = lib64 ]; then
|
||||||
%patch64 -p1
|
%patch64 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user