Update to 1.15. From the changelog:

  * Recommend cron-daemon, rather than cron, as etckeeper only needs
    cron.daily functionality. Closes: #762721
  * Handle failure to commit in post-install, pre-install by showing a
    warning, rather than propigating the error to apt.
    This avoids breaking the apt run when eg, git is misconfigured and
    cannot commit.
    pre-install already did this when it was able to use debconf to display a
    message, but now debconf is not used, and it always behaves this way.
    Closes: #760011
  * Ignore check-mk-agent-logwatch's FHS violating
    /etc/check_mk/logwatch.state. Closes: #753903
  * Only allow [-a-z_] in etckeeper commands to avoid any possible directory
    traversal etc issues.
  * update-ignore, uninit: Fix parsing of ignore files containing '\'
  * Portability fixes. Thanks, Harald Dunkel.
  * Add support for pushing to multiple remote repositories.
    Thanks, Rouben.
  * Fix handling of git ignores like dir/*
    Thanks, Pim van den Berg
  * Fix too broad matching of .gitignored files.
    Closes: #732339
  * Remove lvm/backup from default ignores, because lvm
    documentation recommends backing that up, for use by
    vgcfgrestore.
  * Fix exporting of some git variables. Closes: #728583
  * Fix git update-ignore syntax. Closes: #721873
  * Avoid listing .gitignored files in .etckeeper file. Closes: #607665
    Thanks, Zdenek Crha
  * Fix hilarious typo hardcoding my name. Closes: #718425
  * Guard git config calls. Closes: #717957
  * Quote user and group names, in case one contains a space.
  * Added support for the pacman package manager.
    (Thanks, Tiago Stürmer Daitx)
  * Use user.name and user.email from the .gitconfig file belonging to the
    user who sued or sudoed to root, in preference to making up values for
    that user.
  * cron.daily: Fix typo in stale lockfile handling code.
    Closes: #717908
  * Deal with unix^wlinux portability nonsense.

8 files changed, 42 insertions, 46 deletions

diff --git a/sysutils/etckeeper/Makefile b/sysutils/etckeeper/Makefile
index 7e8cb2fa287..33e6d3df8b2 100644
--- a/sysutils/etckeeper/Makefile
+++ b/sysutils/etckeeper/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 06:38:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/05/18 21:19:08 schmonz Exp $
 #
 
-DISTNAME=	etckeeper_1.3
+DISTNAME=	etckeeper_1.15
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://joeyh.name/code/etckeeper/
+HOMEPAGE=	http://etckeeper.branchable.com/
 COMMENT=	Store /etc in git, mercurial, bzr or darcs
 LICENSE=	gnu-gpl-v2
 
@@ -64,8 +63,8 @@ do-install:
 				${DESTDIR}${PREFIX}/libexec/etckeeper.daily
 	${INSTALL_MAN} ${WRKSRC}/etckeeper.8 \
 					${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
-	${INSTALL_DATA} ${WRKSRC}/README \
-			${DESTDIR}${PREFIX}/share/doc/etckeeper/README
+	${INSTALL_DATA} ${WRKSRC}/README.md \
+			${DESTDIR}${PREFIX}/share/doc/etckeeper/README.md
 	${INSTALL_DATA} ${WRKSRC}/bash_completion \
 			${DESTDIR}${PREFIX}/share/bash-completion.d/etckeeper
 
diff --git a/sysutils/etckeeper/PLIST b/sysutils/etckeeper/PLIST
index 8643dac4b53..cafc696b87d 100644
--- a/sysutils/etckeeper/PLIST
+++ b/sysutils/etckeeper/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2013/05/27 08:36:00 sbd Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 bin/etckeeper
 libexec/etckeeper.daily
 share/bash-completion.d/etckeeper
-share/doc/etckeeper/README
+share/doc/etckeeper/README.md
 share/examples/etckeeper/commit.d/10vcs-test
 share/examples/etckeeper/commit.d/30bzr-add
 share/examples/etckeeper/commit.d/30darcs-add
diff --git a/sysutils/etckeeper/distinfo b/sysutils/etckeeper/distinfo
index 2d1efc6de6f..20085be73ad 100644
--- a/sysutils/etckeeper/distinfo
+++ b/sysutils/etckeeper/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/05/18 21:19:08 schmonz Exp $
 
-SHA1 (etckeeper_1.3.tar.gz) = 8716d5cfc9fc584bf0069932383ec1ca956f4788
-RMD160 (etckeeper_1.3.tar.gz) = 43404007c3d5b727ee2040477245591ab17372ca
-SHA512 (etckeeper_1.3.tar.gz) = 76bdf1e3daaa94d80e0583d9375339d92d8e9f4b592ba8da9043e9c21f1371e08e13e65cc76eb40d0e1abcbcfeb64f230ef9e1c828654055a19df5103d01cc22
-Size (etckeeper_1.3.tar.gz) = 47387 bytes
+SHA1 (etckeeper_1.15.tar.gz) = d0a90b25d6a9e3a78fbfbde404c71c0b847f9369
+RMD160 (etckeeper_1.15.tar.gz) = d732c9a5cf2e1d643bf3aed4edace6665bada586
+SHA512 (etckeeper_1.15.tar.gz) = f2e5f584870fbec3d800bf9a53617770f2fef50d0860bab016ec6614f232948661a611147bca83ad3d304220607a878c1708a988ca580482a5db5e685cf94bd9
+Size (etckeeper_1.15.tar.gz) = 48882 bytes
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
-SHA1 (patch-debian_cron.daily) = 5473807c2bcab9931e6324436f1d1ff3363ee3d2
+SHA1 (patch-debian_cron.daily) = b89d63ec32cfa3ab72043f56f4f9aef2ca60fc4f
 SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
-SHA1 (patch-etckeeper.8) = bb6e59169edac6ae16cebd25c05aa3c2305b3990
-SHA1 (patch-etckeeper.conf) = c246bf082a1b7137c3f50fa43e432ea9c1587464
+SHA1 (patch-etckeeper.8) = 0d8e5ac7e6aab35d507fe5b570934a207f4171ad
+SHA1 (patch-etckeeper.conf) = 46c179e875962e2f89e1c57ced3fa2235d655177
 SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6
 SHA1 (patch-list-installed.d_50list-installed) = b0c9a500fa80c97686f229b8f936de6f1c8de7e0
-SHA1 (patch-post-install.d_50vcs-commit) = c79cd3c5f195cbc4808074557818f5f7d9a4e457
+SHA1 (patch-post-install.d_50vcs-commit) = b19d570b604f7cd2d7cea05965a10f6508b402bf
 SHA1 (patch-pre-install.d_10packagelist) = c2383ef03e2f360c581acb2c4c3ca09bad8cac10
-SHA1 (patch-pre-install.d_50uncommitted-changes) = 908a2cf5a107346a57f3fde1f1076c2ec7f92b9f
+SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
 SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
diff --git a/sysutils/etckeeper/patches/patch-debian_cron.daily b/sysutils/etckeeper/patches/patch-debian_cron.daily
index 406b2fc3029..8023281a657 100644
--- a/sysutils/etckeeper/patches/patch-debian_cron.daily
+++ b/sysutils/etckeeper/patches/patch-debian_cron.daily
@@ -1,8 +1,8 @@
-$NetBSD: patch-debian_cron.daily,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-debian_cron.daily,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- debian/cron.daily.orig	2011-12-05 15:41:29.000000000 +0000
+--- debian/cron.daily.orig	2014-07-02 19:17:18.000000000 +0000
 +++ debian/cron.daily
 @@ -1,10 +1,10 @@
  #!/bin/sh
@@ -15,6 +15,6 @@ Add SUBST_VARS tokens.
  		# avoid autocommit if an install run is in progress
 -		lockfile=/var/cache/etckeeper/packagelist.pre-install
 +		lockfile=@VARBASE@/cache/etckeeper/packagelist.pre-install
- 		if [ -e "$pe" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
+ 		if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
  			rm -f "$lockfile" # stale
  		fi
diff --git a/sysutils/etckeeper/patches/patch-etckeeper.8 b/sysutils/etckeeper/patches/patch-etckeeper.8
index b21d9318bf1..092f20dd569 100644
--- a/sysutils/etckeeper/patches/patch-etckeeper.8
+++ b/sysutils/etckeeper/patches/patch-etckeeper.8
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper.8,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-etckeeper.8,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- etckeeper.8.orig	2012-06-02 22:14:44.000000000 +0000
+--- etckeeper.8.orig	2014-09-04 19:32:34.000000000 +0000
 +++ etckeeper.8
 @@ -5,21 +5,21 @@ etckeeper \- store /etc in git, mercuria
  .SH SYNOPSIS
@@ -40,12 +40,13 @@ Add SUBST_VARS tokens.
 +@PKG_SYSCONFDIR@/etckeeper.conf is the configuration file.
  
 -/etc/etckeeper also contains directories containing the programs that are
-+PKG_SYSCONFDIR also contains directories containing the programs that are
++@PKG_SYSCONFDIR@ also contains directories containing the programs that are
  run for each of the above commands.
  .SH ENVIRONMENT VARIABLES
- ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etckeeper.
+-ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etckeeper.
++ETCKEEPER_CONF_DIR path to configuration directory instead of default @PKG_SYSCONFDIR@.
  .SH SEE ALSO
--/usr/share/doc/etckeeper/README.gz
-+@PREFIX@/share/doc/etckeeper/README
+-/usr/share/doc/etckeeper/README.md.gz
++@PREFIX@/share/doc/etckeeper/README.md
  .SH AUTHOR 
  Joey Hess <joey@kitenet.net>
diff --git a/sysutils/etckeeper/patches/patch-etckeeper.conf b/sysutils/etckeeper/patches/patch-etckeeper.conf
index e5e50a7d07b..c57e5ca7276 100644
--- a/sysutils/etckeeper/patches/patch-etckeeper.conf
+++ b/sysutils/etckeeper/patches/patch-etckeeper.conf
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper.conf,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-etckeeper.conf,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 
 Make pkg_install the package manager.
 
---- etckeeper.conf.orig	2012-11-19 16:07:40.000000000 +0000
+--- etckeeper.conf.orig	2014-07-02 19:17:18.000000000 +0000
 +++ etckeeper.conf
 @@ -31,11 +31,11 @@ DARCS_COMMIT_OPTIONS="-a"
  
@@ -12,9 +12,9 @@ Make pkg_install the package manager.
 +HIGHLEVEL_PACKAGE_MANAGER=pkg_add
  
  # The low-level package manager that's being used.
- # (dpkg, rpm, pacman-g2, etc)
+ # (dpkg, rpm, pacman, pacman-g2, etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
 +LOWLEVEL_PACKAGE_MANAGER=pkg_install
  
  # To push each commit to a remote, put the name of the remote here.
- # (eg, "origin" for git).
+ # (eg, "origin" for git). Space-separated lists of multiple remotes
diff --git a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
index 7866a63dd5a..045f90eecb4 100644
--- a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
+++ b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
@@ -1,13 +1,13 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- post-install.d/50vcs-commit.orig	2011-02-22 20:19:36.000000000 +0000
+--- post-install.d/50vcs-commit.orig	2014-09-04 19:44:52.000000000 +0000
 +++ post-install.d/50vcs-commit
 @@ -1,10 +1,10 @@
  #!/bin/sh
  set -e
- 		
+ 
 -pl="/var/cache/etckeeper/packagelist"
 +pl="@VARBASE@/cache/etckeeper/packagelist"
  
@@ -15,5 +15,5 @@ Add SUBST_VARS token.
 -	message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
 +	message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run"
  
+ 	set +e
  	if [ -e $pl.pre-install ]; then
- 		(
diff --git a/sysutils/etckeeper/patches/patch-pre-install.d_50uncommitted-changes b/sysutils/etckeeper/patches/patch-pre-install.d_50uncommitted-changes
index 5d13696c923..c9754956b35 100644
--- a/sysutils/etckeeper/patches/patch-pre-install.d_50uncommitted-changes
+++ b/sysutils/etckeeper/patches/patch-pre-install.d_50uncommitted-changes
@@ -1,26 +1,22 @@
-$NetBSD: patch-pre-install.d_50uncommitted-changes,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-pre-install.d_50uncommitted-changes,v 1.2 2017/05/18 21:19:08 schmonz Exp $
 
 Change '/etc' to ${ETCKEEPER_DIR}.
 
---- pre-install.d/50uncommitted-changes.orig	2011-02-22 20:19:36.000000000 +0000
+--- pre-install.d/50uncommitted-changes.orig	2014-09-04 19:44:32.000000000 +0000
 +++ pre-install.d/50uncommitted-changes
-@@ -13,16 +13,16 @@ fi
+@@ -4,12 +4,12 @@ set -e
  if etckeeper unclean; then
  	if [ "$AVOID_COMMIT_BEFORE_INSTALL" = 1 ]; then
  		echo "" >&2
 -		echo "** etckeeper detected uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 
-+		echo "** etckeeper detected uncommitted changes in ${ETCKEEPER_DIR} prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2
++		echo "** etckeeper detected uncommitted changes in ${ETCKEEPER_DIR} prior to $HIGHLEVEL_PACKAGE_MANAGER run" >&2 
  		echo "** Aborting $HIGHLEVEL_PACKAGE_MANAGER run. Manually commit and restart." >&2
  		echo "" >&2
  		exit 1
  	fi
 -	if ! etckeeper commit "saving uncommitted changes in /etc prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then
+-		echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2
 +	if ! etckeeper commit "saving uncommitted changes in ${ETCKEEPER_DIR} prior to $HIGHLEVEL_PACKAGE_MANAGER run"; then
- 		if [ -e /usr/share/debconf/confmodule ]; then
- 			$0 fail-debconf
- 		else
--			echo "error: etckeeper failed to commit changes in /etc using $VCS"
-+			echo "error: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS"
- 			exit 1
- 		fi
++		echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2
  	fi
+ fi