[pkgsrc/trunk]: pkgsrc/sysutils/etckeeper Update to 1.18.5.1. From the change...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/etckeeper Update to 1.18.5.1. From the change...
From: schmonz <schmonz%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 07:11:22 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b85f3daa768
branches:  trunk
changeset: 362618:6b85f3daa768
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat May 20 01:05:05 2017 +0000

description:
Update to 1.18.5.1. From the changelog:

* New upstream release:
  * merged Makefile patch
  * update standards version, no change
* Remove pre-compiled .pyc for bzr plugin from Debian package,
  and add python:Depends to Depends so that dh_python2 will install
  maintainer script snippets. Unfortunately, this adds a completely
  unnecessary dependency on python, which etckeeper does not need in
  normal operation.
* Make etckeeper commit store metadata changes. The pre-commit
  hook has always (and continues) to do that, but pre-commit is only
  run when there are changes to tommit. This makes metadata-only
  changes get committed.
* Move systemd files to /lib/systemd; /usr/lib/systemd is not used
  on Debian.
* Optimised find for special and hard linked files.
  Thanks, Rike-Benjamin Schuppner.
* Adjust when Pacman 5 calls etckeeper hooks.
  Thanks, Tilman Blumenbach and Christian Hesse.
* Only run Pacman hooks when files in /etc have changed.
  Thanks, Christian Hesse.
* Added systemd timer that can run etckeeper 10 minutes after boot, and also
  daily. It's not enabled by default, partly because of overlap with the
  cron job.
  Thanks, Christian Hesse.
* Added support for pacmatic, contributed by nicolaichuk.
* bzr: make sure EMAIL is defined
  Thanks, Serge E. Hallyn
* Fix Makefile version patterns to ignore non-native version number
  (Antoine Beaupr?)
* Support ~/.config/git/config when determining the author name and email.
  Thanks, Richard Savio
* Added support for Arch's pacman package manager version 5.
  Thanks, Tilman Blumenbach.
* Set HOME if it's not set, as is the case when using ubuntu's
  update-manager.
* Move bash completion out of etc and into usr.
* Prepare upload to Debian unstable
* Fix Makefile version patterns to ignore non-native version number
* Fix lintian warnings:
  * remove .pyc files on build
  * install bash completions in standard location
  * ignore missing debian/config file, we ask only on purge on purpose
  * ignore full path for /usr/bin/etckeeper, we use it to stash it for
    later
* Update to standards 3.9.6, no change
* Remove obsolete XS-Python-Version field
* Run debconf-updatepo, outdating a bunch of translations
* Use getent utility instead of perl. (Elan Ruusam?e)
* Initial FreeBSD support with pkgng plugin. (William Johansson)
* Fix README.md symlink in package (Sebastian Schmidt, Antoine Beaupr?,
  closes: #791566)
* Fix typo of GIT_COMMITTER_EMAIL.
* Update git URL in control file.
* Send yum pre-commit output to /dev/null
  Thanks, Andrew Colin Kissa
* Set LANG=C internally when doing some operations that have
  been reported to fail in other locales.
* Fix name of DNF plugin.
* Add --version
  Thanks Andreas Wansner.
* New website, http://etckeeper.branchable.com/
* Add build-depends on dh-python.
* Added support for Fedora's DNF highlevel package manager.
  Thanks, Peter Listiak and Petr Spacek.
* Add architecture info to dpkg list-installed. Closes: #768145
* Orphaned the Debian package.

diffstat:

 sysutils/etckeeper/Makefile                                        |  13 +++-
 sysutils/etckeeper/distinfo                                        |  27 +++++----
 sysutils/etckeeper/patches/patch-commit.d_50vcs-commit             |  22 ++++++++
 sysutils/etckeeper/patches/patch-debian_cron.daily                 |  20 +++----
 sysutils/etckeeper/patches/patch-etckeeper.8                       |   6 +-
 sysutils/etckeeper/patches/patch-etckeeper.conf                    |  10 +-
 sysutils/etckeeper/patches/patch-list-installed.d_50list-installed |  26 ++++----
 sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit       |  15 ++++-
 sysutils/etckeeper/patches/patch-pre-install.d_10packagelist       |   7 +-
 9 files changed, 93 insertions(+), 53 deletions(-)

diffs (263 lines):

diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/Makefile
--- a/sysutils/etckeeper/Makefile       Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/Makefile       Sat May 20 01:05:05 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2017/05/18 21:19:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.8 2017/05/20 01:05:05 schmonz Exp $
 #
 
-DISTNAME=      etckeeper_1.15
-PKGNAME=       ${DISTNAME:S/_/-/}
+DISTNAME=      etckeeper_1.18.5.orig
+PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$/.1/}
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -11,7 +11,7 @@
 COMMENT=       Store /etc in git, mercurial, bzr or darcs
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/etckeeper
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV:S/.1$//}
 USE_LANGUAGES= # none
 USE_TOOLS+=    sed perl:run
 
