From 469b5d8f31adfd054c5c493fc3df2f9c89c9fa00 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Nov 2022 15:30:13 +0000 Subject: gentoo auto-resync : 11:11:2022 - 15:30:13 --- .../etckeeper/files/etckeeper-1.18.14-gentoo.patch | 84 --------------------- .../files/etckeeper-1.18.17-egrep-deprecated.patch | 85 ---------------------- 2 files changed, 169 deletions(-) delete mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch delete mode 100644 sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch (limited to 'sys-apps/etckeeper/files') diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch deleted file mode 100644 index e677af993fe7..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.14-gentoo.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 46e299da6914962007fb540a401a68a17d00bca3 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -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-1.18.17-egrep-deprecated.patch b/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch deleted file mode 100644 index c329deb0f5c4..000000000000 --- a/sys-apps/etckeeper/files/etckeeper-1.18.17-egrep-deprecated.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 0338d14862cdf5c50be451809af94232d8ca60a8 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Sun, 15 May 2022 01:12:05 +0000 -Subject: [PATCH] Replace obsolete usage of 'egrep' with 'grep -E' - -egrep is considered deprecated (and is an alias to grep -E), -so replace it with grep -E. ---- a/doc/todo/regex_in_20-warn-problem-files.mdwn -+++ b/doc/todo/regex_in_20-warn-problem-files.mdwn -@@ -1,11 +1,11 @@ - exclude_internal () { -- egrep -v '(^|/)(.git|.hg|.bzr|_darcs)/' -+ grep -E -v '(^|/)(.git|.hg|.bzr|_darcs)/' - } - - should probably escape the `.`s. - - exclude_internal () { -- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' -+ grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' - } - - > [[fixed|done]] --[[Joey]] ---- a/etckeeper -+++ b/etckeeper -@@ -84,7 +84,7 @@ elif [ "$command" = "pre-apt" ]; then - command=pre-install - fi - --if echo "$command" | LANG=C egrep -q '[^-a-z_]'; then -+if echo "$command" | LANG=C grep -E -q '[^-a-z_]'; then - echo "etckeeper: invalid command $command" >&2 - exit 1 - fi -@@ -142,7 +142,7 @@ else - # fallback if perl isn't present - for script in $ETCKEEPER_CONF_DIR/$command.d/*; do - if [ ! -d "$script" -a -x "$script" ]; then -- echo "$script" | egrep -q "/[-a-zA-Z0-9]+$" -+ echo "$script" | grep -E -q "/[-a-zA-Z0-9]+$" - [ $? -eq 0 ] && "$script" "$@" - fi - done ---- a/list-installed.d/50list-installed -+++ b/list-installed.d/50list-installed -@@ -17,7 +17,7 @@ else - # format "package version\n" (or something similar). - if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then - dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \ -- egrep '(ok installed|ok config-files)' | cut -f2,3 -+ grep -E '(ok installed|ok config-files)' | cut -f2,3 - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then - rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort - elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then ---- a/post-install.d/50vcs-commit -+++ b/post-install.d/50vcs-commit -@@ -66,7 +66,7 @@ if etckeeper unclean; then - get_changed_packages | sort | uniq > $pl.found-pkgs - if [ -s $pl.found-pkgs ]; then - sed -i 's/^/^[-+]/;s/$/ /' $pl.found-pkgs -- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages -+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' | grep -f $pl.found-pkgs > $pl.found-packages - if [ -s $pl.found-packages ]; then - echo "Packages with configuration changes:" - cat $pl.found-packages || true -@@ -74,7 +74,7 @@ if etckeeper unclean; then - fi - fi - echo "Package changes:" -- etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | egrep '^[-+]' || true -+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | grep -E '^[-+]' || true - ) | etckeeper commit --stdin - else - etckeeper commit "$(printf "$message")" ---- a/pre-commit.d/20warn-problem-files -+++ b/pre-commit.d/20warn-problem-files -@@ -2,7 +2,7 @@ - set -e - - exclude_internal () { -- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' -+ grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' - } - - if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then -- cgit v1.2.3