mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-05 04:16:46 +02:00
community/etckeeper: upgrade to 1.18.8
This commit is contained in:
Henrik Riomar
parent
966b293d6d
commit
91917558bb
@ -1,102 +0,0 @@
|
||||
From e19e9c51f63fdf6c836310bacf4a7d5caebdd55f Mon Sep 17 00:00:00 2001
|
||||
From: Joey Hess <joeyh@joeyh.name>
|
||||
Date: Thu, 8 Jun 2017 13:26:34 -0400
|
||||
Subject: [PATCH] Work around git commit's lack of robustness, by providing
|
||||
reasonable default values for GIT_COMMITTER_EMAIL etc.
|
||||
|
||||
This was already done as part of the su/sudo handling, and is now always
|
||||
done.
|
||||
|
||||
This commit was sponsored by Trenton Cronholm on Patreon.
|
||||
---
|
||||
commit.d/50vcs-commit | 9 +++++++-
|
||||
debian/changelog | 9 ++++++++
|
||||
...___be_set_under_undocumented_circumstances.mdwn | 2 ++
|
||||
...ent_1_f8399058ebbf3059000e6528296cc1e9._comment | 26 ++++++++++++++++++++++
|
||||
4 files changed, 45 insertions(+), 1 deletion(-)
|
||||
create mode 100644 doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment
|
||||
|
||||
diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
|
||||
index 55f0db2..f970d3d 100755
|
||||
--- a/commit.d/50vcs-commit
|
||||
+++ b/commit.d/50vcs-commit
|
||||
@@ -41,9 +41,16 @@ else
|
||||
fi
|
||||
|
||||
if [ "$VCS" = git ] && [ -d .git ]; then
|
||||
+ # When not su'd to root, still set environment variables,
|
||||
+ # since git's own code to determine the author and committer
|
||||
+ # has several edge cases where it fails and would prevent the
|
||||
+ # commit.
|
||||
+ if [ -z "$USER" ]; then
|
||||
+ USER="$(whoami)"
|
||||
+ fi
|
||||
if [ -n "$USER" ]; then
|
||||
# Use user.name and user.email from the gitconfig belonging
|
||||
- # to the user who became root.
|
||||
+ # to USER.
|
||||
USER_HOME="$(getent passwd "$USER" | cut -d: -f6)"
|
||||
if [ -n "$USER_HOME" ] && [ -e "$USER_HOME/.gitconfig" ]; then
|
||||
if [ -z "$GIT_AUTHOR_NAME" ]; then
|
||||
diff --git a/debian/changelog b/debian/changelog
|
||||
index 23783bd..46df223 100644
|
||||
--- a/debian/changelog
|
||||
+++ b/debian/changelog
|
||||
@@ -1,3 +1,12 @@
|
||||
+etckeeper (1.18.8) UNRELEASED; urgency=medium
|
||||
+
|
||||
+ * Work around git commit's lack of robustness, by providing
|
||||
+ reasonable default values for GIT_COMMITTER_EMAIL etc.
|
||||
+ This was already done as part of the su/sudo handling,
|
||||
+ and is now always done.
|
||||
+
|
||||
+ -- Joey Hess <id@joeyh.name> Thu, 08 Jun 2017 13:22:01 -0400
|
||||
+
|
||||
etckeeper (1.18.7) unstable; urgency=medium
|
||||
|
||||
* Added some unit tests.
|
||||
diff --git a/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn b/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn
|
||||
index 93177d8..5ddd8ad 100644
|
||||
--- a/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn
|
||||
+++ b/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances.mdwn
|
||||
@@ -34,3 +34,5 @@ This is not Ansible-specific: the last two conditions will also arise in the dai
|
||||
|
||||
|
||||
IMO, considering how to document this behaviour shows it to be user-unfriendly. Therefore, it would be simplest if etckeeper could fall back to using `$(id -un)`, once `$(tty)` fails.
|
||||
+
|
||||
+> Set `USER=$(whoami)`, for git only. [[done]] --[[Joey]]
|
||||
diff --git a/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment b/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment
|
||||
new file mode 100644
|
||||
index 0000000..16e907f
|
||||
--- /dev/null
|
||||
+++ b/doc/todo/requires___96__user.email__96___be_set_under_undocumented_circumstances/comment_1_f8399058ebbf3059000e6528296cc1e9._comment
|
||||
@@ -0,0 +1,26 @@
|
||||
+[[!comment format=mdwn
|
||||
+ username="joey"
|
||||
+ subject="""comment 1"""
|
||||
+ date="2017-06-08T17:00:19Z"
|
||||
+ content="""
|
||||
+What actually requires user.email be set under
|
||||
+undocumented circumstances? git does. Personally, I feel this is a total
|
||||
+misfeature on git's part; git commit should succeed under all
|
||||
+configuraations. Every single program that automates `git commit`
|
||||
+is potentially buggy otherwise.
|
||||
+
|
||||
+Anyway, yes, setting `USER=$(id -un)` (or whoami) would make
|
||||
+the code that currently is used to handle sudo users be always
|
||||
+run, and so git and any other VCSs that break in unusual circumstances
|
||||
+would always work (at least as far as username and email goes, who knows
|
||||
+what other requirements VCSs may have).
|
||||
+
|
||||
+The downside is that this could change etckeeper's behavior, since
|
||||
+it would now be guessing at the user name and email, and may make
|
||||
+different choices than git does.
|
||||
+
|
||||
+Setting USER would also impact the code for other VCSs than git. For
|
||||
+example, the code for hg always sets HGUSER when USER is set. I don't know
|
||||
+if the others VCSs are as picky as git; if this kind of breakage is not a
|
||||
+problem for them it might be best to only set USER when using git.
|
||||
+"""]]
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
# Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
|
||||
|
||||
pkgname=etckeeper
|
||||
pkgver=1.18.7
|
||||
pkgrel=2
|
||||
pkgver=1.18.8
|
||||
pkgrel=0
|
||||
pkgdesc="Store /etc in git."
|
||||
url="http://etckeeper.branchable.com"
|
||||
arch="noarch"
|
||||
@ -15,7 +15,6 @@ options="!checkroot"
|
||||
install="$pkgname.post-install $pkgname.pre-deinstall"
|
||||
source="$pkgname-$pkgver.tar.gz::https://git.joeyh.name/index.cgi/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz
|
||||
apk-commit_hook
|
||||
0001-Work-around-git-commit-s-lack-of-robustness-by-provi.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$pkgver"
|
||||
|
||||
@ -47,6 +46,5 @@ package() {
|
||||
"$pkgdir"/etc/apk/commit_hooks.d/"$pkgname"
|
||||
}
|
||||
|
||||
sha512sums="44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a etckeeper-1.18.7.tar.gz
|
||||
d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940 apk-commit_hook
|
||||
d4aa516f7b35c2eddd5c534391fd6363429633aea3b4b2e8e46b1fe192986c79f91bf9e3e808992ce524ffc3ac96cc3952d1a1e7c3b355b7f97ffa9badc8b8d0 0001-Work-around-git-commit-s-lack-of-robustness-by-provi.patch"
|
||||
sha512sums="35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c etckeeper-1.18.8.tar.gz
|
||||
d0ff88615359e8b03da5f9162a7bae3f32c06891a8899096025283d77e950dd72280c6c19b8eb8a4cde08742c6ca715cd32c37c16e8bbf2d030e9fd16a1fc940 apk-commit_hook"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user