From: Rob Browning <rlb@defaultvalue.org>
Date: Mon, 17 Dec 2018 17:58:49 +0000 (-0600)
Subject: Fix epg-tests with upstream patch for newer GnuPG
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~181
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=160e568d2f45752725ad2b00ea2d03a199169e6b;p=emacs.git

Fix epg-tests with upstream patch for newer GnuPG

Add 0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch to
fix the problem.
---

160e568d2f45752725ad2b00ea2d03a199169e6b
diff --cc debian/.git-dpm
index f9da0b0a3b6,00000000000..3c79b2386ff
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- bda90e2ab5203feb938188cbd8e029c9b2a467db
- bda90e2ab5203feb938188cbd8e029c9b2a467db
++d13836843d9f34fa308d83bf3dd09ee9d00e142d
++d13836843d9f34fa308d83bf3dd09ee9d00e142d
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +511a2cebd6df0f71ec24b5939564fb58726ead84
 +emacs_26.1+1.orig.tar.xz
 +9318da32923e8a4a17ee23113302ff509c0d4056
 +24259708
diff --cc debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
index 00000000000,00000000000..641715f10e6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch
@@@ -1,0 -1,0 +1,33 @@@
++From d13836843d9f34fa308d83bf3dd09ee9d00e142d Mon Sep 17 00:00:00 2001
++From: Glenn Morris <rgm@gnu.org>
++Date: Fri, 14 Dec 2018 20:09:02 -0500
++Subject: An epg test failure with recent GnuPG versions has been fixed
++
++This patch has been backported from upstream to fix m68k build
++failures:
++
++  Fix an epg test for recent GnuPG versions (bug#33439)
++
++  * test/lisp/epg-tests.el (epg-decrypt-1):
++  Tell recent GnuPG (e.g. 2.2.11) not to worry about missing MDC.
++
++Origin: backport, commit: fa953b58afd39d396dab4d76a6ff0b8ba4040eb8)
++Bug: https://debbugs.gnu.org/33439
++Forwarded: not-needed
++---
++ test/lisp/epg-tests.el | 2 ++
++ 1 file changed, 2 insertions(+)
++
++diff --git a/test/lisp/epg-tests.el b/test/lisp/epg-tests.el
++index 0fe15017dd0..f2cc351d70b 100644
++--- a/test/lisp/epg-tests.el
+++++ b/test/lisp/epg-tests.el
++@@ -87,6 +87,8 @@ epg-tests-passphrase-callback
++ (ert-deftest epg-decrypt-1 ()
++   (skip-unless (epg-tests-find-usable-gpg-configuration 'require-passphrase))
++   (with-epg-tests (:require-passphrase t)
+++    (with-temp-file (expand-file-name "gpg.conf" epg-tests-home-directory)
+++      (insert "ignore-mdc-error"))
++     (should (equal "test"
++ 		   (epg-decrypt-string epg-tests-context "\
++ -----BEGIN PGP MESSAGE-----
diff --cc debian/patches/series
index 81a8bab0f43,00000000000..aab53542d34
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,9 @@@
 +0001-Prefer-usr-share-info-emacs.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
++0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch