From owner-svn-ports-head@freebsd.org Sun Jan 27 16:43:31 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 99BF914B4051; Sun, 27 Jan 2019 16:43:31 +0000 (UTC) (envelope-from bapt@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) server-signature RSA-PSS (4096 bits) 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 3F7BE71F0A; Sun, 27 Jan 2019 16:43:31 +0000 (UTC) (envelope-from bapt@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 2E27AAB72; Sun, 27 Jan 2019 16:43:31 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0RGhV1R011987; Sun, 27 Jan 2019 16:43:31 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0RGhUbM011986; Sun, 27 Jan 2019 16:43:30 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201901271643.x0RGhUbM011986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 27 Jan 2019 16:43:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r491369 - in head/shells/zsh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/shells/zsh: . files X-SVN-Commit-Revision: 491369 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3F7BE71F0A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.976,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 27 Jan 2019 16:43:31 -0000 Author: bapt Date: Sun Jan 27 16:43:30 2019 New Revision: 491369 URL: https://svnweb.freebsd.org/changeset/ports/491369 Log: Add a patch to fix an infinite recursion when using VCS_info Reported by: ume Added: head/shells/zsh/files/vcs_info_p4.patch (contents, props changed) Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Sun Jan 27 16:34:23 2019 (r491368) +++ head/shells/zsh/Makefile Sun Jan 27 16:43:30 2019 (r491369) @@ -3,6 +3,7 @@ PORTNAME= zsh DISTVERSION= 5.7 +PORTREVISION= 1 CATEGORIES= shells MASTER_SITES= http://www.zsh.org/pub/ \ SF \ @@ -21,6 +22,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se MAKE_JOBS_UNSAFE= yes USES= autoreconf iconv ncurses shebangfix tar:xz + +EXTRA_PATCHES= ${FILESDIR}/vcs_info_p4.patch:-p1 SHEBANG_LANG= zsh zsh_OLD_CMD= zsh # shebang appears as /bin/zsh and just zsh Added: head/shells/zsh/files/vcs_info_p4.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/zsh/files/vcs_info_p4.patch Sun Jan 27 16:43:30 2019 (r491369) @@ -0,0 +1,35 @@ +From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001 +From: dana +Date: Sun, 27 Jan 2019 00:26:31 -0600 +Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion + +--- + ChangeLog | 5 +++++ + Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 - + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index 81668ccc9..be243c1b8 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,8 @@ ++2018-01-27 dana ++ ++ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix ++ infinite recursion ++ + 2018-01-24 dana + + * unposted: Config/version.mk: Post-release version bump +diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 +index d171c68ee..5ec21da9f 100644 +--- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 ++++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 +@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() { + } + + +-(( ${+functions[VCS_INFO_detect_p4]} )) || + VCS_INFO_detect_p4() { + local serverport p4where +