CVS commit: pkgsrc/sysutils/etckeeper

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Jan 14 19:57:06 UTC 2023

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

Log Message:
Update to 1.18.20. From the changelog:

* Added support for Gentoo (emerge, qlist, and cave)
* Skip running pre-commit hook inside linked worktrees, to avoid it
  updating .etckeeper with the permissions of files not in /etc.
* commit: Run bzr with --quiet, since it outputs non-errors to stderr.
  Closes: #1018874


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/etckeeper/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf

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.27 pkgsrc/sysutils/etckeeper/Makefile:1.28
--- pkgsrc/sysutils/etckeeper/Makefile:1.27     Thu Dec 22 13:40:09 2022
+++ pkgsrc/sysutils/etckeeper/Makefile  Sat Jan 14 19:57:05 2023
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.27 2022/12/22 13:40:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.28 2023/01/14 19:57:05 schmonz Exp $
 #
 
-DISTNAME=              etckeeper_1.18.18.orig
-PKGNAME=               ${DISTNAME:S/_/-/:S/.orig$//}
+DISTNAME=              etckeeper_1.18.20
+PKGNAME=               ${DISTNAME:S/_/-/}
 CATEGORIES=            sysutils
-MASTER_SITES=          ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
+MASTER_SITES=          https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              https://etckeeper.branchable.com/
 COMMENT=               Store /etc in git, mercurial, bzr or darcs
 LICENSE=               gnu-gpl-v2
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
 USE_LANGUAGES=         # none
 USE_TOOLS+=            gawk perl:run
 

Index: pkgsrc/sysutils/etckeeper/distinfo
diff -u pkgsrc/sysutils/etckeeper/distinfo:1.16 pkgsrc/sysutils/etckeeper/distinfo:1.17
--- pkgsrc/sysutils/etckeeper/distinfo:1.16     Thu Dec 22 13:40:09 2022
+++ pkgsrc/sysutils/etckeeper/distinfo  Sat Jan 14 19:57:05 2023
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.16 2022/12/22 13:40:09 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2023/01/14 19:57:05 schmonz Exp $
 
-BLAKE2s (etckeeper_1.18.18.orig.tar.gz) = b157ebb36cfc0474002243b9eb7fbf40fe2ac9b0080d3a2182dac657d327acb1
-SHA512 (etckeeper_1.18.18.orig.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
-Size (etckeeper_1.18.18.orig.tar.gz) = 101845 bytes
+BLAKE2s (etckeeper_1.18.20.tar.gz) = 273c7d825adb54808904999e992b302560cbd673f2e89598d5f95d3e2000a517
+SHA512 (etckeeper_1.18.20.tar.gz) = 076f5d94d3a3dfd94f7f48775179b56561d195afd7f6bd5e95468e9cc80ce975598ce87c3536d9ae64e2b2aca8c178e0af623bff412a08d0d7990e1fa99ee70d
+Size (etckeeper_1.18.20.tar.gz) = 110774 bytes
 SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
 SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
 SHA1 (patch-etckeeper) = 816cff7f09a7add7fba72a06807dfe1d11d2b8f8
 SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
-SHA1 (patch-etckeeper.conf) = f726f2f1bb51184268ee7211f6dd055584877573
+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

Index: pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf
diff -u pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.5 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.6
--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.5  Thu Dec 22 13:40:10 2022
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf      Sat Jan 14 19:57:06 2023
@@ -1,18 +1,18 @@
-$NetBSD: patch-etckeeper.conf,v 1.5 2022/12/22 13:40:10 schmonz Exp $
+$NetBSD: patch-etckeeper.conf,v 1.6 2023/01/14 19:57:06 schmonz Exp $
 
 Make pkg_install the package manager.
 
---- etckeeper.conf.orig        2022-09-08 16:13:15.000000000 +0000
+--- etckeeper.conf.orig        2023-01-04 17:23:38.000000000 +0000
 +++ etckeeper.conf
 @@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a"
  
  # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc)
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps, emerge, cave, etc)
 -HIGHLEVEL_PACKAGE_MANAGER=apt
 +HIGHLEVEL_PACKAGE_MANAGER=pkg_add
  
  # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc)
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps, cave, qlist, etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
 +LOWLEVEL_PACKAGE_MANAGER=pkg_install