From owner-svn-ports-head@freebsd.org Thu May 21 09:50:37 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6332132F3BD; Thu, 21 May 2020 09:50:37 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49SPxn204Sz4gBX; Thu, 21 May 2020 09:50:37 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F669B54D; Thu, 21 May 2020 09:50:37 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04L9ob7M056402; Thu, 21 May 2020 09:50:37 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04L9oafI056401; Thu, 21 May 2020 09:50:36 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <202005210950.04L9oafI056401@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Thu, 21 May 2020 09:50:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536096 - in head/devel/gmake: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head/devel/gmake: . files X-SVN-Commit-Revision: 536096 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2020 09:50:37 -0000 Author: tijl Date: Thu May 21 09:50:36 2020 New Revision: 536096 URL: https://svnweb.freebsd.org/changeset/ports/536096 Log: Add backport of gnulib git commit 4c1009ec93e12ee34acd27f6d7e25442bedc16f2. When the file found in a PATH element is a directory, continue searching. PR: 246615 Submitted by: jkim Obtained from: https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4c1009ec93e12ee34acd27f6d7e25442bedc16f2 Added: head/devel/gmake/files/patch-10-4c1009ec (contents, props changed) Modified: head/devel/gmake/Makefile Modified: head/devel/gmake/Makefile ============================================================================== --- head/devel/gmake/Makefile Thu May 21 09:50:19 2020 (r536095) +++ head/devel/gmake/Makefile Thu May 21 09:50:36 2020 (r536096) @@ -3,6 +3,7 @@ PORTNAME= gmake PORTVERSION= 4.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNU/make DISTNAME= make-${PORTVERSION} Added: head/devel/gmake/files/patch-10-4c1009ec ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gmake/files/patch-10-4c1009ec Thu May 21 09:50:36 2020 (r536096) @@ -0,0 +1,32 @@ +Backport of gnulib git commit 4c1009ec93e12ee34acd27f6d7e25442bedc16f2. + +When the file found in a PATH element is a directory, continue searching. + +--- lib/findprog-in.c.orig 2020-01-19 20:34:01 UTC ++++ lib/findprog-in.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "filename.h" + #include "concat-filename.h" +@@ -190,6 +191,7 @@ find_in_given_path (const char *progname, const char * + 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 * + 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_ISDIR(st.st_mode)) + { + /* Found! */ + if (strcmp (progpathname, progname) == 0)