Sun Nov 17 11:57:16 2019 UTC ()
(sysutils/etckeeper) Updated from 1.18.8 to 1.18.10

(from debian/changelog)
etckeeper (1.18.10) unstable; urgency=medium

  * Avoid post-install failing when ps is from busybox or another
    version not supporting procps-specific options.
  * Use ps --no-headers rather than problimatic -h option.

 -- Joey Hess <id@joeyh.name>  Sun, 23 Dec 2018 13:05:44 -0400

etckeeper (1.18.9) unstable; urgency=medium

  * When run during a package installation, include in the commit
    message the command line that caused etckeeper to run.
    Thanks, Laszlo Gombos

 -- Joey Hess <id@joeyh.name>  Wed, 12 Dec 2018 01:01:05 -0400


(mef)
diff -r1.15 -r1.16 pkgsrc/sysutils/etckeeper/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
cvs diff -r1.15 -r1.16 pkgsrc/sysutils/etckeeper/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/Makefile 2019/08/11 13:23:07 1.15
+++ pkgsrc/sysutils/etckeeper/Makefile 2019/11/17 11:57:16 1.16
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:07 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2019/11/17 11:57:16 mef Exp $
2# 2#
3 3
4DISTNAME= etckeeper_1.18.8.orig 4DISTNAME= etckeeper_1.18.10.orig
5PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//} 5PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//}
6PKGREVISION= 1 
7CATEGORIES= sysutils 6CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://etckeeper.branchable.com/ 10HOMEPAGE= http://etckeeper.branchable.com/
12COMMENT= Store /etc in git, mercurial, bzr or darcs 11COMMENT= Store /etc in git, mercurial, bzr or darcs
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
16USE_LANGUAGES= # none 15USE_LANGUAGES= # none
17USE_TOOLS+= gawk perl:run 16USE_TOOLS+= gawk perl:run
18 17
19NO_CONFIGURE= yes 18NO_CONFIGURE= yes
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/distinfo 2018/10/07 10:52:40 1.7
+++ pkgsrc/sysutils/etckeeper/distinfo 2019/11/17 11:57:16 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.7 2018/10/07 10:52:40 schmonz Exp $ 1$NetBSD: distinfo,v 1.8 2019/11/17 11:57:16 mef Exp $
2 2
3SHA1 (etckeeper_1.18.8.orig.tar.gz) = ab0c534014887e3198b98c9bdebf72149e4ee9e6 3SHA1 (etckeeper_1.18.10.orig.tar.gz) = 8af0b7c6751939a3f18e33f54328f8495a8f0340
4RMD160 (etckeeper_1.18.8.orig.tar.gz) = 21c26ca01ec6b2fb59a7231c53b822ceda5072fb 4RMD160 (etckeeper_1.18.10.orig.tar.gz) = 4e795812cfb25d59afecf640b67b3127ce2cebd4
5SHA512 (etckeeper_1.18.8.orig.tar.gz) = 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c 5SHA512 (etckeeper_1.18.10.orig.tar.gz) = 57eb91823c37f364e7ade6b25d2ab91fc99d1192a606fd09370c2876a0440120a625f30167fc52fb16b53ef9f7a58a1329bfe9567cbc2c91da06a345ebbe8e05
6Size (etckeeper_1.18.8.orig.tar.gz) = 84964 bytes 6Size (etckeeper_1.18.10.orig.tar.gz) = 86823 bytes
7SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 7SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
8SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a 8SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a
9SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 9SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
10SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c 10SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
11SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 11SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
12SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0 12SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0
13SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6 13SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6
14SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2 14SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2
15SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b 15SHA1 (patch-post-install.d_50vcs-commit) = a1b5cf25a9b3a421169dd8c5283f61b6dedad803
16SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a 16SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
17SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d 17SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
18SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee 18SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit (expand / switch to unified diff)

--- pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit 2017/05/20 01:05:05 1.3
+++ pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit 2019/11/17 11:57:16 1.4
@@ -1,28 +1,34 @@ @@ -1,28 +1,34 @@
1$NetBSD: patch-post-install.d_50vcs-commit,v 1.3 2017/05/20 01:05:05 schmonz Exp $ 1$NetBSD: patch-post-install.d_50vcs-commit,v 1.4 2019/11/17 11:57:16 mef Exp $
2 2
3Add SUBST_VARS token. 3Add SUBST_VARS token.
4 4
5--- post-install.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000 5--- post-install.d/50vcs-commit.orig 2018-12-24 02:06:45.000000000 +0900
6+++ post-install.d/50vcs-commit 6+++ post-install.d/50vcs-commit 2019-11-17 20:52:49.545914431 +0900
7@@ -1,10 +1,10 @@ 7@@ -1,7 +1,7 @@
8 #!/bin/sh 8 #!/bin/sh
9 set -e 9 set -e
10  10
11-pl="/var/cache/etckeeper/packagelist" 11-pl="/var/cache/etckeeper/packagelist"
12+pl="@VARBASE@/cache/etckeeper/packagelist" 12+pl="@VARBASE@/cache/etckeeper/packagelist"
13  13
14 if etckeeper unclean; then 14 # Parent process is etckeeper
15- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" 15 # (Only procps ps is currently supported, others will fail,
16+ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" 16@@ -16,7 +16,7 @@ fi
17  17
18 set +e 18 if etckeeper unclean; then
19 if [ -e $pl.pre-install ] && [ "$(cat $pl.fmt 2>/dev/null || true)" = "$(etckeeper list-installed fmt)" ]; then 19 if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
20@@ -21,7 +21,7 @@ if etckeeper unclean; then 20- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run"
 21+ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run"
 22 else
 23 message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
 24 fi
 25@@ -36,7 +36,8 @@ if etckeeper unclean; then
21 set -e 26 set -e
22  27
23 if [ "$status" != 0 ]; then 28 if [ "$status" != 0 ]; then
24- echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2 29- echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2
25+ echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2 30+ echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2
 31+
26 fi 32 fi
27 fi 33 fi
28  34