[arch-commits] Commit in etckeeper/trunk (2 files)

[Christian Hesse]

    Date: Friday, November 29, 2019 @ 06:33:30
  Author: eworm
Revision: 534311

upgpkg: etckeeper 1.18.11-2

fix syntax error

Added:
  etckeeper/trunk/0001-remove-superfluous-parenthesis.patch
Modified:
  etckeeper/trunk/PKGBUILD

-------------------------------------------+
 0001-remove-superfluous-parenthesis.patch |   23 +++++++++++++++++++++++
 PKGBUILD                                  |   16 ++++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)

Added: 0001-remove-superfluous-parenthesis.patch
===================================================================
--- 0001-remove-superfluous-parenthesis.patch	                        (rev 0)
+++ 0001-remove-superfluous-parenthesis.patch	2019-11-29 06:33:30 UTC (rev 534311)
@@ -0,0 +1,23 @@
+From d263b7ffcbd73667600305a95f32ed57900f8961 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Fri, 29 Nov 2019 07:28:26 +0100
+Subject: [PATCH 1/1] remove superfluous parenthesis
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ commit.d/50vcs-commit | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
+index 32395c1..4eaeb26 100755
+--- a/commit.d/50vcs-commit
++++ b/commit.d/50vcs-commit
+@@ -21,7 +21,7 @@ else
+ 	logfile=""
+ fi
+ 
+-hostname=`hostname 2>/dev/null || cat /etc/hostname)`
++hostname=`hostname 2>/dev/null || cat /etc/hostname`
+ hostname="${hostname%%.*}"
+ dnsdomainname=`dnsdomainname 2>/dev/null || true`
+ if [ -n "$dnsdomainname" ]; then

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-29 06:25:30 UTC (rev 534310)
+++ PKGBUILD	2019-11-29 06:33:30 UTC (rev 534311)
@@ -6,7 +6,7 @@
 pkgname=etckeeper
 _tag=11732dcdbfa65dce7dd7df2decd4be40486aeb2e # git rev-parse ${pkgver}
 pkgver=1.18.11
-pkgrel=1
+pkgrel=2
 pkgdesc='Collection of tools to let /etc be stored in a git, hg or bzr repository'
 arch=(any)
 url='https://etckeeper.branchable.com/'
@@ -17,10 +17,18 @@
             'bzr: use bazaar for version control'
             'which: etckeeper vcs <subcommand> support')
 backup=('etc/etckeeper/etckeeper.conf')
-source=("git+https://git.kitenet.net/git/etckeeper.git#tag=${_tag}?signed")
-sha256sums=(SKIP)
-validpgpkeys=(E85A5F63B31D24C1EBF0D81CC910D9222512E3C7) # Joey Hess <joeyh at joeyh.name>
+source=("git+https://git.kitenet.net/git/etckeeper.git#tag=${_tag}?signed"
+        '0001-remove-superfluous-parenthesis.patch')
+sha256sums=('SKIP'
+            '72ba696b2bb100075300a5bc34af985f06bf02d76ce30e388f28a3769434d5cb')
+validpgpkeys=('E85A5F63B31D24C1EBF0D81CC910D9222512E3C7') # Joey Hess <joeyh at joeyh.name>
 
+prepare() {
+	cd ${pkgname}
+
+	patch -Np1 < ../0001-remove-superfluous-parenthesis.patch
+}
+
 build() {
 	cd ${pkgname}