@@ -21,6 +21,11 @@
 
 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
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/distinfo
--- a/sysutils/etckeeper/distinfo       Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/distinfo       Sat May 20 01:05:05 2017 +0000
@@ -1,17 +1,22 @@
-$NetBSD: distinfo,v 1.3 2017/05/18 21:19:08 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2017/05/20 01:05:05 schmonz Exp $
 
-SHA1 (etckeeper_1.15.tar.gz) = d0a90b25d6a9e3a78fbfbde404c71c0b847f9369
-RMD160 (etckeeper_1.15.tar.gz) = d732c9a5cf2e1d643bf3aed4edace6665bada586
-SHA512 (etckeeper_1.15.tar.gz) = f2e5f584870fbec3d800bf9a53617770f2fef50d0860bab016ec6614f232948661a611147bca83ad3d304220607a878c1708a988ca580482a5db5e685cf94bd9
-Size (etckeeper_1.15.tar.gz) = 48882 bytes
+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 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
-SHA1 (patch-debian_cron.daily) = b89d63ec32cfa3ab72043f56f4f9aef2ca60fc4f
+SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a
+SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
 SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
-SHA1 (patch-etckeeper.8) = 0d8e5ac7e6aab35d507fe5b570934a207f4171ad
-SHA1 (patch-etckeeper.conf) = 46c179e875962e2f89e1c57ced3fa2235d655177
+SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
+SHA1 (patch-etckeeper.conf) = 3da6944c550aaa85ea9458aea583b7a7d051a0e0
 SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6
-SHA1 (patch-list-installed.d_50list-installed) = b0c9a500fa80c97686f229b8f936de6f1c8de7e0
-SHA1 (patch-post-install.d_50vcs-commit) = b19d570b604f7cd2d7cea05965a10f6508b402bf
-SHA1 (patch-pre-install.d_10packagelist) = c2383ef03e2f360c581acb2c4c3ca09bad8cac10
+SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2
+SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b
+SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
 SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
 SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-commit.d_50vcs-commit
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/etckeeper/patches/patch-commit.d_50vcs-commit    Sat May 20 01:05:05 2017 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-commit.d_50vcs-commit,v 1.1 2017/05/20 01:05:05 schmonz Exp $
+
+Test more carefully for a possibly missing binary. From Nathan Arthur in
+private mail.
+
+--- commit.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000
++++ commit.d/50vcs-commit
+@@ -23,9 +23,11 @@ fi
+ 
+ hostname=`hostname`
+ hostname="${hostname%%.*}"
+-dnsdomainname=`dnsdomainname 2>/dev/null || true`
+-if [ -n "$dnsdomainname" ]; then
+-      hostname="$hostname.$dnsdomainname"
++if command -v dnsdomainname >/dev/null; then
++      dnsdomainname=`dnsdomainname 2>/dev/null || true`
++      if [ -n "$dnsdomainname" ]; then
++              hostname="$hostname.$dnsdomainname"
++      fi
+ fi
+ 
+ ORIG_USER=$USER
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-debian_cron.daily
--- a/sysutils/etckeeper/patches/patch-debian_cron.daily        Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-debian_cron.daily        Sat May 20 01:05:05 2017 +0000
@@ -1,20 +1,18 @@
-$NetBSD: patch-debian_cron.daily,v 1.2 2017/05/18 21:19:08 schmonz Exp $
+$NetBSD: patch-debian_cron.daily,v 1.3 2017/05/20 01:05:05 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- debian/cron.daily.orig     2014-07-02 19:17:18.000000000 +0000
+--- debian/cron.daily.orig     2016-07-17 23:01:39.000000000 +0000
 +++ debian/cron.daily
