CVS commit: pkgsrc/sysutils/etckeeper

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jun  8 19:12:33 UTC 2024

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

Log Message:
etckeeper: fix commit on many platforms. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/sysutils/etckeeper/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/sysutils/etckeeper/patches/patch-commit.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.29 pkgsrc/sysutils/etckeeper/Makefile:1.30
--- pkgsrc/sysutils/etckeeper/Makefile:1.29     Wed Nov 29 02:54:19 2023
+++ pkgsrc/sysutils/etckeeper/Makefile  Sat Jun  8 19:12:33 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2023/11/29 02:54:19 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2024/06/08 19:12:33 schmonz Exp $
 #
 
 DISTNAME=              etckeeper_1.18.21
 PKGNAME=               ${DISTNAME:S/_/-/}
+PKGREVISION=           1
 CATEGORIES=            sysutils
 MASTER_SITES=          https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/
 
@@ -43,6 +44,7 @@ SUBST_FILES.config+=  etckeeper etckeeper
 SUBST_FILES.config+=   list-installed.d/50list-installed
 SUBST_FILES.config+=   pre-commit.d/20warn-problem-files
 SUBST_FILES.config+=   pre-commit.d/30store-metadata
+SUBST_FILES.config+=   commit.d/50vcs-commit
 SUBST_FILES.config+=   pre-install.d/10packagelist
 SUBST_FILES.config+=   post-install.d/50vcs-commit
 SUBST_FILES.config+=   bash_completion zsh_completion

Index: pkgsrc/sysutils/etckeeper/distinfo
diff -u pkgsrc/sysutils/etckeeper/distinfo:1.18 pkgsrc/sysutils/etckeeper/distinfo:1.19
--- pkgsrc/sysutils/etckeeper/distinfo:1.18     Wed Nov 29 02:54:19 2023
+++ pkgsrc/sysutils/etckeeper/distinfo  Sat Jun  8 19:12:33 2024
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.18 2023/11/29 02:54:19 schmonz Exp $
+$NetBSD: distinfo,v 1.19 2024/06/08 19:12:33 schmonz Exp $
 
 BLAKE2s (etckeeper_1.18.21.tar.gz) = 35553a0bcb1d6c8e48960ad236b1ab4f6c2b391715862639d9c1c808d823ae35
 SHA512 (etckeeper_1.18.21.tar.gz) = 216b5ec5ecad6a053191c4c86a62f24642ac90f1c16abad7eaf9727bf8c10153aae5f57195d58fbd93460d8d222f14201b67551b7fd7fa17130b8bced719c1fc
 Size (etckeeper_1.18.21.tar.gz) = 116971 bytes
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
-SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
+SHA1 (patch-commit.d_50vcs-commit) = b94a5bd02dac0e9075753f777eb1c98bd7bcf60e
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
 SHA1 (patch-etckeeper) = 816cff7f09a7add7fba72a06807dfe1d11d2b8f8
 SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52

Index: pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit
diff -u pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit:1.4 pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit:1.5
--- pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit:1.4   Tue Dec 24 06:00:24 2019
+++ pkgsrc/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit       Sat Jun  8 19:12:33 2024
@@ -1,11 +1,13 @@
-$NetBSD: patch-commit.d_50vcs-commit,v 1.4 2019/12/24 06:00:24 schmonz Exp $
+$NetBSD: patch-commit.d_50vcs-commit,v 1.5 2024/06/08 19:12:33 schmonz Exp $
 
 Test more carefully for a possibly missing binary. From Nathan Arthur in
 private mail.
 
---- commit.d/50vcs-commit.orig 2019-11-29 15:43:52.000000000 +0000
+Test more portably (given the perl:run dependency) for tty permissions.
+
+--- commit.d/50vcs-commit.orig 2023-11-28 18:09:38.000000000 +0000
 +++ commit.d/50vcs-commit
-@@ -23,9 +23,11 @@ fi
+@@ -31,9 +31,11 @@ fi
  
  hostname=`hostname 2>/dev/null || cat /etc/hostname`
  hostname="${hostname%%.*}"
@@ -20,3 +22,12 @@ private mail.
  fi
  
  ORIG_USER=$USER
+@@ -44,7 +46,7 @@ else
+       # try to check tty ownership, in case user su'd to root
+       TTY="$(tty 2>/dev/null || true)"
+       if [ -n "$TTY" ] && [ -c "$TTY" ]; then
+-              USER="$(find "$TTY" -printf "%u")"
++              USER="$(@PERL5@ -MFile::stat -E "my \$st = stat(qq{$TTY}); say( (getpwuid(\$st->uid))[0] )")"
+       fi
+ fi
+