CVS commit: pkgsrc/sysutils/etckeeper

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct  7 10:52:40 UTC 2018

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

Log Message:
Update to 1.18.8. From the changelog:

* Work around git commit's lack of robustness, by providing reasonable
  default values for GIT_COMMITTER_EMAIL etc. This was already done as
  part of the su/sudo handling, and is now always done.
* Don't hardcode the master branch when pushing to PUSH_REMOTE.
  Instead, let git push whatever branches it is configured to push to
  that remote.
* Added some unit tests.
  Thanks, Henrik Riomar.
* etckeeper will work on systems that do not have perl installed.
  (perl is still used when available as it's faster)
  Thanks, William Johansson and radhus.
* Prevent LC_ALL overriding the LC_COLLATE used to sort metadata.
* Only show errors (no progress indicators) when pushing Git/Mercurial repos
  to avoid unncessary cron mails.
  Thanks, Nils Steinger.
* Fix regex in 20-warn-problem-files.
* Added support for apk (alpine linux)
  Thanks, Henrik Riomar.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/etckeeper/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.13 pkgsrc/sysutils/etckeeper/Makefile:1.14
--- pkgsrc/sysutils/etckeeper/Makefile:1.13     Thu Sep 27 23:07:57 2018
+++ pkgsrc/sysutils/etckeeper/Makefile  Sun Oct  7 10:52:40 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2018/09/27 23:07:57 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2018/10/07 10:52:40 schmonz Exp $
 #
 
-DISTNAME=      etckeeper_1.18.5.orig
-PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$/.1/}
-PKGREVISION=   5
+DISTNAME=      etckeeper_1.18.8.orig
+PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$//}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -22,11 +21,6 @@ AUTO_MKDIRS= yes
 
 BUILD_DEFS+=   VARBASE
 
-ETCKEEPER_PATCH=                       etckeeper_1.18.5-1.diff.gz
-PATCHFILES+=                           ${ETCKEEPER_PATCH}
-SITES.${ETCKEEPER_PATCH}=              ${MASTER_SITES}
-PATCH_DIST_STRIP.${ETCKEEPER_PATCH}=   -p1
-
 .include "cf-files.mk"
 
 PKG_SYSCONFSUBDIR=     etckeeper

Index: pkgsrc/sysutils/etckeeper/distinfo
diff -u pkgsrc/sysutils/etckeeper/distinfo:1.6 pkgsrc/sysutils/etckeeper/distinfo:1.7
--- pkgsrc/sysutils/etckeeper/distinfo:1.6      Thu Jun 29 17:19:13 2017
+++ pkgsrc/sysutils/etckeeper/distinfo  Sun Oct  7 10:52:40 2018
@@ -1,19 +1,15 @@
-$NetBSD: distinfo,v 1.6 2017/06/29 17:19:13 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2018/10/07 10:52:40 schmonz Exp $
 
-SHA1 (etckeeper_1.18.5-1.diff.gz) = c43743cdfc6aa6543d95b7f19337d545d9cbe040
-RMD160 (etckeeper_1.18.5-1.diff.gz) = d7708dd7b2879e53ddd98896c7567d00da685286
-SHA512 (etckeeper_1.18.5-1.diff.gz) = 537bbeabc09a12cce9e96d21f9fc758b1982161803bc1d774386e75a1f2ab5dfe6dd925c5cbbf555017209961c2f60c5bb755bd780ab0eb52ce312ec47bfb010
-Size (etckeeper_1.18.5-1.diff.gz) = 1086 bytes
-SHA1 (etckeeper_1.18.5.orig.tar.gz) = cccf48b130dafdb6532ebf7d1a145a58918fed18
-RMD160 (etckeeper_1.18.5.orig.tar.gz) = 436b472276c3175cc7157d28d18345d4f4b17bd4
-SHA512 (etckeeper_1.18.5.orig.tar.gz) = bfdd5ffb6ae72ebc5ea8254404280ea1c89de44cfb4c888bc40d1a8504887d198b967f46f1d3952a5a22b0f5969a8f3291e4fc1c37bbd488e4b25682d41364cd
-Size (etckeeper_1.18.5.orig.tar.gz) = 67166 bytes
+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 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
 SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a
 SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
 SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
 SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
-SHA1 (patch-etckeeper.conf) = 3da6944c550aaa85ea9458aea583b7a7d051a0e0
+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

Index: pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf
diff -u pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.3 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.4
--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.3  Sat May 20 01:05:05 2017
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf      Sun Oct  7 10:52:40 2018
@@ -1,18 +1,18 @@
-$NetBSD: patch-etckeeper.conf,v 1.3 2017/05/20 01:05:05 schmonz Exp $
+$NetBSD: patch-etckeeper.conf,v 1.4 2018/10/07 10:52:40 schmonz Exp $
 
 Make pkg_install the package manager.
 
---- etckeeper.conf.orig        2016-07-17 23:01:39.000000000 +0000
+--- etckeeper.conf.orig        2018-06-05 20:04:03.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 etc)
+ # (apt, pacman, pacman-g2, yum, dnf, zypper, apk 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, etc)
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
 +LOWLEVEL_PACKAGE_MANAGER=pkg_install