Bug#862168: unblock: password-store/1.6.5-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock password-store 1.6.5-6, which fixes an RC bug. The
changes are confined to test code.
diff -Nru password-store-1.6.5/debian/.git-dpm password-store-1.6.5/debian/.git-dpm
--- password-store-1.6.5/debian/.git-dpm 2017-04-20 00:49:09.000000000 +0100
+++ password-store-1.6.5/debian/.git-dpm 2017-05-09 11:43:19.000000000 +0100
@@ -1,6 +1,6 @@
# see git-dpm(1) from git-dpm package
-fdec5624f1a289331b29cc914dab167b2e68bc2a
-fdec5624f1a289331b29cc914dab167b2e68bc2a
+d838a62bd675ae5c92e73b81852f577c5af77595
+d838a62bd675ae5c92e73b81852f577c5af77595
544bf5ad85872798b13f80b6cfb007f24a4294c1
544bf5ad85872798b13f80b6cfb007f24a4294c1
password-store_1.6.5.orig.tar.xz
diff -Nru password-store-1.6.5/debian/changelog password-store-1.6.5/debian/changelog
--- password-store-1.6.5/debian/changelog 2017-04-20 00:50:19.000000000 +0100
+++ password-store-1.6.5/debian/changelog 2017-05-09 11:45:54.000000000 +0100
@@ -1,3 +1,10 @@
+password-store (1.6.5-6) unstable; urgency=medium
+
+ * Ensure that GNUPGHOME is set to a short enough path while running tests
+ (closes: #862071).
+
+ -- Colin Watson <cjwatson@debian.org> Tue, 09 May 2017 11:45:54 +0100
+
password-store (1.6.5-5) unstable; urgency=medium
* Cherry-pick from upstream:
diff -Nru password-store-1.6.5/debian/patches/series password-store-1.6.5/debian/patches/series
--- password-store-1.6.5/debian/patches/series 2017-04-20 00:49:09.000000000 +0100
+++ password-store-1.6.5/debian/patches/series 2017-05-09 11:43:19.000000000 +0100
@@ -1,3 +1,5 @@
editor.patch
gnupg1-support.patch
init-avoid-extraneous-reencryption.patch
+test-reencryption-match-pubkey.patch
+temporary-gnupghome.patch
diff -Nru password-store-1.6.5/debian/patches/temporary-gnupghome.patch password-store-1.6.5/debian/patches/temporary-gnupghome.patch
--- password-store-1.6.5/debian/patches/temporary-gnupghome.patch 1970-01-01 01:00:00.000000000 +0100
+++ password-store-1.6.5/debian/patches/temporary-gnupghome.patch 2017-05-09 11:43:19.000000000 +0100
@@ -0,0 +1,35 @@
+From d838a62bd675ae5c92e73b81852f577c5af77595 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Tue, 9 May 2017 11:17:53 +0100
+Subject: Copy tests/gnupg/ into trash directory for tests
+
+gpg2 currently creates a Unix socket in GNUPGHOME, which therefore needs
+to fit in 108 bytes (the maximum length for a Unix socket path).
+Copying tests/gnupg/ into the temporary trash directory makes it easier
+to set things up so that it's always in a short enough path, as well as
+avoiding accidental pollution by tests.
+
+Bug-Debian: https://bugs.debian.org/862071
+Forwarded: https://lists.zx2c4.com/pipermail/password-store/2017-May/002934.html
+Last-Update: 2017-05-09
+
+Patch-Name: temporary-gnupghome.patch
+---
+ tests/setup.sh | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/setup.sh b/tests/setup.sh
+index 779f14a..f388326 100644
+--- a/tests/setup.sh
++++ b/tests/setup.sh
+@@ -33,7 +33,9 @@ if [[ ! -e $PASS ]]; then
+ fi
+
+ # Note: the assumption is the test key is unencrypted.
+-export GNUPGHOME="$TEST_HOME/gnupg/"
++rm -rf "$SHARNESS_TRASH_DIRECTORY/gnupg"
++cp -a "$TEST_HOME/gnupg" "$SHARNESS_TRASH_DIRECTORY/gnupg"
++export GNUPGHOME="$SHARNESS_TRASH_DIRECTORY/gnupg/"
+ chmod 700 "$GNUPGHOME"
+ GPG="gpg"
+ which gpg2 &>/dev/null && GPG="gpg2"
diff -Nru password-store-1.6.5/debian/patches/test-reencryption-match-pubkey.patch password-store-1.6.5/debian/patches/test-reencryption-match-pubkey.patch
--- password-store-1.6.5/debian/patches/test-reencryption-match-pubkey.patch 1970-01-01 01:00:00.000000000 +0100
+++ password-store-1.6.5/debian/patches/test-reencryption-match-pubkey.patch 2017-05-09 11:43:19.000000000 +0100
@@ -0,0 +1,30 @@
+From 543dceb790d2f50044be0f2a9394bc5c1186b968 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Tue, 9 May 2017 11:14:06 +0100
+Subject: Match only the public key in reencryption tests
+
+This is the same fix as in a09d6685e609f9a11fa2b9b5904d39ef8966b3b7, but
+in one more place. gpg2 might need to start an agent in the context of
+this test, for example if running the test in isolation.
+
+Forwarded: https://lists.zx2c4.com/pipermail/password-store/2017-May/002933.html
+Last-Update: 2015-05-09
+
+Patch-Name: test-reencryption-match-pubkey.patch
+---
+ tests/t0300-reencryption.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh
+index 58d6931..e1c9d79 100755
+--- a/tests/t0300-reencryption.sh
++++ b/tests/t0300-reencryption.sh
+@@ -10,7 +10,7 @@ canonicalize_gpg_keys() {
+ $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u
+ }
+ gpg_keys_from_encrypted_file() {
+- $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u
++ LC_ALL=C $GPG -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$1" 2>&1 | sed -n 's/^gpg: public key is \([A-F0-9]\+\)$/\1/p' | LC_ALL=C sort -u
+ }
+ gpg_keys_from_group() {
+ local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)"
diff -Nru password-store-1.6.5/debian/rules password-store-1.6.5/debian/rules
--- password-store-1.6.5/debian/rules 2017-04-20 00:49:09.000000000 +0100
+++ password-store-1.6.5/debian/rules 2017-05-09 11:43:47.000000000 +0100
@@ -2,6 +2,14 @@
%:
dh $@ --with=python2
+override_dh_auto_test:
+ set -e; \
+ tmp="$$(mktemp -d)"; \
+ code=0; \
+ dh_auto_test -- PASS_TEST_OPTS="--root=$$tmp" || code="$$?"; \
+ rm -rf "$$tmp"; \
+ exit "$$code"
+
override_dh_auto_install:
$(MAKE) DESTDIR=$$(pwd)/debian/pass PREFIX=/usr \
ZSHCOMP_PATH=$$(pwd)/debian/pass/usr/share/zsh/vendor-completions \
unblock password-store/1.6.5-6
--
Colin Watson [cjwatson@debian.org]
Reply to: