pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/etckeeper
Module Name: pkgsrc
Committed By: schmonz
Date: Thu Dec 22 13:40:10 UTC 2022
Modified Files:
pkgsrc/sysutils/etckeeper: Makefile PLIST distinfo
pkgsrc/sysutils/etckeeper/patches: patch-etckeeper patch-etckeeper.conf
patch-list-installed.d_50list-installed
patch-post-install.d_50vcs-commit
patch-pre-commit.d_20warn-problem-files
Log Message:
Update to 1.18.18. From the changelog:
1.18.18:
- Replace deprecated egrep with grep -E. Thanks, Sam James
- Added support for Void Linux's xbps package manager. Thanks,
Zev Weiss.
1.18.17:
- Fix committing of files with spaces in name when perl is not
available. Thanks, Henrik Riomar
- 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. Thanks, thm
pkgsrc changes:
- Adjust installed bash-completion location to match other packages
- Use MAKE_DIRS instead of OWN_DIRS so unchanged files are uninstalled
- Take MAINTAINER
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/etckeeper/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/etckeeper/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/etckeeper/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper
cvs rdiff -u -r1.4 -r1.5 \
pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf \
pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/sysutils/etckeeper/Makefile
diff -u pkgsrc/sysutils/etckeeper/Makefile:1.26 pkgsrc/sysutils/etckeeper/Makefile:1.27
--- pkgsrc/sysutils/etckeeper/Makefile:1.26 Thu Dec 22 13:17:20 2022
+++ pkgsrc/sysutils/etckeeper/Makefile Thu Dec 22 13:40:09 2022
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.26 2022/12/22 13:17:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2022/12/22 13:40:09 schmonz Exp $
#
-DISTNAME= etckeeper_1.18.16.orig
+DISTNAME= etckeeper_1.18.18.orig
PKGNAME= ${DISTNAME:S/_/-/:S/.orig$//}
-PKGREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/e/etckeeper/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+MAINTAINER= schmonz%NetBSD.org@localhost
HOMEPAGE= https://etckeeper.branchable.com/
COMMENT= Store /etc in git, mercurial, bzr or darcs
LICENSE= gnu-gpl-v2
@@ -24,9 +23,9 @@ BUILD_DEFS+= VARBASE
.include "cf-files.mk"
PKG_SYSCONFSUBDIR= etckeeper
-OWN_DIRS+= ${VARBASE}/cache/etckeeper
-OWN_DIRS+= ${PKG_SYSCONFDIR}
-OWN_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@}
+MAKE_DIRS+= ${VARBASE}/cache/etckeeper
+MAKE_DIRS+= ${PKG_SYSCONFDIR}
+MAKE_DIRS+= ${CF_FILES:H:O:u:S@^@${PKG_SYSCONFDIR}/@}
EGDIR= ${PREFIX}/share/examples/etckeeper
@@ -65,7 +64,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README.md \
${DESTDIR}${PREFIX}/share/doc/etckeeper/README.md
${INSTALL_DATA} ${WRKSRC}/bash_completion \
- ${DESTDIR}${PREFIX}/share/bash-completion.d/etckeeper
+ ${DESTDIR}${PREFIX}/share/bash-completion/completions/etckeeper
${INSTALL_DATA} ${WRKSRC}/zsh_completion \
${DESTDIR}${PREFIX}/share/zsh/site-functions/_etckeeper
Index: pkgsrc/sysutils/etckeeper/PLIST
diff -u pkgsrc/sysutils/etckeeper/PLIST:1.7 pkgsrc/sysutils/etckeeper/PLIST:1.8
--- pkgsrc/sysutils/etckeeper/PLIST:1.7 Tue Jan 4 15:22:53 2022
+++ pkgsrc/sysutils/etckeeper/PLIST Thu Dec 22 13:40:09 2022
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2022/01/04 15:22:53 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/12/22 13:40:09 schmonz Exp $
bin/etckeeper
man/man8/etckeeper.8
-share/bash-completion.d/etckeeper
+share/bash-completion/completions/etckeeper
share/doc/etckeeper/README.md
share/examples/etckeeper/commit.d/10vcs-test
share/examples/etckeeper/commit.d/20store-metadata
Index: pkgsrc/sysutils/etckeeper/distinfo
diff -u pkgsrc/sysutils/etckeeper/distinfo:1.15 pkgsrc/sysutils/etckeeper/distinfo:1.16
--- pkgsrc/sysutils/etckeeper/distinfo:1.15 Thu Jan 20 13:53:13 2022
+++ pkgsrc/sysutils/etckeeper/distinfo Thu Dec 22 13:40:09 2022
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.15 2022/01/20 13:53:13 schmonz Exp $
+$NetBSD: distinfo,v 1.16 2022/12/22 13:40:09 schmonz Exp $
-BLAKE2s (etckeeper_1.18.16.orig.tar.gz) = ca89e6a245ee04c17ee6bb2bad310edae94b1d51028cb1232d1cc914d4e26559
-SHA512 (etckeeper_1.18.16.orig.tar.gz) = 48a9f0089f72d62d68467b17a5a441dbf219c6b5b817b8ef2160b5f50eef6492257393c482a658ce11a97983ed037caa80b92e289049987bde5f8fbb22c98f07
-Size (etckeeper_1.18.16.orig.tar.gz) = 93638 bytes
+BLAKE2s (etckeeper_1.18.18.orig.tar.gz) = b157ebb36cfc0474002243b9eb7fbf40fe2ac9b0080d3a2182dac657d327acb1
+SHA512 (etckeeper_1.18.18.orig.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b
+Size (etckeeper_1.18.18.orig.tar.gz) = 101845 bytes
SHA1 (patch-bash__completion) = 95936127f98a76b4b7b66ddc170ba6c1e1e4c0d9
SHA1 (patch-commit.d_50vcs-commit) = 488487b4cc0d237c28118f592cda33c526b3b2d6
SHA1 (patch-daily) = d74eec9d1eca6d872a55aa1ecabf03d9a700f41d
-SHA1 (patch-etckeeper) = 1b152e2111a31ff3500b5fb457f0036d7cc0372f
+SHA1 (patch-etckeeper) = 816cff7f09a7add7fba72a06807dfe1d11d2b8f8
SHA1 (patch-etckeeper.8) = 7e72a7889e0478463eb2b304d2cadb44cd97aa52
-SHA1 (patch-etckeeper.conf) = 2ec40032b5c297b97fdd76b3309619319c5849c0
+SHA1 (patch-etckeeper.conf) = f726f2f1bb51184268ee7211f6dd055584877573
SHA1 (patch-init.d_40vcs-init) = 695ed382a955cf95f257a2cf9851133adee8be69
-SHA1 (patch-list-installed.d_50list-installed) = 70b336d70338c09db4445f22d7fc8256052e7384
-SHA1 (patch-post-install.d_50vcs-commit) = b5ec3cc950cbcee7a47c040442446e2074fe003f
-SHA1 (patch-pre-commit.d_20warn-problem-files) = dec9579886a32abd3d6ef0320ce21026bdf439ca
+SHA1 (patch-list-installed.d_50list-installed) = c11c40e6853beab31790b84053f75b1e32bbe0c7
+SHA1 (patch-post-install.d_50vcs-commit) = 12e0a94e6ca86578146b8173f03886069aff90c5
+SHA1 (patch-pre-commit.d_20warn-problem-files) = e4173da68d7dd7b5d89f03af1285665b23da65d1
SHA1 (patch-pre-commit.d_30store-metadata) = 2de44634a2ea5c4cac7e895e98d9396c1bc62df1
SHA1 (patch-pre-install.d_10packagelist) = c2a305746aca54091856c2b70543abd42410446a
SHA1 (patch-pre-install.d_50uncommitted-changes) = be883cd2fc9272c0df6d990fb1cf32b787d23a9d
Index: pkgsrc/sysutils/etckeeper/patches/patch-etckeeper
diff -u pkgsrc/sysutils/etckeeper/patches/patch-etckeeper:1.3 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper:1.4
--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper:1.3 Thu Jan 20 13:53:13 2022
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper Thu Dec 22 13:40:10 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-etckeeper,v 1.3 2022/01/20 13:53:13 schmonz Exp $
+$NetBSD: patch-etckeeper,v 1.4 2022/12/22 13:40:10 schmonz Exp $
Add SUBST_VARS tokens.
---- etckeeper.orig 2021-01-02 15:33:42.000000000 +0000
+--- etckeeper.orig 2022-09-08 16:13:15.000000000 +0000
+++ etckeeper
@@ -2,7 +2,7 @@
set -e
@@ -17,7 +17,7 @@ Add SUBST_VARS tokens.
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
+if echo "$command" | LANG=C @EGREP@ -q '[^-a-z_]'; then
echo "etckeeper: invalid command $command" >&2
exit 1
@@ -44,7 +44,7 @@ Add SUBST_VARS tokens.
# 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]+$"
+ echo "$script" | @EGREP@ -q "/[-a-zA-Z0-9]+$"
[ $? -eq 0 ] && "$script" "$@"
fi
Index: pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf
diff -u pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.4 pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.5
--- pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf:1.4 Sun Oct 7 10:52:40 2018
+++ pkgsrc/sysutils/etckeeper/patches/patch-etckeeper.conf Thu Dec 22 13:40:10 2022
@@ -1,18 +1,18 @@
-$NetBSD: patch-etckeeper.conf,v 1.4 2018/10/07 10:52:40 schmonz Exp $
+$NetBSD: patch-etckeeper.conf,v 1.5 2022/12/22 13:40:10 schmonz Exp $
Make pkg_install the package manager.
---- etckeeper.conf.orig 2018-06-05 20:04:03.000000000 +0000
+--- etckeeper.conf.orig 2022-09-08 16:13:15.000000000 +0000
+++ 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=pkg_add
# 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=pkg_install
Index: pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed
diff -u pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed:1.4 pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed:1.5
--- pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed:1.4 Fri Dec 31 10:04:24 2021
+++ pkgsrc/sysutils/etckeeper/patches/patch-list-installed.d_50list-installed Thu Dec 22 13:40:10 2022
@@ -1,10 +1,10 @@
-$NetBSD: patch-list-installed.d_50list-installed,v 1.4 2021/12/31 10:04:24 schmonz Exp $
+$NetBSD: patch-list-installed.d_50list-installed,v 1.5 2022/12/22 13:40:10 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.orig 2022-09-08 16:13:15.000000000 +0000
+++ list-installed.d/50list-installed
-@@ -10,9 +10,11 @@ else
+@@ -15,9 +15,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,7 +13,7 @@ Add pkg_install support.
+ 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
+- grep -E '(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
Index: pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit
diff -u pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.6 pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.7
--- pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit:1.6 Tue Jan 4 15:22:53 2022
+++ pkgsrc/sysutils/etckeeper/patches/patch-post-install.d_50vcs-commit Thu Dec 22 13:40:10 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-post-install.d_50vcs-commit,v 1.6 2022/01/04 15:22:53 schmonz Exp $
+$NetBSD: patch-post-install.d_50vcs-commit,v 1.7 2022/12/22 13:40:10 schmonz Exp $
Add SUBST_VARS token.
---- post-install.d/50vcs-commit.orig 2021-01-02 15:33:42.000000000 +0000
+--- post-install.d/50vcs-commit.orig 2022-09-08 16:13:15.000000000 +0000
+++ post-install.d/50vcs-commit
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -13,7 +13,7 @@ Add SUBST_VARS token.
# Parent process is etckeeper
# (Only procps ps is currently supported, others will fail,
-@@ -53,7 +53,7 @@ get_changed_packages () {
+@@ -56,7 +56,7 @@ get_changed_packages () {
if etckeeper unclean; then
if [ -z "${ETCKEEPER_PARENT_COMMAND_LINE}" ]; then
@@ -22,25 +22,25 @@ Add SUBST_VARS token.
else
message="committing changes in /etc made by \"$ETCKEEPER_PARENT_COMMAND_LINE\""
fi
-@@ -66,7 +66,7 @@ if etckeeper unclean; then
+@@ -69,7 +69,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
+ etckeeper list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' | 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
+@@ -77,7 +77,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 list-installed | diff -U0 $pl.pre-install - | tail -n+4 | @EGREP@ '^[-+]' || true
) | etckeeper commit --stdin
else
etckeeper commit "$(printf "$message")"
-@@ -83,7 +83,8 @@ if etckeeper unclean; then
+@@ -86,7 +86,8 @@ if etckeeper unclean; then
set -e
if [ "$status" != 0 ]; then
Index: pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files
diff -u pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files:1.1 pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files:1.2
--- pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files:1.1 Fri Dec 31 10:04:24 2021
+++ pkgsrc/sysutils/etckeeper/patches/patch-pre-commit.d_20warn-problem-files Thu Dec 22 13:40:10 2022
@@ -1,14 +1,14 @@
-$NetBSD: patch-pre-commit.d_20warn-problem-files,v 1.1 2021/12/31 10:04:24 schmonz Exp $
+$NetBSD: patch-pre-commit.d_20warn-problem-files,v 1.2 2022/12/22 13:40:10 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.orig 2022-09-08 16:13:15.000000000 +0000
+++ 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)/'
+ @EGREP@ -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/'
}
Home |
Main Index |
Thread Index |
Old Index