[pkgsrc/trunk]: pkgsrc/sysutils/etckeeper Use ${EGREP} instead of whatever "e...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/etckeeper Use ${EGREP} instead of whatever "e...
From: schmonz <schmonz%pkgsrc.org@localhost>
Date: Fri, 31 Dec 2021 10:58:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/914bf7cea8ad
branches:  trunk
changeset: 772008:914bf7cea8ad
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Fri Dec 31 10:04:24 2021 +0000

description:
Use ${EGREP} instead of whatever "egrep" happens to be at runtime. Fixes
"etckeeper init" on Solaris 11. Bump PKGREVISION.

diffstat:

 sysutils/etckeeper/Makefile                                        |   7 +-
 sysutils/etckeeper/distinfo                                        |   9 ++-
 sysutils/etckeeper/patches/patch-etckeeper                         |  24 ++++++++-
 sysutils/etckeeper/patches/patch-list-installed.d_50list-installed |   9 ++-
 sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit       |  15 +++++-
 sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files |  15 ++++++
 6 files changed, 63 insertions(+), 16 deletions(-)

diffs (177 lines):

diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/Makefile
--- a/sysutils/etckeeper/Makefile       Fri Dec 31 09:58:05 2021 +0000
+++ b/sysutils/etckeeper/Makefile       Fri Dec 31 10:04:24 2021 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2021/05/24 19:54:11 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2021/12/31 10:04:24 schmonz Exp $
 #
 
 DISTNAME=      etckeeper_1.18.14.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig$//}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
 
@@ -42,11 +42,12 @@
 SUBST_CLASSES+=                config
 SUBST_STAGE.config=    do-configure
 SUBST_FILES.config+=   etckeeper etckeeper.8
+SUBST_FILES.config+=   pre-commit.d/20warn-problem-files
 SUBST_FILES.config+=   pre-install.d/10packagelist
 SUBST_FILES.config+=   post-install.d/50vcs-commit
 SUBST_FILES.config+=   bash_completion zsh_completion
 SUBST_FILES.config+=   daily debian/cron.daily
