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.diff -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/Makefile
(schmonz)
@@ -1,36 +1,41 @@ | @@ -1,36 +1,41 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2017/05/18 21:19:08 schmonz Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2017/05/20 01:05:05 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= etckeeper_1.15 | 4 | DISTNAME= etckeeper_1.18.5.orig | |
5 | PKGNAME= ${DISTNAME:S/_/-/} | 5 | PKGNAME= ${DISTNAME:S/_/-/:S/.orig$/.1/} | |
6 | CATEGORIES= sysutils | 6 | CATEGORIES= sysutils | |
7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} | 7 | MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/} | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://etckeeper.branchable.com/ | 10 | HOMEPAGE= http://etckeeper.branchable.com/ | |
11 | COMMENT= Store /etc in git, mercurial, bzr or darcs | 11 | COMMENT= Store /etc in git, mercurial, bzr or darcs | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | WRKSRC= ${WRKDIR}/etckeeper | 14 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.1$//} | |
15 | USE_LANGUAGES= # none | 15 | USE_LANGUAGES= # none | |
16 | USE_TOOLS+= sed perl:run | 16 | USE_TOOLS+= sed perl:run | |
17 | 17 | |||
18 | NO_CONFIGURE= yes | 18 | NO_CONFIGURE= yes | |
19 | NO_BUILD= yes | 19 | NO_BUILD= yes | |
20 | AUTO_MKDIRS= yes | 20 | AUTO_MKDIRS= yes | |
21 | 21 | |||
22 | BUILD_DEFS+= VARBASE | 22 | BUILD_DEFS+= VARBASE | |
23 | 23 | |||
24 | ETCKEEPER_PATCH=etckeeper_1.18.5-1.diff.gz | |||
25 | PATCHFILES+= ${ETCKEEPER_PATCH} | |||
26 | SITES.${ETCKEEPER_PATCH}= ${MASTER_SITES} | |||
27 | PATCH_DIST_STRIP.${ETCKEEPER_PATCH}= -p1 | |||
28 | ||||
24 | .include "cf-files.mk" | 29 | .include "cf-files.mk" | |
25 | 30 | |||
26 | PKG_SYSCONFSUBDIR= etckeeper | 31 | PKG_SYSCONFSUBDIR= etckeeper | |
27 | OWN_DIRS+= ${VARBASE}/cache/etckeeper | 32 | OWN_DIRS+= ${VARBASE}/cache/etckeeper | |
28 | OWN_DIRS+= ${PKG_SYSCONFDIR} | 33 | OWN_DIRS+= ${PKG_SYSCONFDIR} | |
29 | OWN_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@} | 34 | OWN_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@} | |
30 | 35 | |||
31 | EGDIR= ${PREFIX}/share/examples/etckeeper | 36 | EGDIR= ${PREFIX}/share/examples/etckeeper | |
32 | 37 | |||
33 | CONF_FILES+= ${EGDIR}/etckeeper.conf ${PKG_SYSCONFDIR}/etckeeper.conf | 38 | CONF_FILES+= ${EGDIR}/etckeeper.conf ${PKG_SYSCONFDIR}/etckeeper.conf | |
34 | .for file in ${CF_FILES:M*/README} | 39 | .for file in ${CF_FILES:M*/README} | |
35 | CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} | 40 | CONF_FILES+= ${EGDIR}/${file} ${PKG_SYSCONFDIR}/${file} | |
36 | .endfor | 41 | .endfor |
@@ -1,17 +1,22 @@ | @@ -1,17 +1,22 @@ | |||
1 | $NetBSD: distinfo,v 1.3 2017/05/18 21:19:08 schmonz Exp $ | 1 | $NetBSD: distinfo,v 1.4 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | SHA1 (etckeeper_1.15.tar.gz) = d0a90b25d6a9e3a78fbfbde404c71c0b847f9369 | 3 | SHA1 (etckeeper_1.18.5-1.diff.gz) = c43743cdfc6aa6543d95b7f19337d545d9cbe040 | |
4 | RMD160 (etckeeper_1.15.tar.gz) = d732c9a5cf2e1d643bf3aed4edace6665bada586 | 4 | RMD160 (etckeeper_1.18.5-1.diff.gz) = d7708dd7b2879e53ddd98896c7567d00da685286 | |
5 | SHA512 (etckeeper_1.15.tar.gz) = f2e5f584870fbec3d800bf9a53617770f2fef50d0860bab016ec6614f232948661a611147bca83ad3d304220607a878c1708a988ca580482a5db5e685cf94bd9 | 5 | SHA512 (etckeeper_1.18.5-1.diff.gz) = 537bbeabc09a12cce9e96d21f9fc758b1982161803bc1d774386e75a1f2ab5dfe6dd925c5cbbf555017209961c2f60c5bb755bd780ab0eb52ce312ec47bfb010 | |
6 | Size (etckeeper_1.15.tar.gz) = 48882 bytes | 6 | Size (etckeeper_1.18.5-1.diff.gz) = 1086 bytes | |
7 | SHA1 (etckeeper_1.18.5.orig.tar.gz) = cccf48b130dafdb6532ebf7d1a145a58918fed18 | |||
8 | RMD160 (etckeeper_1.18.5.orig.tar.gz) = 436b472276c3175cc7157d28d18345d4f4b17bd4 | |||
9 | SHA512 (etckeeper_1.18.5.orig.tar.gz) = bfdd5ffb6ae72ebc5ea8254404280ea1c89de44cfb4c888bc40d1a8504887d198b967f46f1d3952a5a22b0f5969a8f3291e4fc1c37bbd488e4b25682d41364cd | |||
10 | Size (etckeeper_1.18.5.orig.tar.gz) = 67166 bytes | |||
7 | SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 | 11 | SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9 | |
8 | SHA1 (patch-debian_cron.daily) = b89d63ec32cfa3ab72043f56f4f9aef2ca60fc4f | 12 | SHA1 (patch-commit.d_50vcs-commit) = 2776cf73cc1211b4beaf14ce05aeb96ff422a19a | |
13 | SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131 | |||
9 | SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c | 14 | SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c | |
10 | SHA1 (patch-etckeeper.8) = 0d8e5ac7e6aab35d507fe5b570934a207f4171ad | 15 | SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52 | |
11 | SHA1 (patch-etckeeper.conf) = 46c179e875962e2f89e1c57ced3fa2235d655177 | 16 | SHA1 (patch-etckeeper.conf) = 3da6944c550aaa85ea9458aea583b7a7d051a0e0 | |
12 | SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6 | 17 | SHA1 (patch-init.d_40vcs-init) = d267d4e7e2b82353614ed15455c2739e1c8f92d6 | |
13 | SHA1 (patch-list-installed.d_50list-installed) = b0c9a500fa80c97686f229b8f936de6f1c8de7e0 | 18 | SHA1 (patch-list-installed.d_50list-installed) = 966c9471767a1808010af62117edc892e88670a2 | |
14 | SHA1 (patch-post-install.d_50vcs-commit) = b19d570b604f7cd2d7cea05965a10f6508b402bf | 19 | SHA1 (patch-post-install.d_50vcs-commit) = 1a95a720bdbdb1ace30289204bf0888aab741e8b | |
15 | SHA1 (patch-pre-install.d_10packagelist) = c2383ef03e2f360c581acb2c4c3ca09bad8cac10 | 20 | SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a | |
16 | SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d | 21 | SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d | |
17 | SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee | 22 | SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee |
$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
@@ -1,20 +1,18 @@ | @@ -1,20 +1,18 @@ | |||
1 | $NetBSD: patch-debian_cron.daily,v 1.2 2017/05/18 21:19:08 schmonz Exp $ | 1 | $NetBSD: patch-debian_cron.daily,v 1.3 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Add SUBST_VARS tokens. | 3 | Add SUBST_VARS tokens. | |
4 | 4 | |||
5 | --- debian/cron.daily.orig 2014-07-02 19:17:18.000000000 +0000 | 5 | --- debian/cron.daily.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ debian/cron.daily | 6 | +++ debian/cron.daily | |
7 | @@ -1,10 +1,10 @@ | 7 | @@ -1,8 +1,8 @@ | |
8 | #!/bin/sh | 8 | #!/bin/sh | |
9 | set -e | 9 | set -e | |
10 | -if [ -x /usr/bin/etckeeper ] && [ -e /etc/etckeeper/etckeeper.conf ]; then | 10 | -if [ -e /etc/etckeeper/daily ] && [ -e /etc/etckeeper/etckeeper.conf ]; then | |
11 | - . /etc/etckeeper/etckeeper.conf | 11 | - . /etc/etckeeper/etckeeper.conf | |
12 | +if [ -x @PREFIX@/bin/etckeeper ] && [ -e @PKG_SYSCONFDIR@/etckeeper.conf ]; then | 12 | +if [ -e @PKG_SYSCONFDIR@/daily ] && [ -e @PKG_SYSCONFDIR@/etckeeper.conf ]; then | |
13 | + . @PKG_SYSCONFDIR@/etckeeper.conf | 13 | + . @PKG_SYSCONFDIR@/etckeeper.conf | |
14 | if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then | 14 | if [ "$AVOID_DAILY_AUTOCOMMITS" != "1" ]; then | |
15 | # avoid autocommit if an install run is in progress | 15 | - /etc/etckeeper/daily | |
16 | - lockfile=/var/cache/etckeeper/packagelist.pre-install | 16 | + @PKG_SYSCONFDIR@/daily | |
17 | + lockfile=@VARBASE@/cache/etckeeper/packagelist.pre-install | 17 | fi | |
18 | if [ -e "$lockfile" ] && [ -n "$(find "$lockfile" -mtime +1)" ]; then | 18 | fi | |
19 | rm -f "$lockfile" # stale | |||
20 | fi |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: patch-etckeeper.8,v 1.2 2017/05/18 21:19:08 schmonz Exp $ | 1 | $NetBSD: patch-etckeeper.8,v 1.3 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Add SUBST_VARS tokens. | 3 | Add SUBST_VARS tokens. | |
4 | 4 | |||
5 | --- etckeeper.8.orig 2014-09-04 19:32:34.000000000 +0000 | 5 | --- etckeeper.8.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ etckeeper.8 | 6 | +++ etckeeper.8 | |
7 | @@ -5,21 +5,21 @@ etckeeper \- store /etc in git, mercuria | 7 | @@ -5,21 +5,21 @@ etckeeper \- store /etc in git, mercuria | |
8 | .SH SYNOPSIS | 8 | .SH SYNOPSIS | |
9 | .B etckeeper command [-d directory] | 9 | .B etckeeper command [-d directory] | |
10 | .SH DESCRIPTION | 10 | .SH DESCRIPTION | |
11 | -etckeeper manages /etc be stored in a git, mercurial, bazaar, or darcs | 11 | -etckeeper manages /etc be stored in a git, mercurial, bazaar, or darcs | |
12 | -repository. By default each of the commands operates on /etc, but a | 12 | -repository. By default each of the commands operates on /etc, but a | |
13 | -different directory can be specified to operate on a clone of the /etc | 13 | -different directory can be specified to operate on a clone of the /etc | |
14 | +etckeeper manages @PKG_SYSCONFBASEDIR@ be stored in a git, mercurial, bazaar, or darcs | 14 | +etckeeper manages @PKG_SYSCONFBASEDIR@ be stored in a git, mercurial, bazaar, or darcs | |
15 | +repository. By default each of the commands operates on @PKG_SYSCONFBASEDIR@, but a | 15 | +repository. By default each of the commands operates on @PKG_SYSCONFBASEDIR@, but a | |
16 | +different directory can be specified to operate on a clone of the @PKG_SYSCONFBASEDIR@ | 16 | +different directory can be specified to operate on a clone of the @PKG_SYSCONFBASEDIR@ | |
17 | repository located elsewhere. | 17 | repository located elsewhere. | |
18 | .SH COMMANDS | 18 | .SH COMMANDS | |
@@ -39,14 +39,14 @@ Add SUBST_VARS tokens. | @@ -39,14 +39,14 @@ Add SUBST_VARS tokens. | |||
39 | -/etc/etckeeper/etckeeper.conf is the configuration file. | 39 | -/etc/etckeeper/etckeeper.conf is the configuration file. | |
40 | +@PKG_SYSCONFDIR@/etckeeper.conf is the configuration file. | 40 | +@PKG_SYSCONFDIR@/etckeeper.conf is the configuration file. | |
41 | 41 | |||
42 | -/etc/etckeeper also contains directories containing the programs that are | 42 | -/etc/etckeeper also contains directories containing the programs that are | |
43 | +@PKG_SYSCONFDIR@ also contains directories containing the programs that are | 43 | +@PKG_SYSCONFDIR@ also contains directories containing the programs that are | |
44 | run for each of the above commands. | 44 | run for each of the above commands. | |
45 | .SH ENVIRONMENT VARIABLES | 45 | .SH ENVIRONMENT VARIABLES | |
46 | -ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etckeeper. | 46 | -ETCKEEPER_CONF_DIR path to configuration directory instead of default /etc/etckeeper. | |
47 | +ETCKEEPER_CONF_DIR path to configuration directory instead of default @PKG_SYSCONFDIR@. | 47 | +ETCKEEPER_CONF_DIR path to configuration directory instead of default @PKG_SYSCONFDIR@. | |
48 | .SH SEE ALSO | 48 | .SH SEE ALSO | |
49 | -/usr/share/doc/etckeeper/README.md.gz | 49 | -/usr/share/doc/etckeeper/README.md.gz | |
50 | +@PREFIX@/share/doc/etckeeper/README.md | 50 | +@PREFIX@/share/doc/etckeeper/README.md | |
51 | .SH AUTHOR | 51 | .SH AUTHOR | |
52 | Joey Hess <joey@kitenet.net> | 52 | Joey Hess <id@joeyh.name> |
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | $NetBSD: patch-etckeeper.conf,v 1.2 2017/05/18 21:19:08 schmonz Exp $ | 1 | $NetBSD: patch-etckeeper.conf,v 1.3 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Make pkg_install the package manager. | 3 | Make pkg_install the package manager. | |
4 | 4 | |||
5 | --- etckeeper.conf.orig 2014-07-02 19:17:18.000000000 +0000 | 5 | --- etckeeper.conf.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ etckeeper.conf | 6 | +++ etckeeper.conf | |
7 | @@ -31,11 +31,11 @@ DARCS_COMMIT_OPTIONS="-a" | 7 | @@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a" | |
8 | 8 | |||
9 | # The high-level package manager that's being used. | 9 | # The high-level package manager that's being used. | |
10 | # (apt, pacman-g2, yum, zypper etc) | 10 | # (apt, pacman, pacman-g2, yum, dnf, zypper etc) | |
11 | -HIGHLEVEL_PACKAGE_MANAGER=apt | 11 | -HIGHLEVEL_PACKAGE_MANAGER=apt | |
12 | +HIGHLEVEL_PACKAGE_MANAGER=pkg_add | 12 | +HIGHLEVEL_PACKAGE_MANAGER=pkg_add | |
13 | 13 | |||
14 | # The low-level package manager that's being used. | 14 | # The low-level package manager that's being used. | |
15 | # (dpkg, rpm, pacman, pacman-g2, etc) | 15 | # (dpkg, rpm, pacman, pacmatic, pacman-g2, etc) | |
16 | -LOWLEVEL_PACKAGE_MANAGER=dpkg | 16 | -LOWLEVEL_PACKAGE_MANAGER=dpkg | |
17 | +LOWLEVEL_PACKAGE_MANAGER=pkg_install | 17 | +LOWLEVEL_PACKAGE_MANAGER=pkg_install | |
18 | 18 | |||
19 | # To push each commit to a remote, put the name of the remote here. | 19 | # To push each commit to a remote, put the name of the remote here. | |
20 | # (eg, "origin" for git). Space-separated lists of multiple remotes | 20 | # (eg, "origin" for git). Space-separated lists of multiple remotes |
@@ -1,19 +1,28 @@ | @@ -1,19 +1,28 @@ | |||
1 | $NetBSD: patch-post-install.d_50vcs-commit,v 1.2 2017/05/18 21:19:08 schmonz Exp $ | 1 | $NetBSD: patch-post-install.d_50vcs-commit,v 1.3 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Add SUBST_VARS token. | 3 | Add SUBST_VARS token. | |
4 | 4 | |||
5 | --- post-install.d/50vcs-commit.orig 2014-09-04 19:44:52.000000000 +0000 | 5 | --- post-install.d/50vcs-commit.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ post-install.d/50vcs-commit | 6 | +++ post-install.d/50vcs-commit | |
7 | @@ -1,10 +1,10 @@ | 7 | @@ -1,10 +1,10 @@ | |
8 | #!/bin/sh | 8 | #!/bin/sh | |
9 | set -e | 9 | set -e | |
10 | 10 | |||
11 | -pl="/var/cache/etckeeper/packagelist" | 11 | -pl="/var/cache/etckeeper/packagelist" | |
12 | +pl="@VARBASE@/cache/etckeeper/packagelist" | 12 | +pl="@VARBASE@/cache/etckeeper/packagelist" | |
13 | 13 | |||
14 | if etckeeper unclean; then | 14 | if etckeeper unclean; then | |
15 | - message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" | 15 | - message="committing changes in /etc after $HIGHLEVEL_PACKAGE_MANAGER run" | |
16 | + message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" | 16 | + message="committing changes in ${ETCKEEPER_DIR} after $HIGHLEVEL_PACKAGE_MANAGER run" | |
17 | 17 | |||
18 | set +e | 18 | set +e | |
19 | if [ -e $pl.pre-install ]; then | 19 | if [ -e $pl.pre-install ] && [ "$(cat $pl.fmt 2>/dev/null || true)" = "$(etckeeper list-installed fmt)" ]; then | |
20 | @@ -21,7 +21,7 @@ if etckeeper unclean; then | |||
21 | set -e | |||
22 | ||||
23 | if [ "$status" != 0 ]; then | |||
24 | - echo "warning: etckeeper failed to commit changes in /etc using $VCS" >&2 | |||
25 | + echo "warning: etckeeper failed to commit changes in ${ETCKEEPER_DIR} using $VCS" >&2 | |||
26 | fi | |||
27 | fi | |||
28 |
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | $NetBSD: patch-list-installed.d_50list-installed,v 1.1 2013/05/27 08:36:00 sbd Exp $ | 1 | $NetBSD: patch-list-installed.d_50list-installed,v 1.2 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Add pkg_install support. | 3 | Add pkg_install support. | |
4 | 4 | |||
5 | --- list-installed.d/50list-installed.orig 2011-02-22 20:19:36.000000000 +0000 | 5 | --- list-installed.d/50list-installed.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ list-installed.d/50list-installed | 6 | +++ list-installed.d/50list-installed | |
7 | @@ -2,7 +2,9 @@ | 7 | @@ -10,7 +10,9 @@ else | |
8 | # Output to stdout a *sorted* list of all currently installed | 8 | # Output to stdout a *sorted* list of all currently installed | |
9 | # (or removed but still with config-files) packages, in the | 9 | # (or removed but still with config-files) packages, in the | |
10 | # format "package version\n" (or something similar). | 10 | # format "package version\n" (or something similar). | |
11 | -if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then | 11 | - if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then | |
12 | +if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then | 12 | + if [ "$LOWLEVEL_PACKAGE_MANAGER" = pkg_install ]; then | |
13 | + pkg_info -a -I | awk '{print $1}' | sort | 13 | + pkg_info -a -I | awk '{print $1}' | sort | |
14 | +elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then | 14 | + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then | |
15 | dpkg-query -W -f '${Status}\t${Package} ${Version}\n' | \ | 15 | dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \ | |
16 | egrep '(ok installed|ok config-files)' | cut -f2,3 | 16 | egrep '(ok installed|ok config-files)' | cut -f2,3 | |
17 | elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then | 17 | elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then |
@@ -1,13 +1,14 @@ | @@ -1,13 +1,14 @@ | |||
1 | $NetBSD: patch-pre-install.d_10packagelist,v 1.1 2013/05/27 08:36:00 sbd Exp $ | 1 | $NetBSD: patch-pre-install.d_10packagelist,v 1.2 2017/05/20 01:05:05 schmonz Exp $ | |
2 | 2 | |||
3 | Add SUBST_VARS token. | 3 | Add SUBST_VARS token. | |
4 | 4 | |||
5 | --- pre-install.d/10packagelist.orig 2011-02-22 20:19:36.000000000 +0000 | 5 | --- pre-install.d/10packagelist.orig 2016-07-17 23:01:39.000000000 +0000 | |
6 | +++ pre-install.d/10packagelist | 6 | +++ pre-install.d/10packagelist | |
7 | @@ -1,4 +1,4 @@ | 7 | @@ -1,5 +1,5 @@ | |
8 | #!/bin/sh | 8 | #!/bin/sh | |
9 | # This list will be later used when committing. | 9 | # This list will be later used when committing. | |
10 | -mkdir -p /var/cache/etckeeper/ | 10 | -mkdir -p /var/cache/etckeeper/ | |
11 | -etckeeper list-installed > /var/cache/etckeeper/packagelist.pre-install | 11 | -etckeeper list-installed > /var/cache/etckeeper/packagelist.pre-install | |
12 | +mkdir -p @VARBASE@/cache/etckeeper/ | 12 | +mkdir -p @VARBASE@/cache/etckeeper/ | |
13 | +etckeeper list-installed > @VARBASE@/cache/etckeeper/packagelist.pre-install | 13 | +etckeeper list-installed > @VARBASE@/cache/etckeeper/packagelist.pre-install | |
14 | etckeeper list-installed fmt > /var/cache/etckeeper/packagelist.fmt |