-@@ -1,10 +1,10 @@
+@@ -1,8 +1,8 @@
  #!/bin/sh
  set -e
--if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
+-if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then
 -      . /etc/etckeeper/etckeeper.conf
-+if [ -x @PREFIX@/bin/etckeeper ] && [ -e @PKG_SYSCONFDIR@/etckeeper.conf ]; then
++if [ -e @PKG_SYSCONFDIR@/daily ] && [ -e @PKG_SYSCONFDIR@/etckeeper.conf ]; then
 +      . @PKG_SYSCONFDIR@/etckeeper.conf
        if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then
-               # avoid autocommit if an install run is in progress
--              lockfile=/var/cache/etckeeper/packagelist.pre-install
-+              lockfile=@VARBASE@/cache/etckeeper/packagelist.pre-install
-               if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then
-                       rm -f "$lockfile" # stale
-               fi
+-              /etc/etckeeper/daily
++              @PKG_SYSCONFDIR@/daily
+       fi
+ fi
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-etckeeper.8
--- a/sysutils/etckeeper/patches/patch-etckeeper.8      Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-etckeeper.8      Sat May 20 01:05:05 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper.8,v 1.2 2017/05/18 21:19:08 schmonz Exp $
+$NetBSD: patch-etckeeper.8,v 1.3 2017/05/20 01:05:05 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- etckeeper.8.orig   2014-09-04 19:32:34.000000000 +0000
+--- etckeeper.8.orig   2016-07-17 23:01:39.000000000 +0000
 +++ etckeeper.8
 @@ -5,21 +5,21 @@ etckeeper \- store /etc in git, mercuria
  .SH SYNOPSIS
@@ -49,4 +49,4 @@
 -/usr/share/doc/etckeeper/README.md.gz
 +@PREFIX@/share/doc/etckeeper/README.md
  .SH AUTHOR 
- Joey Hess <joey%kitenet.net@localhost>
+ Joey Hess <id%joeyh.name@localhost>
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-etckeeper.conf
--- a/sysutils/etckeeper/patches/patch-etckeeper.conf   Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-etckeeper.conf   Sat May 20 01:05:05 2017 +0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-etckeeper.conf,v 1.2 2017/05/18 21:19:08 schmonz Exp $
+$NetBSD: patch-etckeeper.conf,v 1.3 2017/05/20 01:05:05 schmonz Exp $
 
 Make pkg_install the package manager.
 
---- etckeeper.conf.orig        2014-07-02 19:17:18.000000000 +0000
+--- etckeeper.conf.orig        2016-07-17 23:01:39.000000000 +0000
 +++ etckeeper.conf
-@@ -31,11 +31,11 @@ DARCS_COMMIT_OPTIONS="-a"
+@@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a"
  
  # The high-level package manager that's being used.
- # (apt, pacman-g2, yum, zypper etc)
+ # (apt, pacman, pacman-g2, yum, dnf, zypper etc)
 -HIGHLEVEL_PACKAGE_MANAGER=apt
 +HIGHLEVEL_PACKAGE_MANAGER=pkg_add
  
  # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacman-g2, etc)
