summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2019-01-28 20:49:59 -0500
committerjames2019-01-28 20:55:06 -0500
commit3a1b83f862892ffb90298794e38e4d0d1d9e00aa (patch)
tree48ce1f8337247dbb9ed749a60234b7b0854363a9
parent95119645ec1905998c687e81e892d75cb40a130d (diff)
downloadaur-3a1b83f862892ffb90298794e38e4d0d1d9e00aa.tar.gz
Update to version 5.7
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD17
-rw-r--r--vcs_info.patch35
3 files changed, 58 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 03fb1f00d01..b4373557390 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zsh-athame-git
- pkgver = 5.5.1
+ pkgver = 5.7
pkgrel = 1
url = http://github.com/ardagnir/athame/
arch = x86_64
@@ -10,21 +10,25 @@ pkgbase = zsh-athame-git
makedepends = libcap
makedepends = gdbm
makedepends = git
- provides = zsh=5.5.1
+ provides = zsh=5.7
conflicts = zsh
- source = https://www.zsh.org/pub/zsh-5.5.1.tar.gz
- source = https://www.zsh.org/pub/zsh-5.5.1.tar.gz.asc
- source = https://www.zsh.org/pub/zsh-5.5.1-doc.tar.gz
- source = https://www.zsh.org/pub/zsh-5.5.1-doc.tar.gz.asc
+ source = https://www.zsh.org/pub/zsh-5.7.tar.xz
+ source = https://www.zsh.org/pub/zsh-5.7.tar.xz.asc
+ source = https://www.zsh.org/pub/zsh-5.7-doc.tar.xz
+ source = https://www.zsh.org/pub/zsh-5.7-doc.tar.xz.asc
source = zprofile
+ source = vcs_info.patch
source = git://github.com/ardagnir/athame
source = git://github.com/ardagnir/vimbed
validpgpkeys = F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3
- sha512sums = c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
+ validpgpkeys = E96646BE08C0AF0AA0F90788A5FEEE3AC7937444
+ validpgpkeys = 7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4
+ sha512sums = cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
sha512sums = SKIP
- sha512sums = d121d3e642e15406ea3e570fe67bb023f27b10e3f12a6a8a8ad02b1f7070c88445f0431a411a8e54ff92a237ba7c4334f4d6f9fb3f4bebeade4c02e42bdf1a5e
+ sha512sums = 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
sha512sums = SKIP
sha512sums = b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034
+ sha512sums = f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
sha512sums = SKIP
sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 2701c7b2336..039390ffefc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id$
# Maintainer: James Kolb <jck1089@gmail.com>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=('zsh-athame-git')
-pkgver=5.5.1
+pkgver=5.7
pkgrel=1
arch=('x86_64')
conflicts=('zsh')
@@ -11,18 +10,22 @@ provides=("zsh=${pkgver}")
url='http://github.com/ardagnir/athame/'
license=('custom' 'GPL' 'AGPL')
makedepends=('pcre' 'libcap' 'gdbm' 'git')
-source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.gz"{,.asc}
+source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc}
'zprofile'
+ 'vcs_info.patch'
'git://github.com/ardagnir/athame'
'git://github.com/ardagnir/vimbed')
-sha512sums=('c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb'
+sha512sums=('cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958'
'SKIP'
- 'd121d3e642e15406ea3e570fe67bb023f27b10e3f12a6a8a8ad02b1f7070c88445f0431a411a8e54ff92a237ba7c4334f4d6f9fb3f4bebeade4c02e42bdf1a5e'
+ '4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395'
'SKIP'
'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034'
+ 'f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353'
'SKIP'
'SKIP')
-validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3')
+validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3'
+ 'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444'
+ '7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4')
prepare() {
cd "${srcdir}/athame"
@@ -45,6 +48,8 @@ prepare() {
done
rm Completion/Linux/Command/_{pkgtool,rpmbuild}
+ patch -p1 -i "${srcdir}/vcs_info.patch"
+
# Remove tests that don't work with the new athame behavior.
rm Test/[XY]*.ztst
diff --git a/vcs_info.patch b/vcs_info.patch
new file mode 100644
index 00000000000..042b948b23d
--- /dev/null
+++ b/vcs_info.patch
@@ -0,0 +1,35 @@
+From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
+From: dana <dana@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@dana.is>
++
++ * 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
++ infinite recursion
++
+ 2018-01-24 dana <dana@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
+