svn commit: r491369 - in head/shells/zsh: . files
Baptiste Daroussin
bapt at FreeBSD.org
Sun Jan 27 16:43:31 UTC 2019
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 <dana at dana.is>
+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 <dana at dana.is>
++
++ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
++ infinite recursion
++
+ 2018-01-24 dana <dana at dana.is>
+
+ * 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
+
More information about the svn-ports-head
mailing list