+ # (dpkg, rpm, pacman, pacmatic, pacman-g2, etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
 +LOWLEVEL_PACKAGE_MANAGER=pkg_install
  
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-list-installed.d_50list-installed
--- a/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed        Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed        Sat May 20 01:05:05 2017 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-list-installed.d_50list-installed,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-list-installed.d_50list-installed,v 1.2 2017/05/20 01:05:05 schmonz Exp $
 
 Add pkg_install support.
 
---- list-installed.d/50list-installed.orig     2011-02-22 20:19:36.000000000 +0000
+--- list-installed.d/50list-installed.orig     2016-07-17 23:01:39.000000000 +0000
 +++ list-installed.d/50list-installed
-@@ -2,7 +2,9 @@
- # Output to stdout a *sorted* list of all currently installed 
- # (or removed but still with config-files) packages, in the
- # format "package version\n" (or something similar).
--if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
-+if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then
-+      pkg_info -a -I | awk '{print $1}' | sort
-+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
-       dpkg-query -W -f '${Status}\t${Package} ${Version}\n' | \
-               egrep '(ok installed|ok config-files)' | cut -f2,3
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+@@ -10,7 +10,9 @@ else
+       # Output to stdout a *sorted* list of all currently installed 
+       # (or removed but still with config-files) packages, in the
+       # format "package version\n" (or something similar).
+-      if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
++      if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then
++              pkg_info -a -I | awk '{print $1}' | sort
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
+               dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \
+                       egrep '(ok installed|ok config-files)' | cut -f2,3
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
--- a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit      Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit      Sat May 20 01:05:05 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.2 2017/05/18 21:19:08 schmonz Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.3 2017/05/20 01:05:05 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- post-install.d/50vcs-commit.orig   2014-09-04 19:44:52.000000000 +0000
+--- post-install.d/50vcs-commit.orig   2016-07-17 23:01:39.000000000 +0000
 +++ post-install.d/50vcs-commit
 @@ -1,10 +1,10 @@
  #!/bin/sh
@@ -16,4 +16,13 @@
 +      message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run"
  
        set +e
-       if [ -e $pl.pre-install ]; then
+       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
+       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
+       
diff -r b0645f2ce31b -r 6b85f3daa768 sysutils/etckeeper/patches/patch-pre-install.d_10packagelist
--- a/sysutils/etckeeper/patches/patch-pre-install.d_10packagelist      Fri May 19 18:50:41 2017 +0000
+++ b/sysutils/etckeeper/patches/patch-pre-install.d_10packagelist      Sat May 20 01:05:05 2017 +0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-pre-install.d_10packagelist,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-pre-install.d_10packagelist,v 1.2 2017/05/20 01:05:05 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- pre-install.d/10packagelist.orig   2011-02-22 20:19:36.000000000 +0000
+--- pre-install.d/10packagelist.orig   2016-07-17 23:01:39.000000000 +0000
 +++ pre-install.d/10packagelist
-@@ -1,4 +1,4 @@
+@@ -1,5 +1,5 @@
  #!/bin/sh
  # This list will be later used when committing.
 -mkdir -p /var/cache/etckeeper/
 -etckeeper list-installed > /var/cache/etckeeper/packagelist.pre-install
 +mkdir -p @VARBASE@/cache/etckeeper/
 +etckeeper list-installed > @VARBASE@/cache/etckeeper/packagelist.pre-install
+ etckeeper list-installed fmt > /var/cache/etckeeper/packagelist.fmt
Prev by Date: [pkgsrc/trunk]: pkgsrc/lang/go Align previous patch with upstream trunk. Func...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated net/ucspi-ssl to 0.99
Previous by Thread: [pkgsrc/trunk]: pkgsrc/lang/go Align previous patch with upstream trunk. Func...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated net/ucspi-ssl to 0.99
Indexes:
Home | Main Index | Thread Index | Old Index