-SUBST_VARS.config+=    PREFIX VARBASE PKG_SYSCONFBASEDIR PKG_SYSCONFDIR
+SUBST_VARS.config+=    PREFIX VARBASE PKG_SYSCONFBASEDIR PKG_SYSCONFDIR EGREP
 
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/etckeeper ${DESTDIR}${PREFIX}/bin
diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/distinfo
--- a/sysutils/etckeeper/distinfo       Fri Dec 31 09:58:05 2021 +0000
+++ b/sysutils/etckeeper/distinfo       Fri Dec 31 10:04:24 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2021/10/26 11:19:34 nia Exp $
+$NetBSD: distinfo,v 1.13 2021/12/31 10:04:24 schmonz Exp $
 
 BLAKE2s (etckeeper_1.18.14.orig.tar.gz) = c29e20f9c6bffe51a5c1c23add147b5cd88cc99ff35b1011bc2b56d2e8f56fc0
 SHA512 (etckeeper_1.18.14.orig.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
@@ -7,12 +7,13 @@
 SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
 SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
 SHA1 (patch-debian_cron.daily) = b702508cbb4dd42a3ae9f4a0b4be3a763edaf131
-SHA1 (patch-etckeeper) = 07a6b61b6c79096065953d22087c32ea5d776f2c
+SHA1 (patch-etckeeper) = 2a1224b57cbd1223b1be6f98de5ad4889bfec351
 SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
 SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0
 SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69
-SHA1 (patch-list-installed.d_50list-installed) = 0ab54aab49d2a81951c244632a076f1e0556f537
-SHA1 (patch-post-install.d_50vcs-commit) = a1b5cf25a9b3a421169dd8c5283f61b6dedad803
+SHA1 (patch-list-installed.d_50list-installed) = 70b336d70338c09db4445f22d7fc8256052e7384
+SHA1 (patch-post-install.d_50vcs-commit) = 3af5a1ec8b81e4ad9e9e251eef1c1b3bb4d30cbb
+SHA1 (patch-pre-commit.d_20warn-problem-files) = dec9579886a32abd3d6ef0320ce21026bdf439ca
 SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
 SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
 SHA1 (patch-update-ignore.d_01update-ignore) = 3e73493f268da3d40623fcd192d3da911357acee
diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/patches/patch-etckeeper
--- a/sysutils/etckeeper/patches/patch-etckeeper        Fri Dec 31 09:58:05 2021 +0000
+++ b/sysutils/etckeeper/patches/patch-etckeeper        Fri Dec 31 10:04:24 2021 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper,v 1.1 2013/05/27 08:36:00 sbd Exp $
+$NetBSD: patch-etckeeper,v 1.2 2021/12/31 10:04:24 schmonz Exp $
 
 Add SUBST_VARS tokens.
 
---- etckeeper.orig     2012-12-28 16:09:51.000000000 +0000
+--- etckeeper.orig     2020-01-22 13:59:54.000000000 +0000
 +++ etckeeper
 @@ -2,7 +2,7 @@
  set -e
@@ -13,7 +13,16 @@
  fi
  
  conf="$ETCKEEPER_CONF_DIR/etckeeper.conf"
-@@ -86,7 +86,7 @@ if [ "x$1" = "x-d" ]; then
+@@ -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 @EGREP@ -q '[^-a-z_]'; then
+       echo "etckeeper: invalid command $command" >&2
+       exit 1
+ fi
+@@ -104,7 +104,7 @@ if [ "x$1" = "x-d" ]; then
  fi
  
  if [ -z "$ETCKEEPER_DIR" ]; then
@@ -22,3 +31,12 @@
  fi
  cd "$ETCKEEPER_DIR"
  export ETCKEEPER_DIR
+@@ -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" | @EGREP@ -q "/[-a-zA-Z0-9]+$"
+                       [ $? -eq 0 ] && "$script" "$@"
+               fi
+       done
diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/patches/patch-list-installed.d_50list-installed
--- a/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed        Fri Dec 31 09:58:05 2021 +0000
+++ b/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed        Fri Dec 31 10:04:24 2021 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-list-installed.d_50list-installed,v 1.3 2020/09/17 08:50:01 schmonz Exp $
+$NetBSD: patch-list-installed.d_50list-installed,v 1.4 2021/12/31 10:04:24 schmonz Exp $
 
 Add pkg_install support.
 
 --- list-installed.d/50list-installed.orig     2020-01-22 13:59:54.000000000 +0000
 +++ list-installed.d/50list-installed
-@@ -10,7 +10,9 @@ else
+@@ -10,9 +10,11 @@ else
        # Output to stdout a *sorted* list of all currently installed 
        # (or removed but still with config-files) packages, in the
        # format "package version\n" (or something similar).
@@ -13,5 +13,8 @@
 +              pkg_info -a -I | awk '{print $1}' | sed -e 's|\(.*\)-|\1 |' | sort
 +      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then
                dpkg-query -W -f '${Status}\t${Package} ${Version} ${Architecture}\n' | \
-                       egrep '(ok installed|ok config-files)' | cut -f2,3
+-                      egrep '(ok installed|ok config-files)' | cut -f2,3
++                      @EGREP@ '(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
diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
--- a/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit      Fri Dec 31 09:58:05 2021 +0000
+++ b/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit      Fri Dec 31 10:04:24 2021 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.4 2019/11/17 11:57:16 mef Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.5 2021/12/31 10:04:24 schmonz Exp $
 
 Add SUBST_VARS token.
 
---- post-install.d/50vcs-commit.orig   2018-12-24 02:06:45.000000000 +0900
-+++ post-install.d/50vcs-commit        2019-11-17 20:52:49.545914431 +0900
+--- post-install.d/50vcs-commit.orig   2020-01-22 13:59:54.000000000 +0000
++++ post-install.d/50vcs-commit
 @@ -1,7 +1,7 @@
  #!/bin/sh
  set -e
@@ -22,6 +22,15 @@
        else
                message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
        fi
+@@ -27,7 +27,7 @@ if etckeeper unclean; then
+                       echo "$message"
+                       echo
+                       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 | @EGREP@ '^[-+]' || true
+               ) | etckeeper commit --stdin
+       else
+               etckeeper commit "$(printf "$message")"
 @@ -36,7 +36,8 @@ if etckeeper unclean; then
        set -e
  
diff -r bc43739a1219 -r 914bf7cea8ad sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files        Fri Dec 31 10:04:24 2021 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-pre-commit.d_20warn-problem-files,v 1.1 2021/12/31 10:04:24 schmonz Exp $
+
+Add SUBST_VARS tokens.
+
+--- pre-commit.d/20warn-problem-files.orig     2020-01-22 13:59:54.000000000 +0000
++++ pre-commit.d/20warn-problem-files
+@@ -2,7 +2,7 @@
+ set -e
+ 
+ exclude_internal () {
+-      egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
++      @EGREP@ -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
+ }
+ 
+ if [ "$VCS" = bzr ] || [ "$VCS" = darcs ]; then
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/mosquitto to 2.0.14
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/etckeeper to 1.18.14nb2
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated net/mosquitto to 2.0.14
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated sysutils/etckeeper to 1.18.14nb2
Indexes:
Home | Main Index | Thread Index | Old Index