CVS commit: pkgsrc/sysutils/etckeeper

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Aug 18 02:47:16 UTC 2025

Modified Files:
        pkgsrc/sysutils/etckeeper: Makefile distinfo
        pkgsrc/sysutils/etckeeper/patches: patch-post-install.d_50vcs-commit

Log Message:
etckeeper: update to 1.18.23. Changes:

* Fix determining command line for commit log when using some package
  managers like pacman and zypper.
* Fix bug in xbps support when generating commit message.
  Thanks, Alexander Karelas
* Include cron.daily back in etckeeper.
* Makefile: Install cron.daily on debian based systems.
* cron.daily: Avoid doing anything when etckeeper.timer is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/sysutils/etckeeper/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/etckeeper/Makefile
diff -u pkgsrc/sysutils/etckeeper/Makefile:1.31 pkgsrc/sysutils/etckeeper/Makefile:1.32
--- pkgsrc/sysutils/etckeeper/Makefile:1.31     Tue Dec 10 14:06:00 2024
+++ pkgsrc/sysutils/etckeeper/Makefile  Mon Aug 18 02:47:16 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2024/12/10 14:06:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2025/08/18 02:47:16 schmonz Exp $
 #
 
-DISTNAME=              etckeeper_1.18.22
+DISTNAME=              etckeeper_1.18.23
 PKGNAME=               ${DISTNAME:S/_/-/}
 CATEGORIES=            sysutils
 MASTER_SITES=          https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/

Index: pkgsrc/sysutils/etckeeper/distinfo
diff -u pkgsrc/sysutils/etckeeper/distinfo:1.20 pkgsrc/sysutils/etckeeper/distinfo:1.21
--- pkgsrc/sysutils/etckeeper/distinfo:1.20     Tue Dec 10 14:06:00 2024
+++ pkgsrc/sysutils/etckeeper/distinfo  Mon Aug 18 02:47:16 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2024/12/10 14:06:00 schmonz Exp $
+$NetBSD: distinfo,v 1.21 2025/08/18 02:47:16 schmonz Exp $
 
-BLAKE2s (etckeeper_1.18.22.tar.gz) = 535ade77d51df7aa4c8f4d8c0bd6c24f2b8d49b3b43d9b77b0bf5c61657f449b
-SHA512 (etckeeper_1.18.22.tar.gz) = c4101ee8904816242a6367df43eec7c5ec0eb332c60f1ba00e624022792810ec9a8e778c6a279f6f952c6d79df22c87bb9384da2a5b8e0014096d68e71bf08e7
-Size (etckeeper_1.18.22.tar.gz) = 120016 bytes
+BLAKE2s (etckeeper_1.18.23.tar.gz) = 331aadf8309e8e753ba97e48a1b3dc21da3e016c676b210b3ee8af895590f3d4
+SHA512 (etckeeper_1.18.23.tar.gz) = 9358f382b844b13ee7ed2cfd77d29a12fa43783ac338742fc72039a42f50a2b352953536ba2c225e18f13065f48f75a9f514c7746ee7effce6fe82ad476ed405
+Size (etckeeper_1.18.23.tar.gz) = 126007 bytes
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
 SHA1 (patch-commit.d_50vcs-commit) = b94a5bd02dac0e9075753f777eb1c98bd7bcf60e
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
@@ -11,7 +11,7 @@ SHA1 (patch-etckeeper.8) = 7e72a7889e047
 SHA1 (patch-etckeeper.conf) = dc29166cb32556f52646e5ded71991155f0b4673
 SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69
 SHA1 (patch-list-installed.d_50list-installed) = c11c40e6853beab31790b84053f75b1e32bbe0c7
-SHA1 (patch-post-install.d_50vcs-commit) = 12e0a94e6ca86578146b8173f03886069aff90c5
+SHA1 (patch-post-install.d_50vcs-commit) = abde4ef48999598cda6054c874f9a5d2a23a6fbc
 SHA1 (patch-pre-commit.d_20warn-problem-files) = e4173da68d7dd7b5d89f03af1285665b23da65d1
 SHA1 (patch-pre-commit.d_30store-metadata) = 2de44634a2ea5c4cac7e895e98d9396c1bc62df1
 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a

Index: pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
diff -u pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.7 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.8
--- pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.7     Thu Dec 22 13:40:10 2022
+++ pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit Mon Aug 18 02:47:16 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.7 2022/12/22 13:40:10 schmonz Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.8 2025/08/18 02:47:16 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- post-install.d/50vcs-commit.orig   2022-09-08 16:13:15.000000000 +0000
+--- post-install.d/50vcs-commit.orig   2025-08-16 16:22:02.000000000 +0000
 +++ post-install.d/50vcs-commit
 @@ -1,7 +1,7 @@
  #!/bin/sh
@@ -11,9 +11,9 @@ Add SUBST_VARS token.
 -pl="/var/cache/etckeeper/packagelist"
 +pl="@VARBASE@/cache/etckeeper/packagelist"
  
- # Parent process is etckeeper
- # (Only procps ps is currently supported, others will fail,
-@@ -56,7 +56,7 @@ get_changed_packages () {
+ # Find the pid whose parent is the command line that the user ran.
+ # Depending on how the highlevel package manager starts etckeeper,
+@@ -70,7 +70,7 @@ get_changed_packages () {
  
  if etckeeper unclean; then
        if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
@@ -22,7 +22,7 @@ Add SUBST_VARS token.
        else
                message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
        fi
-@@ -69,7 +69,7 @@ if etckeeper unclean; then
+@@ -83,7 +83,7 @@ if etckeeper unclean; then
                        get_changed_packages | sort | uniq > $pl.found-pkgs
                        if [ -s $pl.found-pkgs ]; then
                                sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs
@@ -31,7 +31,7 @@ Add SUBST_VARS token.
                                if [ -s $pl.found-packages ]; then
                                        echo "Packages with configuration changes:"
                                        cat $pl.found-packages || true
-@@ -77,7 +77,7 @@ if etckeeper unclean; then
+@@ -91,7 +91,7 @@ if etckeeper unclean; then
                                fi
                        fi
                        echo "Package changes:"
@@ -40,7 +40,7 @@ Add SUBST_VARS token.
                ) | etckeeper commit --stdin
        else
                etckeeper commit "$(printf "$message")"
-@@ -86,7 +86,8 @@ if etckeeper unclean; then
+@@ -100,7 +100,8 @@ if etckeeper unclean; then
        set -e
  
        if [ "$status" != 0 ]; then