From 62cc731696d235c24ada8e7b0589bff0ad3bedaeb1de772844938093b1cc7072 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 13 Oct 2022 08:47:46 +0000 Subject: [PATCH] Accepting request 1006674 from home:awerlang - Update to 1.18.18: * Replace deprecated egrep with grep -E. * Added support for Void Linux's xbps package manager. - Update to 1.18.17: * Fix committing of files with spaces in name when perl is not available. * 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. - Update to 1.18.16: * Improve sorting stability. * Prefer mktemp over tempfile as the latter displays a deprecation warning since debianutils 4.10. - Update to 1.18.15: * Use "command -v" rather than "which" to detect installed programs, as it is more portable. * Improve commit messages generated by package manager changes, listing packages that are responsible for the changed config files. * 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. * 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. - Rebase patches: * etckeeper-avoid-packagelist.patch * etckeeper-set-package-manager.patch OBS-URL: https://build.opensuse.org/request/show/1006674 OBS-URL: https://build.opensuse.org/package/show/utilities/etckeeper?expand=0&rev=26 --- etckeeper-1.18.14.tar.gz | 3 --- etckeeper-1.18.18.tar.gz | 3 +++ etckeeper-avoid-packagelist.patch | 2 +- etckeeper-set-package-manager.patch | 4 ++-- etckeeper.changes | 30 +++++++++++++++++++++++++++++ etckeeper.spec | 2 +- 6 files changed, 37 insertions(+), 7 deletions(-) delete mode 100644 etckeeper-1.18.14.tar.gz create mode 100644 etckeeper-1.18.18.tar.gz diff --git a/etckeeper-1.18.14.tar.gz b/etckeeper-1.18.14.tar.gz deleted file mode 100644 index d59918f..0000000 --- a/etckeeper-1.18.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15924673fa3f15e4b172f9f0111a442ed3f0ee99dcf9ad3c5107736ffb8c1089 -size 93528 diff --git a/etckeeper-1.18.18.tar.gz b/etckeeper-1.18.18.tar.gz new file mode 100644 index 0000000..116f71a --- /dev/null +++ b/etckeeper-1.18.18.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:390c82d1fcfaf4cac5a3ca6fffb16fea0e1ada31a1bfe20220ac3b317d663f61 +size 101845 diff --git a/etckeeper-avoid-packagelist.patch b/etckeeper-avoid-packagelist.patch index 8a09f66..bd51bef 100644 --- a/etckeeper-avoid-packagelist.patch +++ b/etckeeper-avoid-packagelist.patch @@ -21,7 +21,7 @@ Index: etckeeper-1.18.5/etckeeper @@ -126,6 +126,13 @@ export VCS - if [ "$(which perl 2>/dev/null)" != "" ]; then + if command -v perl >/dev/null; then + #If environment variable ETCKEEPER_AVOID_PACKAGELIST is not null, + # AVOID_PACKAGELIST in etckeeper.conf is overridden here. + if [ -n "$ETCKEEPER_AVOID_PACKAGELIST" ]; then diff --git a/etckeeper-set-package-manager.patch b/etckeeper-set-package-manager.patch index 0e4bc1b..f6e1449 100644 --- a/etckeeper-set-package-manager.patch +++ b/etckeeper-set-package-manager.patch @@ -5,12 +5,12 @@ Index: etckeeper-1.18.8/etckeeper.conf @@ -33,11 +33,11 @@ DARCS_COMMIT_OPTIONS="-a" # The high-level package manager that's being used. - # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc) + # (apt, pacman, pacman-g2, yum, dnf, zypper, apk, xbps etc) -HIGHLEVEL_PACKAGE_MANAGER=apt +HIGHLEVEL_PACKAGE_MANAGER=zypper # The low-level package manager that's being used. - # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc) + # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk, xbps etc) -LOWLEVEL_PACKAGE_MANAGER=dpkg +LOWLEVEL_PACKAGE_MANAGER=rpm diff --git a/etckeeper.changes b/etckeeper.changes index 632de57..4fcf8e3 100644 --- a/etckeeper.changes +++ b/etckeeper.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon Sep 26 02:32:00 UTC 2022 - André Werlang + +- Update to 1.18.18: + * Replace deprecated egrep with grep -E. + * Added support for Void Linux's xbps package manager. +- Update to 1.18.17: + * Fix committing of files with spaces in name when perl is not available. + * 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. +- Update to 1.18.16: + * Improve sorting stability. + * Prefer mktemp over tempfile as the latter displays a deprecation + warning since debianutils 4.10. +- Update to 1.18.15: + * Use "command -v" rather than "which" to detect installed programs, + as it is more portable. + * Improve commit messages generated by package manager changes, + listing packages that are responsible for the changed config files. + * 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. + * 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. +- Rebase patches: + * etckeeper-avoid-packagelist.patch + * etckeeper-set-package-manager.patch + ------------------------------------------------------------------- Wed Feb 12 09:28:21 UTC 2020 - Paolo Stivanin diff --git a/etckeeper.spec b/etckeeper.spec index d241f49..78a0cbd 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -34,7 +34,7 @@ %define make_args systemddir=%{_unitdir} PYTHON=%{python_versioned} %{python_args} Name: etckeeper -Version: 1.18.14 +Version: 1.18.18 Release: 0 Summary: Store /etc under Version Control License: GPL-2.0-or-later