PKRoma · rouben · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016 · Jul 17, 2016
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-debian/changelog merge=dpkg-mergechangelogs
+CHANGELOG merge=dpkg-mergechangelogs
diff --git a/debian/changelog → CHANGELOG b/debian/changelog → CHANGELOG
@@ -1,3 +1,211 @@
+etckeeper (1.18.18) UNRELEASED; urgency=medium
+
+  * Replace deprecated egrep with grep -E.
+    Thanks, Sam James
+  * Added support for Void Linux's xbps package manager.
+    Thanks, Zev Weiss.
+
+ -- Joey Hess <id@joeyh.name>  Wed, 18 May 2022 12:50:08 -0400
+
+etckeeper (1.18.17) upstream; urgency=medium
+
+  * Fix committing of files with spaces in name when perl is not available.
+    Thanks, Henrik Riomar
+  * Ignore udev's FHS violating large binary cache file /etc/udev/hwdb.bin
+  * Avoid warning messages from grep about binary files when there are
+    filenames in /etc that do not correspond to the current locale settings.
+    Thanks, thm
+
+ -- Joey Hess <id@joeyh.name>  Fri, 07 Jan 2022 11:15:07 -0400
+
+etckeeper (1.18.16) upstream; urgency=medium
+
+  * Improve sorting stability.
+  * Prefer mktemp over tempfile as the latter displays a deprecation
+    warning since debianutils 4.10.
+    Thanks, Luke Mlsna.
+
+ -- Joey Hess <id@joeyh.name>  Sat, 02 Jan 2021 11:31:23 -0400
+
+etckeeper (1.18.15) upstream; urgency=medium
+
+  * Use "command -v" rather than "which" to detect installed programs,
+    as it is more portable.
+    Thanks, Eli Schwartz.
+  * Improve commit messages generated by package manager changes,
+    listing packages that are responsible for the changed config files.
+    Thanks to emkael for the patch.
+  * If gc.auto is not configured, override the default to make it gc
+    ten times more frequently, to avoid wasting space with loose objects.
+  * update-ignore: Preserve permissions from any preexisting VCS ignore file.
+    Thanks, Austin Chu.
+  * Removed the debian directory from the upstream source package as it's
+    not being maintained; see the debian package for an up-to-date one.
+  * debian/changelog moved to CHANGELOG and debian/copyright to COPYRIGHT.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 23 Nov 2020 12:19:15 -0400
+
+etckeeper (1.18.14) unstable; urgency=medium
+
+  * pacman 5.2 deprecated File hooks, use Path.
+    Thanks, Christian Hesse
+  * Fix vcs subcommand setup for zsh completion.
+    Thanks, James Rowe.
+
+ -- Joey Hess <id@joeyh.name>  Wed, 22 Jan 2020 09:59:04 -0400
+
+etckeeper (1.18.13) unstable; urgency=medium
+
+  * Added zsh completion.
+    Thanks, James Rowe
+  * commit: Recent changes added code that does not work on all POSIX shells.
+    Fixed by Thorsten Glaser.
+
+ -- Joey Hess <id@joeyh.name>  Fri, 20 Dec 2019 16:19:09 -0400
+
+etckeeper (1.18.12) unstable; urgency=medium
+
+  * Fix bug in hostname determination in the previous release.
+    Thanks, Christian Hesse
+
+ -- Joey Hess <id@joeyh.name>  Fri, 29 Nov 2019 11:42:34 -0400
+
+etckeeper (1.18.11) unstable; urgency=medium
+
+  * Support platforms without a hostname command, fall back to 
+    reading /etc/hostname.
+    Thanks, Chris Morgan
+  * commit: Support -mmessage, without a space, since eg git commit
+    can be used that way.
+    Thanks, martin f. krafft
+  * commit: When multiple parameters are given, use them all as the commit
+    message, instead of the old behavior of only using the first parameter and
+    throwing the rest away.
+    Thanks, martin f. krafft
+
+ -- Joey Hess <id@joeyh.name>  Thu, 28 Nov 2019 18:14:46 -0400
+
+etckeeper (1.18.10) unstable; urgency=medium
+
+  * Avoid post-install failing when ps is from busybox or another
+    version not supporting procps-specific options.
+  * Use ps --no-headers rather than problimatic -h option.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 23 Dec 2018 13:05:44 -0400
+
+etckeeper (1.18.9) unstable; urgency=medium
+
+  * When run during a package installation, include in the commit
+    message the command line that caused etckeeper to run.
+    Thanks, Laszlo Gombos
+
+ -- Joey Hess <id@joeyh.name>  Wed, 12 Dec 2018 01:01:05 -0400
+
+etckeeper (1.18.8) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Tue, 05 Jun 2018 16:00:41 -0400
+
+etckeeper (1.18.7) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Thu, 08 Jun 2017 12:58:20 -0400
+
+etckeeper (1.18.6) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 29 Jan 2017 14:37:24 -0400
+
+etckeeper (1.18.5) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Sun, 17 Jul 2016 18:53:54 -0400
+
+etckeeper (1.18.4) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 20 Jun 2016 01:05:30 -0400
+
+etckeeper (1.18.3) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 15 Feb 2016 13:11:20 -0400
+
+etckeeper (1.18.2) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Tue, 04 Aug 2015 10:13:08 -0400
+
+etckeeper (1.18.1) unstable; urgency=medium
+
+  * Add myself as maintainer (Closes: #768516)
+  * Keeping the package native as I do not intend to diverge from
+    upstream.
+  * Update git URL in control file.
+
+ -- Antoine Beaupré <anarcat@debian.org>  Sat, 21 Mar 2015 18:30:07 -0400
+
+etckeeper (1.18) unstable; urgency=medium
+
+  * 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.
+
+ -- Joey Hess <id@joeyh.name>  Sat, 14 Mar 2015 13:24:07 -0400
+
 etckeeper (1.17) unstable; urgency=medium
 
   * Fix name of DNF plugin.

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -0,0 +1,34 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files: *
+Copyright: © 2007-2014 Joey Hess <id@joeyh.name> and contributors
+License: GPL-2+
+ The full text of the GPL is distributed as doc/GPL in etckeeper's source,
+ and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
+
+Files: pkgng/*
+Copyright: 2015 William Johansson <radar@radhuset.org>
+           2012 Marin Atanasov Nikolov <dnaeon@gmail.com>
+License: BSD-2-clause
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile b/Makefile
@@ -9,11 +9,16 @@ bindir=${prefix}/bin
 etcdir=/etc
 mandir=${prefix}/share/man
 vardir=/var
+systemddir=/lib/systemd/system
+bashcompletiondir=${prefix}/share/bash-completion/completions
+zshcompletiondir=${prefix}/share/zsh/vendor-completions
 CP=cp -R
 INSTALL=install 
 INSTALL_EXE=${INSTALL}
 INSTALL_DATA=${INSTALL} -m 0644
 PYTHON=python
+FAKEROOT := $(shell command -v fakeroot 2> /dev/null)
+TESTDIR := $(shell mktemp -u -d)
 
 build: etckeeper.spec etckeeper.version
 	-$(PYTHON) ./etckeeper-bzr/__init__.py build || echo "** bzr support not built"
@@ -22,19 +27,30 @@ build: etckeeper.spec etckeeper.version
 install: etckeeper.version
 	mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/
 	$(CP) *.d $(DESTDIR)$(etcdir)/etckeeper/
+	$(INSTALL_EXE) daily $(DESTDIR)$(etcdir)/etckeeper/daily
 	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
 	mkdir -p $(DESTDIR)$(bindir)
 	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
 	mkdir -p $(DESTDIR)$(mandir)/man8
 	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
-	mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d
-	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
+	mkdir -p $(DESTDIR)$(bashcompletiondir)
+	$(INSTALL_DATA) bash_completion $(DESTDIR)$(bashcompletiondir)/etckeeper
+	mkdir -p $(DESTDIR)$(zshcompletiondir)
+	$(INSTALL_DATA) zsh_completion $(DESTDIR)$(zshcompletiondir)/_etckeeper
+	mkdir -p $(DESTDIR)$(systemddir)
+	$(INSTALL_DATA) systemd/etckeeper.service $(DESTDIR)$(systemddir)/etckeeper.service
+	$(INSTALL_DATA) systemd/etckeeper.timer $(DESTDIR)$(systemddir)/etckeeper.timer
 ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
 	mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d
 	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
 	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex
 	$(INSTALL_DATA) cruft_filter $(DESTDIR)$(etcdir)/cruft/filters-unex/etckeeper
 endif
+ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman)
+	mkdir -p $(DESTDIR)$(prefix)/share/libalpm/hooks
+	$(INSTALL_DATA) ./pacman-pre-install.hook $(DESTDIR)$(prefix)/share/libalpm/hooks/05-etckeeper-pre-install.hook
+	$(INSTALL_DATA) ./pacman-post-install.hook $(DESTDIR)$(prefix)/share/libalpm/hooks/zz-etckeeper-post-install.hook
+endif
 ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2)
 	mkdir -p $(DESTDIR)$(etcdir)/pacman-g2/hooks
 	$(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper
@@ -58,12 +74,21 @@ endif
 clean: etckeeper.spec etckeeper.version
 	rm -rf build
 
+test:
+	mkdir $(TESTDIR)
+ifdef FAKEROOT
+	testdir=$(TESTDIR) fakeroot ./test-etckeeper
+else
+	testdir=$(TESTDIR) ./test-etckeeper
+endif
+	rm -rf $(TESTDIR)
+
 etckeeper.spec:
-	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" etckeeper.spec
+	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;m/\((.*?)(-.*)?\)/;print $$1;'<CHANGELOG)/" etckeeper.spec
 	rm -f etckeeper.spec~
 
 etckeeper.version:
-	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)\"/" etckeeper
+	sed -i~ "s/Version:.*/Version: $$(perl -e '$$_=<>;m/\((.*?)(-.*)?\)/;print $$1;' <CHANGELOG)\"/" etckeeper
 	rm -f etckeeper~
 
 .PHONY: etckeeper.spec etckeeper.version
diff --git a/commit.d/20store-metadata b/commit.d/20store-metadata
@@ -0,0 +1 @@
+../pre-commit.d/30store-metadata