From 27984f4e667b3a6699bee6c5d9a7cffd1ddab170 Mon Sep 17 00:00:00 2001 From: schmonz Date: Thu, 17 Sep 2020 08:50:01 +0000 Subject: Update to 1.18.14. From the changelog: * pacman 5.2 deprecated File hooks, use Path. Thanks, Christian Hesse * Added zsh completion. Thanks, James Rowe * commit: Recent changes added code that does not work on all POSIX shells. Fixed by Thorsten Glaser. pkgsrc changes: - Install the daily script called from libexec/etckeeper.daily - Do our SUBSTing as the do-configure phase - Better match other package managers in "etckeeper list-installed" --- sysutils/etckeeper/Makefile | 23 ++++++++++------------ sysutils/etckeeper/PLIST | 4 +++- sysutils/etckeeper/distinfo | 14 +++++++------ sysutils/etckeeper/patches/patch-daily | 18 +++++++++++++++++ .../patch-list-installed.d_50list-installed | 6 +++--- sysutils/etckeeper/patches/patch-zsh__completion | 20 +++++++++++++++++++ 6 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 sysutils/etckeeper/patches/patch-daily create mode 100644 sysutils/etckeeper/patches/patch-zsh__completion diff --git a/sysutils/etckeeper/Makefile b/sysutils/etckeeper/Makefile index 36227a477a5..32aed640a6c 100644 --- a/sysutils/etckeeper/Makefile +++ b/sysutils/etckeeper/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2020/08/31 18:11:27 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2020/09/17 08:50:01 schmonz Exp $ # -DISTNAME= etckeeper_1.18.12.orig +DISTNAME= etckeeper_1.18.14.orig PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//} -PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} @@ -16,7 +15,6 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//} USE_LANGUAGES= # none USE_TOOLS+= gawk perl:run -NO_CONFIGURE= yes NO_BUILD= yes AUTO_MKDIRS= yes @@ -41,21 +39,18 @@ CONF_FILES_PERMS+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} \ .endfor SUBST_CLASSES+= config -SUBST_STAGE.config= pre-install -SUBST_FILES.config+= etckeeper -SUBST_FILES.config+= etckeeper.8 +SUBST_STAGE.config= do-configure +SUBST_FILES.config+= etckeeper etckeeper.8 SUBST_FILES.config+= pre-install.d/10packagelist SUBST_FILES.config+= post-install.d/50vcs-commit -SUBST_FILES.config+= bash_completion -SUBST_FILES.config+= debian/cron.daily -SUBST_VARS.config+= PKG_SYSCONFBASEDIR -SUBST_VARS.config+= PKG_SYSCONFDIR -SUBST_VARS.config+= VARBASE -SUBST_VARS.config+= PREFIX +SUBST_FILES.config+= bash_completion zsh_completion +SUBST_FILES.config+= daily debian/cron.daily +SUBST_VARS.config+= PREFIX VARBASE PKG_SYSCONFBASEDIR PKG_SYSCONFDIR do-install: ${INSTALL_SCRIPT} ${WRKSRC}/etckeeper ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/etckeeper.conf ${DESTDIR}${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/daily ${DESTDIR}${EGDIR} for file in ${CF_FILES}; do \ ${INSTALL_DATA} ${WRKSRC}/$${file} ${DESTDIR}${EGDIR}/$${file} ;\ done @@ -68,6 +63,8 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/etckeeper/README.md ${INSTALL_DATA} ${WRKSRC}/bash_completion \ ${DESTDIR}${PREFIX}/share/bash-completion.d/etckeeper + ${INSTALL_DATA} ${WRKSRC}/zsh_completion \ + ${DESTDIR}${PREFIX}/share/zsh/site-functions/_etckeeper gen-cf-files: .PHONY { \ diff --git a/sysutils/etckeeper/PLIST b/sysutils/etckeeper/PLIST index b9c7c9391cc..23b430d0f5c 100644 --- a/sysutils/etckeeper/PLIST +++ b/sysutils/etckeeper/PLIST @@ -1,9 +1,10 @@ -@comment $NetBSD: PLIST,v 1.4 2018/09/27 22:56:37 tnn Exp $ +@comment $NetBSD: PLIST,v 1.5 2020/09/17 08:50:01 schmonz Exp $ bin/etckeeper libexec/etckeeper.daily man/man8/etckeeper.8 share/bash-completion.d/etckeeper share/doc/etckeeper/README.md +share/zsh/site-functions/_etckeeper share/examples/etckeeper/commit.d/10vcs-test share/examples/etckeeper/commit.d/20store-metadata share/examples/etckeeper/commit.d/30bzr-add @@ -13,6 +14,7 @@ share/examples/etckeeper/commit.d/30hg-addremove share/examples/etckeeper/commit.d/50vcs-commit share/examples/etckeeper/commit.d/99push share/examples/etckeeper/commit.d/README +share/examples/etckeeper/daily share/examples/etckeeper/etckeeper.conf share/examples/etckeeper/init.d/10restore-metadata share/examples/etckeeper/init.d/20restore-etckeeper diff --git a/sysutils/etckeeper/distinfo b/sysutils/etckeeper/distinfo index 496f1d767c1..7c1f38b06f7 100644 --- a/sysutils/etckeeper/distinfo +++ b/sysutils/etckeeper/distinfo @@ -1,18 +1,20 @@ -$NetBSD: distinfo,v 1.9 2019/12/24 06:00:24 schmonz Exp $ +$NetBSD: distinfo,v 1.10 2020/09/17 08:50:01 schmonz Exp $ -SHA1 (etckeeper_1.18.12.orig.tar.gz) = 6b2e368e280ab550efd81587c14980227290d145 -RMD160 (etckeeper_1.18.12.orig.tar.gz) = e514e6f3346f2ff937eb13bfedbdc2f2463495ed -SHA512 (etckeeper_1.18.12.orig.tar.gz) = 7fb75d89bbf69d5ef29fc93f34f8368f0d93adb6f89a96be4769be4a58faff793682f5a5fc6f6f2bf51bc5a151a28b61319396a4298cbf0aa75ff3c1bbb660d7 -Size (etckeeper_1.18.12.orig.tar.gz) = 90243 bytes +SHA1 (etckeeper_1.18.14.orig.tar.gz) = 911575137d218cc7831b5fbe95ff13934ca6a3fe +RMD160 (etckeeper_1.18.14.orig.tar.gz) = 34855d5e3578e2a0b3867583add9615623411ba0 +SHA512 (etckeeper_1.18.14.orig.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948 +Size (etckeeper_1.18.14.orig.tar.gz) = 93528 bytes SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6 +SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0 SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69 -SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2 +SHA1 (patch-list-installed.d_50list-installed) = 0ab54aab49d2a81951c244632a076f1e0556f537 SHA1 (patch-post-install.d_50vcs-commit) = a1b5cf25a9b3a421169dd8c5283f61b6dedad803 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee +SHA1 (patch-zsh__completion) = 9acd2ce833bdb5df2e6bdb7397d0dffbc281a320 diff --git a/sysutils/etckeeper/patches/patch-daily b/sysutils/etckeeper/patches/patch-daily new file mode 100644 index 00000000000..72cc3602ecd --- /dev/null +++ b/sysutils/etckeeper/patches/patch-daily @@ -0,0 +1,18 @@ +$NetBSD: patch-daily,v 1.1 2020/09/17 08:50:01 schmonz Exp $ + +Add SUBST_VARS tokens. + +--- daily.orig 2020-01-22 13:59:54.000000000 +0000 ++++ daily +@@ -1,9 +1,9 @@ + #!/bin/sh + # Script that can be run daily to autocommit /etc changes. + set -e +-if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then ++if [ -x @PREFIX@/bin/etckeeper ] && [ -e @PKG_SYSCONFDIR@/etckeeper.conf ]; 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 diff --git a/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed b/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed index 4c7503b5bd3..5c87ccb923f 100644 --- a/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed +++ b/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed @@ -1,8 +1,8 @@ -$NetBSD: patch-list-installed.d_50list-installed,v 1.2 2017/05/20 01:05:05 schmonz Exp $ +$NetBSD: patch-list-installed.d_50list-installed,v 1.3 2020/09/17 08:50:01 schmonz Exp $ Add pkg_install support. ---- list-installed.d/50list-installed.orig 2016-07-17 23:01:39.000000000 +0000 +--- list-installed.d/50list-installed.orig 2020-01-22 13:59:54.000000000 +0000 +++ list-installed.d/50list-installed @@ -10,7 +10,9 @@ else # Output to stdout a *sorted* list of all currently installed @@ -10,7 +10,7 @@ Add pkg_install support. # 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 ++ pkg_info -a -I | awk '{print $1}' | sed -e 's|\(.*\)-|\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 diff --git a/sysutils/etckeeper/patches/patch-zsh__completion b/sysutils/etckeeper/patches/patch-zsh__completion new file mode 100644 index 00000000000..21a9c17a235 --- /dev/null +++ b/sysutils/etckeeper/patches/patch-zsh__completion @@ -0,0 +1,20 @@ +$NetBSD: patch-zsh__completion,v 1.1 2020/09/17 08:50:01 schmonz Exp $ + +Add SUBST_VARS tokens. + +--- zsh_completion.orig 2020-01-22 13:59:54.000000000 +0000 ++++ zsh_completion +@@ -1,11 +1,11 @@ + #compdef etckeeper + + local _VCS=$(sed -n "s,^VCS=\([\"']\?\)\(.*\)\1$,\2,p" \ +- ${ETCKEEPER_CONF_DIR:-/etc/etckeeper}/etckeeper.conf 2>/dev/null) ++ ${ETCKEEPER_CONF_DIR:-@PKG_SYSCONFDIR@}/etckeeper.conf 2>/dev/null) + + _arguments '--help[show this help message and exit]' \ + '--version[show version information]' \ +- ":etckeeper command:(/etc/etckeeper/*.d(/:t:r))" \ ++ ":etckeeper command:(@PKG_SYSCONFDIR@/*.d(/:t:r))" \ + '*::subcmd:->subcmd' && return 0 + + case "$words[1]" in -- cgit v1.2.3