diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
| commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
| tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /sys-apps/etckeeper/files | |
| parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) | |
gentoo resync : 05.02.2020
Diffstat (limited to 'sys-apps/etckeeper/files')
| -rw-r--r-- | sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 | ||||
| -rw-r--r-- | sys-apps/etckeeper/files/etckeeper.tmpfilesd | 1 |
2 files changed, 85 insertions, 0 deletions
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch new file mode 100644 index 000000000000..e677af993fe7 --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch @@ -0,0 +1,84 @@ +From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sun, 26 Jan 2020 23:24:54 -0800 +Subject: [PATCH] 1.18.14-gentoo + +--- + Makefile | 1 - + etckeeper.conf | 14 ++++++++++++-- + list-installed.d/50list-installed | 4 ++++ + update-ignore.d/01update-ignore | 4 ++++ + 4 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 73d2411..ffcf218 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,6 @@ 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" + echo "** installation successful" + + clean: etckeeper.spec etckeeper.version +diff --git a/etckeeper.conf b/etckeeper.conf +index f13de1c..16ff71d 100644 +--- a/etckeeper.conf ++++ b/etckeeper.conf +@@ -33,11 +33,21 @@ DARCS_COMMIT_OPTIONS="-a" + + # The high-level package manager that's being used. + # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc) +-HIGHLEVEL_PACKAGE_MANAGER=apt ++#HIGHLEVEL_PACKAGE_MANAGER=apt ++ ++# Gentoo specific: ++# For portage this is emerge ++# For paludis this is cave ++HIGHLEVEL_PACKAGE_MANAGER=emerge + + # The low-level package manager that's being used. + # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc) +-LOWLEVEL_PACKAGE_MANAGER=dpkg ++#LOWLEVEL_PACKAGE_MANAGER=dpkg ++ ++# Gentoo specific: ++# For portage this is qlist ++# For paludis this is cave ++LOWLEVEL_PACKAGE_MANAGER=qlist + + # To push each commit to a remote, put the name of the remote here. + # (eg, "origin" for git). Space-separated lists of multiple remotes +diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed +index d89b8ce..2db838d 100755 +--- a/list-installed.d/50list-installed ++++ b/list-installed.d/50list-installed +@@ -23,5 +23,9 @@ else + pkg info -E "*" + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then + apk info -v | sort ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then ++ qlist -ICv ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then ++ cave print-packages -r installed + fi + fi +diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore +index 8733a85..53afbde 100755 +--- a/update-ignore.d/01update-ignore ++++ b/update-ignore.d/01update-ignore +@@ -103,6 +103,10 @@ writefile () { + comment "new versions of conffiles, stored by apk" + ignore "*.apk-new" + nl ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then ++ comment "new and old versions of conffiles, stored by emerge" ++ ignore "._cfg*" ++ nl + fi + + comment "old versions of files" +-- +2.25.0 + diff --git a/sys-apps/etckeeper/files/etckeeper.tmpfilesd b/sys-apps/etckeeper/files/etckeeper.tmpfilesd new file mode 100644 index 000000000000..b13813d61984 --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper.tmpfilesd @@ -0,0 +1 @@ +d /var/cache/etckeeper 0770 root root - |