Date: Monday, November 23, 2020 @ 18:38:44 Author: eworm Revision: 760091
archrelease: copy trunk to community-testing-any Added: etckeeper/repos/community-testing-any/ etckeeper/repos/community-testing-any/0001-breezy.patch (from rev 760090, etckeeper/trunk/0001-breezy.patch) etckeeper/repos/community-testing-any/PKGBUILD (from rev 760090, etckeeper/trunk/PKGBUILD) -------------------+ 0001-breezy.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 43 ++++++++++++++++++++++++++++++++++++ 2 files changed, 105 insertions(+) Copied: etckeeper/repos/community-testing-any/0001-breezy.patch (from rev 760090, etckeeper/trunk/0001-breezy.patch) =================================================================== --- community-testing-any/0001-breezy.patch (rev 0) +++ community-testing-any/0001-breezy.patch 2020-11-23 18:38:44 UTC (rev 760091) @@ -0,0 +1,62 @@ +diff --git a/Makefile b/Makefile +index 73d2411..7e545ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ 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" ++ -$(PYTHON) ./etckeeper-brz/__init__.py build || echo "** brz support not built" + -$(PYTHON) ./etckeeper-dnf/etckeeper.py build || echo "** DNF support not built" + + install: etckeeper.version +@@ -68,7 +68,7 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper) + mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit + $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py + endif +- -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" ++ -$(PYTHON) ./etckeeper-brz/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** brz support not installed" + echo "** installation successful" + + clean: etckeeper.spec etckeeper.version +diff --git a/etckeeper-brz/__init__.py b/etckeeper-brz/__init__.py +new file mode 100644 +index 0000000..5f04ba6 +--- /dev/null ++++ b/etckeeper-brz/__init__.py +@@ -0,0 +1,34 @@ ++# ++# Breezy plugin that runs etckeeper pre-commit when necessary ++ ++"""Runs etckeeper pre-commit when necessary.""" ++ ++from breezy.errors import BzrError ++import os ++ ++def etckeeper_startcommit_hook(tree): ++ abspath = getattr(tree, "abspath", None) ++ if abspath is None or not os.path.exists(abspath(".etckeeper")): ++ # Only run the commit hook when this is an etckeeper branch ++ return ++ import subprocess ++ ret = subprocess.call(["etckeeper", "pre-commit", abspath(".")]) ++ if ret != 0: ++ raise BzrError("etckeeper pre-commit failed") ++ ++try: ++ from breezy.hooks import install_lazy_named_hook ++except ImportError: ++ from breezy.mutabletree import MutableTree ++ MutableTree.hooks.install_named_hook('start_commit', ++ etckeeper_startcommit_hook, 'etckeeper') ++else: ++ install_lazy_named_hook( ++ "breezy.mutabletree", "MutableTree.hooks", ++ 'start_commit', etckeeper_startcommit_hook, 'etckeeper') ++ ++if __name__ == "__main__": ++ from distutils.core import setup ++ setup(name="brz-etckeeper", ++ packages=["breezy.plugins.etckeeper"], ++ package_dir={"breezy.plugins.etckeeper":"etckeeper-brz"}) Copied: etckeeper/repos/community-testing-any/PKGBUILD (from rev 760090, etckeeper/trunk/PKGBUILD) =================================================================== --- community-testing-any/PKGBUILD (rev 0) +++ community-testing-any/PKGBUILD 2020-11-23 18:38:44 UTC (rev 760091) @@ -0,0 +1,43 @@ +# Maintainer: Christian Hesse <m...@eworm.de> +# Contributor: mathieu.clabaut <mathieu.clab...@gmail.com> +# Contributor: Buce <dmb...@gmail.com> +# Contributor: Danie Roux <accou...@danieroux.com> + +pkgname=etckeeper +_tag='a89f0aff21f7d63609a39504801da42e2fce2ed2' # git rev-parse ${pkgver} +pkgver=1.18.15 +pkgrel=1 +pkgdesc='Collection of tools to let /etc be stored in a git, hg or bzr repository' +arch=('any') +url='https://etckeeper.branchable.com/' +license=('GPL2') +depends=('git' 'diffutils' 'sed') +makedepends=('mercurial' 'breezy') +optdepends=('mercurial: use mercurial for version control' + 'breezy: use bazaar for version control' + 'which: etckeeper vcs <subcommand> support') +backup=('etc/etckeeper/etckeeper.conf') +source=("git+https://git.kitenet.net/git/etckeeper.git#tag=${_tag}?signed" + '0001-breezy.patch') +sha256sums=('SKIP' + 'fbfce54167828db00a2dcec02cf75c5df32302fae5411fd68dfb1a521675be6c') +validpgpkeys=('E85A5F63B31D24C1EBF0D81CC910D9222512E3C7') # Joey Hess <jo...@joeyh.name> + +prepare() { + cd ${pkgname} + + patch -Np1 < ../0001-breezy.patch +} + +build() { + cd ${pkgname} + + # We want pacman :D + sed -i -e "/^LOWLEVEL_PACKAGE_MANAGER/c LOWLEVEL_PACKAGE_MANAGER=pacman" \ + -e "/^HIGHLEVEL_PACKAGE_MANAGER/c HIGHLEVEL_PACKAGE_MANAGER=pacman" etckeeper.conf +} + +package() { + cd ${pkgname} + make DESTDIR="${pkgdir}" systemddir=/usr/lib/systemd/system install +}