From fac8ea5703562dc6fa71271d7a36af58e4a0b863 Mon Sep 17 00:00:00 2001 From: mef Date: Sun, 17 Nov 2019 11:57:16 +0000 Subject: [PATCH] (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 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 Wed, 12 Dec 2018 01:01:05 -0400 --- sysutils/etckeeper/Makefile | 5 ++-- sysutils/etckeeper/distinfo | 12 ++++---- .../patches/patch-post-install.d_50vcs-commit | 28 +++++++++++-------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/sysutils/etckeeper/Makefile b/sysutils/etckeeper/Makefile index 203c57e701cf..5b6c5cb11489 100644 --- a/sysutils/etckeeper/Makefile +++ b/sysutils/etckeeper/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2019/08/11 13:23:07 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2019/11/17 11:57:16 mef Exp $ # -DISTNAME= etckeeper_1.18.8.orig +DISTNAME= etckeeper_1.18.10.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//} -PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} diff --git a/sysutils/etckeeper/distinfo b/sysutils/etckeeper/distinfo index e993df85b685..0961226df9de 100644 --- a/sysutils/etckeeper/distinfo +++ b/sysutils/etckeeper/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2018/10/07 10:52:40 schmonz Exp $ +$NetBSD: distinfo,v 1.8 2019/11/17 11:57:16 mef Exp $ -SHA1 (etckeeper_1.18.8.orig.tar.gz) = ab0c534014887e3198b98c9bdebf72149e4ee9e6 -RMD160 (etckeeper_1.18.8.orig.tar.gz) = 21c26ca01ec6b2fb59a7231c53b822ceda5072fb -SHA512 (etckeeper_1.18.8.orig.tar.gz) = 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c -Size (etckeeper_1.18.8.orig.tar.gz) = 84964 bytes +SHA1 (etckeeper_1.18.10.orig.tar.gz) = 8af0b7c6751939a3f18e33f54328f8495a8f0340 +RMD160 (etckeeper_1.18.10.orig.tar.gz) = 4e795812cfb25d59afecf640b67b3127ce2cebd4 +SHA512 (etckeeper_1.18.10.orig.tar.gz) = 57eb91823c37f364e7ade6b25d2ab91fc99d1192a606fd09370c2876a0440120a625f30167fc52fb16b53ef9f7a58a1329bfe9567cbc2c91da06a345ebbe8e05 +Size (etckeeper_1.18.10.orig.tar.gz) = 86823 bytes SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 @@ -12,7 +12,7 @@ SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0 SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6 SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2 -SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b +SHA1 (patch-post-install.d_50vcs-commit) = a1b5cf25a9b3a421169dd8c5283f61b6dedad803 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee diff --git a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit index 58022bba5b9f..07f87c6f94dd 100644 --- a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit +++ b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit @@ -1,28 +1,34 @@ -$NetBSD: patch-post-install.d_50vcs-commit,v 1.3 2017/05/20 01:05:05 schmonz Exp $ +$NetBSD: patch-post-install.d_50vcs-commit,v 1.4 2019/11/17 11:57:16 mef Exp $ Add SUBST_VARS token. ---- post-install.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000 -+++ post-install.d/50vcs-commit -@@ -1,10 +1,10 @@ +--- post-install.d/50vcs-commit.orig 2018-12-24 02:06:45.000000000 +0900 ++++ post-install.d/50vcs-commit 2019-11-17 20:52:49.545914431 +0900 +@@ -1,7 +1,7 @@ #!/bin/sh set -e -pl="/var/cache/etckeeper/packagelist" +pl="@VARBASE@/cache/etckeeper/packagelist" - if etckeeper unclean; then -- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" -+ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" + # Parent process is etckeeper + # (Only procps ps is currently supported, others will fail, +@@ -16,7 +16,7 @@ fi - set +e - if [ -e $pl.pre-install ] && [ "$(cat $pl.fmt 2>/dev/null || true)" = "$(etckeeper list-installed fmt)" ]; then -@@ -21,7 +21,7 @@ if etckeeper unclean; then + if etckeeper unclean; then + if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then +- message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" ++ message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" + else + message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\"" + fi +@@ -36,7 +36,8 @@ if etckeeper unclean; then set -e if [ "$status" != 0 ]; then - echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2 + echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2 ++ fi fi - +