[Pkg-privacy-commits] [Git][pkg-privacy-team/monkeysphere][debian/stretch] Prevent a FTBFS by updating the tests to accommodate an updated GnuPG in...

[Chris Lamb]

Chris Lamb pushed to branch debian/stretch at Privacy Maintainers / monkeysphere


Commits:
3f1e8ef7 by Chris Lamb at 2019-08-14T17:18:06Z
Prevent a FTBFS by updating the tests to accommodate an updated GnuPG in stretch now producing a different output. (Closes: #934034)

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/0001-Prevent-a-FTBFS-by-updating-the-tests-to-accommodate.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+monkeysphere (0.41-1+deb9u1) stretch; urgency=medium
+
+  * Prevent a FTBFS by updating the tests to accommodate an updated GnuPG in
+    stretch now producing a different output. (Closes: #934034)
+
+ -- Chris Lamb <lamby at debian.org>  Wed, 14 Aug 2019 10:09:00 -0700
+
 monkeysphere (0.41-1) unstable; urgency=medium
 
   * new upstream release


=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends:
  cpio,
  debhelper (>= 10~),
  dpkg-dev (>= 1.17.14),
- gnupg <!nocheck>,
+ gnupg (>= 2.1.18-8~deb9u4) <!nocheck>,
  gnupg-agent <!nocheck>,
  libassuan-dev,
  libcrypt-openssl-rsa-perl <!nocheck>,


=====================================
debian/patches/0001-Prevent-a-FTBFS-by-updating-the-tests-to-accommodate.patch
=====================================
@@ -0,0 +1,60 @@
+From: Chris Lamb <lamby at debian.org>
+Date: Wed, 14 Aug 2019 10:16:24 -0700
+Subject: Prevent a FTBFS by updating the tests to accommodate an updated
+ GnuPG in stretch now producing a different output. (Closes: #934034)
+
+---
+ tests/keytrans | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tests/keytrans b/tests/keytrans
+index fd9a144..5b23a16 100755
+--- a/tests/keytrans
++++ b/tests/keytrans
+@@ -137,9 +137,9 @@ gpg --list-keys
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
+ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
+ EOF
+ 
+ diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -vE '^(tru|fpr):' | sed 's/:*$//')
+@@ -165,10 +165,10 @@ gpg --list-keys
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x::$KEYFPR:::8
+ EOF
+ 
+ 
+@@ -196,15 +196,15 @@ PEM2OPENPGP_TIMESTAMP="$timestamp" \
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x::$KEYFPR:::8
+ uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x::$KEYFPR:::8
+ pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA
+ uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar
+-sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8
++sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x::$NEWKEYFPR:::8
+ EOF
+ 
+ echo "test: diff expected gpg list output"


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Prevent-a-FTBFS-by-updating-the-tests-to-accommodate.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/commit/3f1e8ef77f2d1daa99fa7c7fbece6f0874ce33e0

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/monkeysphere/commit/3f1e8ef77f2d1daa99fa7c7fbece6f0874ce33e0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20190816/70bd2515/attachment-0001.html>