sup 0.19.0 → 0.23

data/test/fixtures/contacts.txt

@@ -0,0 +1 @@
+RC: Random Contact <random_dude@gmail.com>

data/test/fixtures/mailing-list-header.eml

@@ -0,0 +1,80 @@
+Return-Path: <bounce+67613+84234+3618174+8024896@lists.openembedded.org>
+Delivered-To: unknown
+Received: (qmail 702 invoked from network); 7 May 2020 06:15:54 -0000
+Received: from web01.groups.io (HELO web01.groups.io) (66.175.222.12)  by
+ server-33.tower-414.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384
+ encrypted SMTP; 7 May 2020 06:15:54 -0000
+From: "Yu, Mingli" <mingli.yu@windriver.com>
+To: <openembedded-devel@lists.openembedded.org>
+Subject:
+ [oe] [meta-python][PATCH] python3-ntplib: add missing python3-io RDEPENDS
+Date: Thu, 7 May 2020 14:15:26 +0800
+Message-ID: <1588832126-393701-1-git-send-email-mingli.yu@windriver.com>
+Precedence: Bulk
+List-Unsubscribe: <https://lists.openembedded.org/g/openembedded-devel/unsub>
+Sender: <openembedded-devel@lists.openembedded.org>
+List-Id: <openembedded-devel.lists.openembedded.org>
+Mailing-List: list openembedded-devel@lists.openembedded.org; contact
+ openembedded-devel+owner@lists.openembedded.org
+Delivered-To: mailing list openembedded-devel@lists.openembedded.org
+Reply-To: <openembedded-devel@lists.openembedded.org>
+Content-Type: multipart/mixed; boundary="YleAvGBsp4tLsYxU5fi4"
+MIME-Version: 1.0
+
+--YleAvGBsp4tLsYxU5fi4
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+
+From: Mingli Yu <mingli.yu@windriver.com>
+
+Add the missing python3-io RDEPENDS to fix
+below error:
+ # python3
+Python 3.8.2 (default, Apr 27 2020, 08:51:00)
+[GCC 9.3.0] on linux
+Type "help", "copyright", "credits" or "license" for more information.
+>>> import ntplib
+Traceback (most recent call last):
+File "<stdin>", line 1, in <module>
+File "/usr/lib64/python3.8/site-packages/ntplib.py", line 32, in <module>
+import socket
+ModuleNotFoundError: No module named 'socket'
+
+Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
+---
+ meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb b/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
+index 93df83a..ce2618b 100644
+--- a/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
++++ b/meta-python/recipes-devtools/python/python3-ntplib_0.3.3.bb
+@@ -11,4 +11,4 @@ S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+ inherit setuptools3 python3native pypi
+
+-RDEPENDS_${PN} += "${PYTHON_PN}-datetime"
++RDEPENDS_${PN} += "${PYTHON_PN}-datetime ${PYTHON_PN}-io"
+--
+2.7.4
+
+
+--YleAvGBsp4tLsYxU5fi4
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: inline
+
+-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
+Links: You receive all messages sent to this group.
+
+View/Reply Online (#84234): https://lists.openembedded.org/g/openembedded-d=
+evel/message/84234
+Mute This Topic: https://lists.openembedded.org/mt/74045486/3618174
+Group Owner: openembedded-devel+owner@lists.openembedded.org
+Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/leave/8024=
+896/1667129725/xyzzy  [dan.callaghan@opengear.com]
+-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-
+
+--YleAvGBsp4tLsYxU5fi4--
+

data/test/fixtures/malicious-attachment-names.eml

@@ -0,0 +1,55 @@
+From: Matthieu Rakotojaona <matthieu.rakotojaona@gmail.com>
+To: reply+0007a7cb7174d1d188fcd420fce83e0f68fe03fc7416cdae92cf0000000110ce4efd92a169ce033d18e1 <reply+0007a7cb7174d1d188fcd420fce83e0f68fe03fc7416cdae92cf0000000110ce4efd92a169ce033d18e1@reply.github.com>
+Subject: Re: [sup] Attachment saving and special characters in filenames (#378)
+In-reply-to: <sup-heliotrope/sup/issues/378@github.com>
+References: <sup-heliotrope/sup/issues/378@github.com>
+X-pgp-key: http://otokar.looc2011.eu/static/matthieu.rakotojaona.asc
+Date: Wed, 14 Jan 2015 22:13:37 +0100
+Message-Id: <1421269972-sup-5245@kpad>
+User-Agent: Sup/git
+Content-Transfer-Encoding: 8bit
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="=-1421270017-526778-1064-1628-1-="
+
+
+--=-1421270017-526778-1064-1628-1-=
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Excerpts from Felix Kaiser's message of 2015-01-14 16:36:29 +0100:
+> When saving attachments, sup should replace special characters when suggesting a filename to save the attachment to.
+>
+> I just got an attachment with a name like "foo/2.pdf". sup suggests saving it to /home/fxkr/foo/2.pdf (and fails to save it, of course, if /home/fxkr/foo isn't a directory).
+>
+> I haven't tested the "Save All" feature, but I hope nothing bad happens when there's an attachment called "../../../../../../../home/fxkr/.bashrc" ;-)
+>
+> ---
+> Reply to this email directly or view it on GitHub:
+> https://github.com/sup-heliotrope/sup/issues/378
+
+For tests, here's an email with an attachment filename set to
+sup/.travis.yml (really, this time)
+
+--
+Matthieu Rakotojaona
+
+--=-1421270017-526778-1064-1628-1-=
+Content-Disposition: attachment; filename="sup/.travis.yml"
+Content-Type: text/x-yaml; name="sup/.travis.yml"
+Content-Transfer-Encoding: 8bit
+
+language: ruby
+
+rvm:
+  - 2.1.1
+  - 2.0.0
+  - 1.9.3
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq uuid-dev uuid libncursesw5-dev libncursesw5 gnupg2 pandoc
+  - git submodule update --init --recursive
+
+script: bundle exec rake travis
+
+--=-1421270017-526778-1064-1628-1-=--

data/test/fixtures/missing-from-to.eml

@@ -0,0 +1,18 @@
+Return-path: <fake_sender@example.invalid>
+Envelope-to: fake_receiver@localhost
+Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
+Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
+      (envelope-from <fake_sender@example.invalid>)
+      id 1J1S8R-0006lA-MJ
+      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
+Date: Sun, 9 Dec 2007 21:48:19 +0200
+Subject: Re: Test message subject
+Message-ID: <20071209194819.GA25972@example.invalid>
+References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+User-Agent: Sup/0.3
+
+Test message!

data/test/fixtures/multi-part-2.eml

@@ -0,0 +1,72 @@
+Return-path: <vim-mac-return-3938-fake_receiver=localhost@vim.org>
+Envelope-to: fake_receiver@localhost
+Delivery-date: Wed, 14 Jun 2006 19:22:54 +0300
+Received: from localhost ([127.0.0.1] helo=localhost.localdomain)
+  by localhost.localdomain with esmtp (Exim 4.60)
+  (envelope-from <vim-mac-return-3938-fake_receiver=localhost@vim.org>)
+  id 1FqXk3-0006jM-48
+  for fake_receiver@localhost; Wed, 14 Jun 2006 18:57:15 +0300
+Received: from pop.gmail.com
+  by localhost.localdomain with POP3 (fetchmail-6.3.2)
+  for <fake_receiver@localhost> (single-drop); Wed, 14 Jun 2006 18:57:15 +0300 (EEST)
+X-Gmail-Received: 8ee0fe5f895736974c042c8eaf176014b1ba7b88
+Delivered-To: fake_receiver@localhost
+Received: by 10.49.8.16 with SMTP id l16cs11327nfi;
+        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
+Received: by 10.66.224.8 with SMTP id w8mr2172862ugg;
+        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
+Received: from foobar.math.fu-berlin.de (foobar.math.fu-berlin.de [160.45.45.151])
+        by mx.gmail.com with SMTP id j3si553645ugd.2006.03.26.19.31.56;
+        Sun, 26 Mar 2006 19:31:56 -0800 (PST)
+Received-SPF: neutral (gmail.com: 160.45.45.151 is neither permitted nor denied by best guess record for domain of vim-mac-return-3938-fake_receiver=localhost@vim.org)
+Message-Id: <44275cac.74a494f1.315a.ffff825cSMTPIN_ADDED@mx.gmail.com>
+Received: (qmail 24265 invoked by uid 200); 27 Mar 2006 02:32:39 -0000
+Mailing-List: contact vim-mac-help@vim.org; run by ezmlm
+Precedence: bulk
+Delivered-To: mailing list vim-mac@vim.org
+Received: (qmail 7913 invoked from network); 26 Mar 2006 23:37:34 -0000
+Received: from cpe-138-217-96-243.vic.bigpond.net.au (HELO vim.org) (138.217.96.243)
+  by foobar.math.fu-berlin.de with SMTP; 26 Mar 2006 23:37:34 -0000
+From: fake_sender@example.invalid
+To: vim-mac@vim.org
+Subject: Mail Delivery (failure vim-mac@vim.org)
+Date: Mon, 27 Mar 2006 10:29:39 +1000
+MIME-Version: 1.0
+Content-Type: multipart/related;
+  type="multipart/alternative";
+  boundary="----=_NextPart_000_001B_01C0CA80.6B015D10"
+X-Priority: 3
+X-MSMail-Priority: Normal
+
+------=_NextPart_000_001B_01C0CA80.6B015D10
+Content-Type: multipart/alternative;
+  boundary="----=_NextPart_001_001C_01C0CA80.6B015D10"
+
+------=_NextPart_001_001C_01C0CA80.6B015D10
+Content-Type: text/plain;
+  charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+------=_NextPart_001_001C_01C0CA80.6B015D10
+Content-Type: text/html;
+  charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META content=3D"text/html; charset=3Diso-8859-1" =
+http-equiv=3DContent-Type>
+<META content=3D"MSHTML 5.00.2920.0" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>If the message will not displayed automatically,<br>
+follow the link to read the delivered message.<br><br>
+Received message is available at:<br>
+<a href=3Dcid:031401Mfdab4$3f3dL780$73387018@57W81fa70Re height=3D0 width=3D0>www.vim.org/inbox/vim-mac/read.php?sessionid-18559</a>
+<iframe
+src=3Dcid:031401Mfdab4$3f3dL780$73387018@57W81fa70Re height=3D0 width=3D0></iframe>
+<DIV>&nbsp;</DIV></BODY></HTML>
+
+------=_NextPart_001_001C_01C0CA80.6B015D10--
+
+------=_NextPart_000_001B_01C0CA80.6B015D10--

data/test/fixtures/multi-part.eml

@@ -0,0 +1,61 @@
+From fake_receiver@localhost Sun Dec 09 22:33:37 +0200 2007
+Subject: Re: Test message subject
+From: Fake Receiver <fake_receiver@localhost>
+To: Fake Sender <fake_sender@example.invalid>
+References: <E1J1Rvb-0006k2-CE@localhost.localdomain> <20071209194819.GA25972example.invalid>
+In-Reply-To: <20071209194819.GA25972example.invalid>
+Date: Sun, 09 Dec 2007 22:33:37 +0200
+Message-Id: <1197232243-sup-2663example.invalid>
+User-Agent: Sup/0.3
+Content-Type: multipart/mixed; boundary="=-1197232418-506707-26079-6122-2-="
+MIME-Version: 1.0
+
+
+--=-1197232418-506707-26079-6122-2-=
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+
+Excerpts from Fake Sender's message of Sun Dec 09 21:48:19 +0200 2007:
+> Test message!
+
+Thanks for the message!
+--=-1197232418-506707-26079-6122-2-=
+Content-Disposition: attachment; filename="HACKING"
+Content-Type: application/octet-stream; name="HACKING"
+Content-Transfer-Encoding: base64
+
+UnVubmluZyBTdXAgbG9jYWxseQotLS0tLS0tLS0tLS0tLS0tLS0tCkludm9r
+ZSBpdCBsaWtlIHRoaXM6CgpydWJ5IC1JIGxpYiAtdyBiaW4vc3VwCgpZb3Un
+bGwgaGF2ZSB0byBpbnN0YWxsIGFsbCBnZW1zIG1lbnRpb25lZCBpbiB0aGUg
+UmFrZWZpbGUgKGxvb2sgZm9yIHRoZSBsaW5lCnNldHRpbmcgcC5leHRyYV9k
+ZXBzKS4gSWYgeW91J3JlIG9uIGEgRGViaWFuIG9yIERlYmlhbi1iYXNlZCBz
+eXN0ZW0gKGUuZy4KVWJ1bnR1KSwgeW91J2xsIGhhdmUgdG8gbWFrZSBzdXJl
+IHlvdSBoYXZlIGEgY29tcGxldGUgUnVieSBpbnN0YWxsYXRpb24sCmVzcGVj
+aWFsbHkgbGlic3NsLXJ1YnkuCgpDb2Rpbmcgc3RhbmRhcmRzCi0tLS0tLS0t
+LS0tLS0tLS0KCi0gRG9uJ3Qgd3JhcCBjb2RlIHVubGVzcyBpdCByZWFsbHkg
+YmVuZWZpdHMgZnJvbSBpdC4gVGhlIGRheXMgb2YKICA4MC1jb2x1bW4gZGlz
+cGxheXMgYXJlIGxvbmcgb3Zlci4gQnV0IGRvIHdyYXAgY29tbWVudHMgYW5k
+IG90aGVyCiAgdGV4dCBhdCB3aGF0ZXZlciBFbWFjcyBtZXRhLVEgZG9lcy4K
+LSBJIGxpa2UgcG9ldHJ5IG1vZGUuCi0gVXNlIHt9IGZvciBvbmUtbGluZXIg
+YmxvY2tzIGFuZCBkby9lbmQgZm9yIG11bHRpLWxpbmUgYmxvY2tzLgoK
+
+--=-1197232418-506707-26079-6122-2-=
+Content-Disposition: attachment; filename="Manifest.txt"
+Content-Type: text/plain; name="Manifest.txt"
+Content-Transfer-Encoding: quoted-printable
+
+HACKING
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+bin/sup
+bin/sup-add
+bin/sup-config
+bin/sup-dump
+bin/sup-recover-sources
+bin/sup-sync
+bin/sup-sync-back
+
+--=-1197232418-506707-26079-6122-2-=--

data/test/fixtures/no-body.eml

@@ -0,0 +1,18 @@
+Return-path: <fake_sender@example.invalid>
+From: Fake Sender <fake_sender@example.invalid>
+To: Fake Receiver <fake_receiver@localhost>
+Envelope-to: fake_receiver@localhost
+Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
+Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
+      (envelope-from <fake_sender@example.invalid>)
+      id 1J1S8R-0006lA-MJ
+      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
+Date: Sun, 9 Dec 2007 21:48:19 +0200
+Subject: Re: Test message subject
+Message-ID: <20071209194819.GA25972@example.invalid>
+References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+User-Agent: Sup/0.3

data/test/fixtures/simple-message.eml

@@ -0,0 +1,29 @@
+Return-path: <fake_sender@example.invalid>
+Envelope-to: fake_receiver@localhost
+Delivery-date: Sun, 09 Dec 2007 21:48:19 +0200
+Received: from fake_sender by localhost.localdomain with local (Exim 4.67)
+      (envelope-from <fake_sender@example.invalid>)
+      id 1J1S8R-0006lA-MJ
+      for fake_receiver@localhost; Sun, 09 Dec 2007 21:48:19 +0200
+Date: Sun, 9 Dec 2007 21:48:19 +0200
+Mailing-List: contact example-help@example.invalid; run by ezmlm
+Precedence: bulk
+List-Id: <example.list-id.example.invalid>
+List-Post: <mailto:example@example.invalid>
+List-Help: <mailto:example-help@example.invalid>
+List-Unsubscribe: <mailto:example-unsubscribe@example.invalid>
+List-Subscribe: <mailto:example-subscribe@example.invalid>
+Delivered-To: mailing list example@example.invalid
+Delivered-To: moderator for example@example.invalid
+From: Fake Sender <fake_sender@example.invalid>
+To: Fake Receiver <fake_receiver@localhost>
+Subject: Re: Test message subject
+Message-ID: <20071209194819.GA25972@example.invalid>
+References: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+In-Reply-To: <E1J1Rvb-0006k2-CE@localhost.localdomain>
+User-Agent: Sup/0.3
+
+Test message!

data/test/fixtures/text-attachments-with-charset.eml

@@ -0,0 +1,46 @@
+From: Fake Sender <fake_sender@example.invalid>
+To: Fake Receiver <fake_receiver@localhost>
+Date: Sun, 21 Jun 2020 06:25:49 -0000
+Subject: Attachments with charset
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="===============2385509127900810307=="
+
+--===============2385509127900810307==
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 7bit
+
+This is the body.
+
+--===============2385509127900810307==
+Content-Type: text/plain; charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+Content-Disposition: attachment; filename="ascii.txt"
+
+This is ASCII
+
+--===============2385509127900810307==
+Content-Type: text/plain; charset="koi8-r"
+Content-Transfer-Encoding: quoted-printable
+MIME-Version: 1.0
+Content-Disposition: attachment; filename="cyrillic.txt"
+
+=F0=D2=C9=D7=C5=D4
+
+--===============2385509127900810307==
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+MIME-Version: 1.0
+Content-Disposition: attachment; filename="emoji.txt"
+
+8J+Yggo=
+
+--===============2385509127900810307==
+Content-Type: text/plain
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment; filename="bad.txt"
+MIME-Version: 1.0
+
+Embedded=F0garbage
+--===============2385509127900810307==--
+

data/test/fixtures/zimbra-quote-with-bottom-post.eml

@@ -0,0 +1,27 @@
+Return-Path: <zimbra.user@example.invalid>
+Delivered-To: <recipient@example.invalid>
+Received: from zmail16.collab.prod.int.phx2.redhat.com (zmail16.collab.prod.int.phx2.redhat.com [10.5.83.18])
+    by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3A5xQ06025053
+    for <recipient@example.invalid>; Tue, 10 Apr 2012 01:59:26 -0400
+Date: Tue, 10 Apr 2012 01:59:26 -0400 (EDT)
+From: Zimbra User <zimbra.user@example.invalid>
+To: Recipient <recipient@example.invalid>
+Subject: Re: Zimbra
+Message-ID: <0fe105df-e67b-419e-8599-50aaff7260e8@zmail16.collab.prod.int.phx2.redhat.com>
+In-Reply-To: <1334037315-sup-8577@example.invalid>
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 7bit
+MIME-Version: 1.0
+X-Mailer: Zimbra 7.1.2_GA_3268 (ZimbraWebClient - FF3.0 (Linux)/7.1.2_GA_3268)
+
+----- Original Message -----
+> From: "Recipient" <recipient@example.invalid>
+> To: "Zimbra User" <zimbra.user@example.invalid>
+> Sent: Tuesday, April 10, 2012 3:56:15 PM
+> Subject: Re: Zimbra
+>
+> This is the quoted original message.
+>
+
+
+This is the reply from the Zimbra user.

data/test/gnupg_test_home/gpg.conf

@@ -1 +1,3 @@
-default-key 789E7011
+trust-model always
+# Set preferred hash algo to the one expected in the test suite
+personal-digest-preferences sha256

data/test/gnupg_test_home/regen_keys.sh

@@ -0,0 +1,89 @@
+#!/bin/bash
+#
+# re-generate test keys for the sup test base
+#
+# https://github.com/sup-heliotrope/sup/wiki/Development%3A-Crypto
+# 
+# Requires GPG 2.1+ installed as "gpg2"
+# 
+# GPG 2.1+ by default uses pubring.kbx - but this isn't backwards compatible
+# with GPG 1 or GPG 2.0.
+# Workaround:
+#   - Create empty pubring.gpg file, which causes GPG 2.1+ to use this
+#     backwards-compatible store.
+#   - Manually export private key copy to secring.gpg, which would be used
+#     by GPG 1.
+
+set -e -u -o pipefail
+
+pushd $(dirname $0)
+
+echo "Generating keys in: $(pwd)..."
+
+echo "Checking gpg2 version"
+gpg2 --version | head -1
+
+echo "Deleting all existing test keys"
+rm -f \
+    *.gpg \
+    *.asc \
+    private-keys-v1.d/*.key \
+    .gpg-v21-migrated
+
+echo "Generating key pair for test receiver (email sup-test-2@foo.bar.asc)"
+touch pubring.gpg  # So GPG 2.1+ writes to pubring.gpg instead of pubring.kbx
+gpg2 \
+    --homedir . \
+    --batch \
+    --pinentry-mode loopback \
+    --passphrase '' \
+    --quick-generate-key sup-test-2@foo.bar rsa encrypt,sign 0
+
+echo "Exporting public key only for test receiver (file sup-test-2@foo.bar.asc)"
+gpg2 \
+    --homedir . \
+    --armor \
+    --output sup-test-2@foo.bar.asc \
+    --export sup-test-2@foo.bar
+
+echo "Backing up secret key for test receiver (file receiver_secring.gpg)"
+gpg2 \
+    --homedir . \
+    --export-secret-keys \
+    >receiver_secring.gpg
+
+echo "Backing up pubring.gpg for test receiver (file receiver_pubring.gpg)"
+cp -a pubring.gpg receiver_pubring.gpg
+
+echo "Clearing key store, so we can start from a blank slate for next key(s)"
+rm -f pubring.gpg trustdb.gpg private-keys-v1.d/*.key .gpg-v21-migrated
+
+echo "Generating key pair for sender (email sup-test-1@foo.bar)"
+touch pubring.gpg  # So GPG 2.1+ writes to pubring.gpg instead of pubring.kbx
+gpg2 \
+    --homedir . \
+    --batch \
+    --pinentry-mode loopback \
+    --passphrase '' \
+    --quick-generate-key sup-test-1@foo.bar rsa encrypt,sign 0
+
+echo "Importing public key for receiver, into sender's key store"
+gpg2 \
+    --homedir . \
+    --import sup-test-2@foo.bar.asc
+
+echo "Copy private key also to secring.gpg (old format used by GPG 1)"
+gpg2 \
+    --homedir . \
+    --export-secret-keys \
+    >secring.gpg
+
+echo "Done."
+
+echo "We now have two non-expiring public keys (receiver & sender):"
+gpg2 --homedir . --list-keys
+
+echo "And we also have only *one* corresponding private key (sender only):"
+gpg2 --homedir . --list-secret-keys
+
+popd