[arch-commits] Commit in zsh/trunk (PKGBUILD vcs_info.patch)

[Pierre Schmitz]

    Date: Sunday, January 27, 2019 @ 07:49:51
  Author: pierre
Revision: 344861

upgpkg: zsh 5.7-2

Added:
  zsh/trunk/vcs_info.patch
Modified:
  zsh/trunk/PKGBUILD

----------------+
 PKGBUILD       |    9 ++++++---
 vcs_info.patch |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-27 06:43:21 UTC (rev 344860)
+++ PKGBUILD	2019-01-27 07:49:51 UTC (rev 344861)
@@ -3,18 +3,19 @@
 pkgbase=zsh
 pkgname=('zsh' 'zsh-doc')
 pkgver=5.7
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://www.zsh.org/'
 license=('custom')
 makedepends=('pcre' 'libcap' 'gdbm')
 source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
-        'zprofile')
+        'zprofile' 'vcs_info.patch')
 sha512sums=('cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958'
             'SKIP'
             '4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395'
             'SKIP'
-            'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034')
+            'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034'
+            'f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353')
 validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
               'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
               '7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4')
@@ -34,6 +35,8 @@
 		sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd
 	done
 	rm Completion/Linux/Command/_{pkgtool,rpmbuild}
+
+	patch -p1 -i "${srcdir}/vcs_info.patch"
 }
 
 build() {

Added: vcs_info.patch
===================================================================
--- vcs_info.patch	                        (rev 0)
+++ vcs_info.patch	2019-01-27 07:49:51 UTC (rev 344861)
@@ -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
+