From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 18 Sep 2017 20:41:12 +0000 (+0100)
Subject: gnupg2 (2.1.18-8~deb9u1) stretch; urgency=medium
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=b374c9aee5dbcb0fd5a4e53f4ff6ed1c8015fb61;p=gnupg2.git

gnupg2 (2.1.18-8~deb9u1) stretch; urgency=medium

  * Bugfix update for debian stretch point release.

[dgit import unpatched gnupg2 2.1.18-8~deb9u1]
---

b374c9aee5dbcb0fd5a4e53f4ff6ed1c8015fb61
diff --cc debian/NEWS
index 0000000,0000000..0a6a744
new file mode 100644
--- /dev/null
+++ b/debian/NEWS
@@@ -1,0 -1,0 +1,8 @@@
++gnupg2 (2.1.11-7+exp1) experimental; urgency=medium
++
++  The gnupg package now provides the "modern" version of GnuPG.
++
++  Please read /usr/share/doc/gnupg/README.Debian for details about the
++  transition from "classic" to "modern"
++
++ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 30 Mar 2016 09:59:35 -0400
diff --cc debian/Xsession.d/90gpg-agent
index 0000000,8b45b05..8b45b05
mode 000000,100644..100644
--- a/debian/Xsession.d/90gpg-agent
+++ b/debian/Xsession.d/90gpg-agent
diff --cc debian/changelog
index 0000000,5696d2a..5696d2a
mode 000000,100644..100644
--- a/debian/changelog
+++ b/debian/changelog
diff --cc debian/clean
index 0000000,922f2c9..922f2c9
mode 000000,100644..100644
--- a/debian/clean
+++ b/debian/clean
diff --cc debian/compat
index 0000000,ec63514..ec63514
mode 000000,100644..100644
--- a/debian/compat
+++ b/debian/compat
diff --cc debian/control
index 0000000,d13718d..d13718d
mode 000000,100644..100644
--- a/debian/control
+++ b/debian/control
diff --cc debian/copyright
index 0000000,5676d81..5676d81
mode 000000,100644..100644
--- a/debian/copyright
+++ b/debian/copyright
diff --cc debian/dirmngr.NEWS
index 0000000,b0c550f..b0c550f
mode 000000,100644..100644
--- a/debian/dirmngr.NEWS
+++ b/debian/dirmngr.NEWS
diff --cc debian/dirmngr.README.Debian
index 0000000,099240a..099240a
mode 000000,100644..100644
--- a/debian/dirmngr.README.Debian
+++ b/debian/dirmngr.README.Debian
diff --cc debian/dirmngr.docs
index 0000000,817be40..817be40
mode 000000,100644..100644
--- a/debian/dirmngr.docs
+++ b/debian/dirmngr.docs
diff --cc debian/dirmngr.install
index 0000000,4bd9ed2..4bd9ed2
mode 000000,100644..100644
--- a/debian/dirmngr.install
+++ b/debian/dirmngr.install
diff --cc debian/dirmngr.links
index 0000000,ca801e7..ca801e7
mode 000000,100644..100644
--- a/debian/dirmngr.links
+++ b/debian/dirmngr.links
diff --cc debian/dirmngr.maintscript
index 0000000,aa11aa5..aa11aa5
mode 000000,100644..100644
--- a/debian/dirmngr.maintscript
+++ b/debian/dirmngr.maintscript
diff --cc debian/dirmngr.manpages
index 0000000,93702d9..93702d9
mode 000000,100644..100644
--- a/debian/dirmngr.manpages
+++ b/debian/dirmngr.manpages
diff --cc debian/gbp.conf
index 0000000,b6518b7..b6518b7
mode 000000,100644..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
diff --cc debian/gnupg-agent.NEWS
index 0000000,69b4e49..69b4e49
mode 000000,100644..100644
--- a/debian/gnupg-agent.NEWS
+++ b/debian/gnupg-agent.NEWS
diff --cc debian/gnupg-agent.README.Debian
index 0000000,f57d278..f57d278
mode 000000,100644..100644
--- a/debian/gnupg-agent.README.Debian
+++ b/debian/gnupg-agent.README.Debian
diff --cc debian/gnupg-agent.examples
index 0000000,34213be..34213be
mode 000000,100644..100644
--- a/debian/gnupg-agent.examples
+++ b/debian/gnupg-agent.examples
diff --cc debian/gnupg-agent.install
index 0000000,2a4dcbe..2a4dcbe
mode 000000,100644..100644
--- a/debian/gnupg-agent.install
+++ b/debian/gnupg-agent.install
diff --cc debian/gnupg-agent.links
index 0000000,90f6ce1..90f6ce1
mode 000000,100644..100644
--- a/debian/gnupg-agent.links
+++ b/debian/gnupg-agent.links
diff --cc debian/gnupg-agent.manpages
index 0000000,4819831..4819831
mode 000000,100644..100644
--- a/debian/gnupg-agent.manpages
+++ b/debian/gnupg-agent.manpages
diff --cc debian/gnupg-l10n.install
index 0000000,9aaad82..9aaad82
mode 000000,100644..100644
--- a/debian/gnupg-l10n.install
+++ b/debian/gnupg-l10n.install
diff --cc debian/gnupg.README.Debian
index 0000000,24944d3..24944d3
mode 000000,100644..100644
--- a/debian/gnupg.README.Debian
+++ b/debian/gnupg.README.Debian
diff --cc debian/gnupg.docs
index 0000000,b182260..b182260
mode 000000,100644..100644
--- a/debian/gnupg.docs
+++ b/debian/gnupg.docs
diff --cc debian/gnupg.examples
index 0000000,3e74b94..3e74b94
mode 000000,100644..100644
--- a/debian/gnupg.examples
+++ b/debian/gnupg.examples
diff --cc debian/gnupg.info
index 0000000,e4baa0f..e4baa0f
mode 000000,100644..100644
--- a/debian/gnupg.info
+++ b/debian/gnupg.info
diff --cc debian/gnupg.install
index 0000000,9208425..9208425
mode 000000,100644..100644
--- a/debian/gnupg.install
+++ b/debian/gnupg.install
diff --cc debian/gnupg.manpages
index 0000000,4fc76c3..4fc76c3
mode 000000,100644..100644
--- a/debian/gnupg.manpages
+++ b/debian/gnupg.manpages
diff --cc debian/gnupg2.links
index 0000000,96fde98..96fde98
mode 000000,100644..100644
--- a/debian/gnupg2.links
+++ b/debian/gnupg2.links
diff --cc debian/gpg-check-pattern.1
index 0000000,05dbc1e..05dbc1e
mode 000000,100644..100644
--- a/debian/gpg-check-pattern.1
+++ b/debian/gpg-check-pattern.1
diff --cc debian/gpg-zip.1
index 0000000,cba5db4..cba5db4
mode 000000,100644..100644
--- a/debian/gpg-zip.1
+++ b/debian/gpg-zip.1
diff --cc debian/gpgsm.install
index 0000000,8822607..8822607
mode 000000,100644..100644
--- a/debian/gpgsm.install
+++ b/debian/gpgsm.install
diff --cc debian/gpgsm.manpages
index 0000000,ad6a686..ad6a686
mode 000000,100644..100644
--- a/debian/gpgsm.manpages
+++ b/debian/gpgsm.manpages
diff --cc debian/gpgsplit.1
index 0000000,116ce89..116ce89
mode 000000,100644..100644
--- a/debian/gpgsplit.1
+++ b/debian/gpgsplit.1
diff --cc debian/gpgv-static.1
index 0000000,c8dcc1a..c8dcc1a
mode 000000,100644..100644
--- a/debian/gpgv-static.1
+++ b/debian/gpgv-static.1
diff --cc debian/gpgv-static.install
index 0000000,adb6deb..adb6deb
mode 000000,100644..100644
--- a/debian/gpgv-static.install
+++ b/debian/gpgv-static.install
diff --cc debian/gpgv-static.lintian-overrides
index 0000000,fa0b8df..fa0b8df
mode 000000,100644..100644
--- a/debian/gpgv-static.lintian-overrides
+++ b/debian/gpgv-static.lintian-overrides
diff --cc debian/gpgv-static.manpages
index 0000000,e3f73aa..e3f73aa
mode 000000,100644..100644
--- a/debian/gpgv-static.manpages
+++ b/debian/gpgv-static.manpages
diff --cc debian/gpgv-udeb.install
index 0000000,fe27533..fe27533
mode 000000,100644..100644
--- a/debian/gpgv-udeb.install
+++ b/debian/gpgv-udeb.install
diff --cc debian/gpgv-win32.install
index 0000000,cf3cd8c..cf3cd8c
mode 000000,100644..100644
--- a/debian/gpgv-win32.install
+++ b/debian/gpgv-win32.install
diff --cc debian/gpgv.install
index 0000000,0a9f9a2..0a9f9a2
mode 000000,100644..100644
--- a/debian/gpgv.install
+++ b/debian/gpgv.install
diff --cc debian/gpgv.manpages
index 0000000,86a9e29..86a9e29
mode 000000,100644..100644
--- a/debian/gpgv.manpages
+++ b/debian/gpgv.manpages
diff --cc debian/gpgv2.links
index 0000000,5107429..5107429
mode 000000,100644..100644
--- a/debian/gpgv2.links
+++ b/debian/gpgv2.links
diff --cc debian/kbxutil.1
index 0000000,52b338a..52b338a
mode 000000,100644..100644
--- a/debian/kbxutil.1
+++ b/debian/kbxutil.1
diff --cc debian/lspgpot.1
index 0000000,ba27eca..ba27eca
mode 000000,100644..100644
--- a/debian/lspgpot.1
+++ b/debian/lspgpot.1
diff --cc debian/migrate-pubring-from-classic-gpg
index 0000000,13ee1f8..13ee1f8
mode 000000,100755..100755
--- a/debian/migrate-pubring-from-classic-gpg
+++ b/debian/migrate-pubring-from-classic-gpg
diff --cc debian/migrate-pubring-from-classic-gpg.1
index 0000000,4d26b89..4d26b89
mode 000000,100644..100644
--- a/debian/migrate-pubring-from-classic-gpg.1
+++ b/debian/migrate-pubring-from-classic-gpg.1
diff --cc debian/patches/0012-tools-Fix-memory-leak.patch
index 0000000,4d47557..4d47557
mode 000000,100644..100644
--- a/debian/patches/0012-tools-Fix-memory-leak.patch
+++ b/debian/patches/0012-tools-Fix-memory-leak.patch
diff --cc debian/patches/0013-tools-Improve-error-handling.patch
index 0000000,b0034da..b0034da
mode 000000,100644..100644
--- a/debian/patches/0013-tools-Improve-error-handling.patch
+++ b/debian/patches/0013-tools-Improve-error-handling.patch
diff --cc debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
index 0000000,0aa0549..0aa0549
mode 000000,100644..100644
--- a/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
+++ b/debian/patches/0014-dirmngr-New-option-disable-ipv4.patch
diff --cc debian/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch
index 0000000,bcf4ee6..bcf4ee6
mode 000000,100644..100644
--- a/debian/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch
+++ b/debian/patches/0015-dirmngr-Simplify-error-returning-inside-http.c.patch
diff --cc debian/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch
index 0000000,1979069..1979069
mode 000000,100644..100644
--- a/debian/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch
+++ b/debian/patches/0016-gpg-Print-a-warning-on-Tor-problems.patch
diff --cc debian/patches/0017-agent-Fix-double-free.patch
index 0000000,b3d96ed..b3d96ed
mode 000000,100644..100644
--- a/debian/patches/0017-agent-Fix-double-free.patch
+++ b/debian/patches/0017-agent-Fix-double-free.patch
diff --cc debian/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch
index 0000000,6365109..6365109
mode 000000,100644..100644
--- a/debian/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch
+++ b/debian/patches/0018-gpg-Fix-searching-for-mail-addresses-in-keyrings.patch
diff --cc debian/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch
index 0000000,f936685..f936685
mode 000000,100644..100644
--- a/debian/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch
+++ b/debian/patches/0019-dirmngr-New-option-no-use-tor-and-internal-changes.patch
diff --cc debian/patches/0020-gpg-Remove-period-at-end-of-warning.patch
index 0000000,247ff44..247ff44
mode 000000,100644..100644
--- a/debian/patches/0020-gpg-Remove-period-at-end-of-warning.patch
+++ b/debian/patches/0020-gpg-Remove-period-at-end-of-warning.patch
diff --cc debian/patches/0021-gpg-Add-newline-to-output.patch
index 0000000,b79c546..b79c546
mode 000000,100644..100644
--- a/debian/patches/0021-gpg-Add-newline-to-output.patch
+++ b/debian/patches/0021-gpg-Add-newline-to-output.patch
diff --cc debian/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
index 0000000,d8b5d79..d8b5d79
mode 000000,100644..100644
--- a/debian/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
+++ b/debian/patches/0022-gpg-Only-print-out-TOFU-statistics-for-conflicts-in-.patch
diff --cc debian/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch
index 0000000,2ae2abe..2ae2abe
mode 000000,100644..100644
--- a/debian/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch
+++ b/debian/patches/0023-gpg-If-there-is-a-TOFU-conflict-elide-the-too-few-me.patch
diff --cc debian/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch
index 0000000,42d257e..42d257e
mode 000000,100644..100644
--- a/debian/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch
+++ b/debian/patches/0024-gpg-Ensure-TOFU-bindings-associated-with-UTKs-are-re.patch
diff --cc debian/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch
index 0000000,b92a49f..b92a49f
mode 000000,100644..100644
--- a/debian/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch
+++ b/debian/patches/0025-gpg-Don-t-assume-that-strtoul-interprets-as-0.patch
diff --cc debian/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch
index 0000000,7fe05e5..7fe05e5
mode 000000,100644..100644
--- a/debian/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch
+++ b/debian/patches/0026-gpg-More-diagnostics-for-a-launched-pinentry.patch
diff --cc debian/patches/0027-doc-Clarify-abbreviation-of-help.patch
index 0000000,6d08d4b..6d08d4b
mode 000000,100644..100644
--- a/debian/patches/0027-doc-Clarify-abbreviation-of-help.patch
+++ b/debian/patches/0027-doc-Clarify-abbreviation-of-help.patch
diff --cc debian/patches/0028-scd-Backport-two-fixes-from-master.patch
index 0000000,2193f94..2193f94
mode 000000,100644..100644
--- a/debian/patches/0028-scd-Backport-two-fixes-from-master.patch
+++ b/debian/patches/0028-scd-Backport-two-fixes-from-master.patch
diff --cc debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch
index 0000000,a26360d..a26360d
mode 000000,100644..100644
--- a/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch
+++ b/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch
diff --cc debian/patches/0030-scd-Fix-factory-reset.patch
index 0000000,6a8822e..6a8822e
mode 000000,100644..100644
--- a/debian/patches/0030-scd-Fix-factory-reset.patch
+++ b/debian/patches/0030-scd-Fix-factory-reset.patch
diff --cc debian/patches/0031-gpg-Fix-aliases-list-key-list-sig-and-check-sig.patch
index 0000000,e22f218..e22f218
mode 000000,100644..100644
--- a/debian/patches/0031-gpg-Fix-aliases-list-key-list-sig-and-check-sig.patch
+++ b/debian/patches/0031-gpg-Fix-aliases-list-key-list-sig-and-check-sig.patch
diff --cc debian/patches/0032-gpg-common-Make-sure-that-all-fd-given-are-valid.patch
index 0000000,bf9691b..bf9691b
mode 000000,100644..100644
--- a/debian/patches/0032-gpg-common-Make-sure-that-all-fd-given-are-valid.patch
+++ b/debian/patches/0032-gpg-common-Make-sure-that-all-fd-given-are-valid.patch
diff --cc debian/patches/0033-common-Avoid-warning-about-implicit-declaration-of-g.patch
index 0000000,52f4d36..52f4d36
mode 000000,100644..100644
--- a/debian/patches/0033-common-Avoid-warning-about-implicit-declaration-of-g.patch
+++ b/debian/patches/0033-common-Avoid-warning-about-implicit-declaration-of-g.patch
diff --cc debian/patches/0034-gpg-Fix-memory-leak-in-the-error-case-of-signature-c.patch
index 0000000,3665e3b..3665e3b
mode 000000,100644..100644
--- a/debian/patches/0034-gpg-Fix-memory-leak-in-the-error-case-of-signature-c.patch
+++ b/debian/patches/0034-gpg-Fix-memory-leak-in-the-error-case-of-signature-c.patch
diff --cc debian/patches/0035-gpg-Print-a-warning-if-no-command-has-been-given.patch
index 0000000,6172346..6172346
mode 000000,100644..100644
--- a/debian/patches/0035-gpg-Print-a-warning-if-no-command-has-been-given.patch
+++ b/debian/patches/0035-gpg-Print-a-warning-if-no-command-has-been-given.patch
diff --cc debian/patches/0036-gpgconf-No-ENOENT-warning-with-change-options-et-al.patch
index 0000000,fa39a09..fa39a09
mode 000000,100644..100644
--- a/debian/patches/0036-gpgconf-No-ENOENT-warning-with-change-options-et-al.patch
+++ b/debian/patches/0036-gpgconf-No-ENOENT-warning-with-change-options-et-al.patch
diff --cc debian/patches/0037-dirmngr-Do-a-DNS-lookup-even-if-it-is-missing-from-n.patch
index 0000000,b91abd7..b91abd7
mode 000000,100644..100644
--- a/debian/patches/0037-dirmngr-Do-a-DNS-lookup-even-if-it-is-missing-from-n.patch
+++ b/debian/patches/0037-dirmngr-Do-a-DNS-lookup-even-if-it-is-missing-from-n.patch
diff --cc debian/patches/0038-gpg-Make-export-ssh-key-work-for-the-primary-key.patch
index 0000000,9ba738b..9ba738b
mode 000000,100644..100644
--- a/debian/patches/0038-gpg-Make-export-ssh-key-work-for-the-primary-key.patch
+++ b/debian/patches/0038-gpg-Make-export-ssh-key-work-for-the-primary-key.patch
diff --cc debian/patches/0039-dirmngr-Avoid-PTR-lookup-for-hosts-in-a-pool.patch
index 0000000,f1e9791..f1e9791
mode 000000,100644..100644
--- a/debian/patches/0039-dirmngr-Avoid-PTR-lookup-for-hosts-in-a-pool.patch
+++ b/debian/patches/0039-dirmngr-Avoid-PTR-lookup-for-hosts-in-a-pool.patch
diff --cc debian/patches/0040-gpgv-w32-Fix-status-fd.patch
index 0000000,555af36..555af36
mode 000000,100644..100644
--- a/debian/patches/0040-gpgv-w32-Fix-status-fd.patch
+++ b/debian/patches/0040-gpgv-w32-Fix-status-fd.patch
diff --cc debian/patches/0041-gpg-tools-Make-trust-model-configurable-via-gpgconf.patch
index 0000000,ae0cff9..ae0cff9
mode 000000,100644..100644
--- a/debian/patches/0041-gpg-tools-Make-trust-model-configurable-via-gpgconf.patch
+++ b/debian/patches/0041-gpg-tools-Make-trust-model-configurable-via-gpgconf.patch
diff --cc debian/patches/0042-gpg-tools-Make-auto-key-retrieve-configurable-via-gp.patch
index 0000000,60d29b7..60d29b7
mode 000000,100644..100644
--- a/debian/patches/0042-gpg-tools-Make-auto-key-retrieve-configurable-via-gp.patch
+++ b/debian/patches/0042-gpg-tools-Make-auto-key-retrieve-configurable-via-gp.patch
diff --cc debian/patches/0043-gpg-Allow-creating-keys-using-an-existing-ECC-key.patch
index 0000000,9d6fe6e..9d6fe6e
mode 000000,100644..100644
--- a/debian/patches/0043-gpg-Allow-creating-keys-using-an-existing-ECC-key.patch
+++ b/debian/patches/0043-gpg-Allow-creating-keys-using-an-existing-ECC-key.patch
diff --cc debian/patches/0044-gpg-Make-export-options-work-with-export-secret-keys.patch
index 0000000,7dc7666..7dc7666
mode 000000,100644..100644
--- a/debian/patches/0044-gpg-Make-export-options-work-with-export-secret-keys.patch
+++ b/debian/patches/0044-gpg-Make-export-options-work-with-export-secret-keys.patch
diff --cc debian/patches/0045-common-tools-Always-escape-newlines-when-escaping-da.patch
index 0000000,8b3e32b..8b3e32b
mode 000000,100644..100644
--- a/debian/patches/0045-common-tools-Always-escape-newlines-when-escaping-da.patch
+++ b/debian/patches/0045-common-tools-Always-escape-newlines-when-escaping-da.patch
diff --cc debian/patches/0046-g10-Signal-an-error-when-trying-to-revoke-non-exista.patch
index 0000000,14480bf..14480bf
mode 000000,100644..100644
--- a/debian/patches/0046-g10-Signal-an-error-when-trying-to-revoke-non-exista.patch
+++ b/debian/patches/0046-g10-Signal-an-error-when-trying-to-revoke-non-exista.patch
diff --cc debian/patches/0047-gpg-Fix-possible-segv-when-attribute-packets-are-fil.patch
index 0000000,3b232db..3b232db
mode 000000,100644..100644
--- a/debian/patches/0047-gpg-Fix-possible-segv-when-attribute-packets-are-fil.patch
+++ b/debian/patches/0047-gpg-Fix-possible-segv-when-attribute-packets-are-fil.patch
diff --cc debian/patches/0048-gpg-Fix-attempt-to-double-free-an-UID-structure.patch
index 0000000,9de4ed1..9de4ed1
mode 000000,100644..100644
--- a/debian/patches/0048-gpg-Fix-attempt-to-double-free-an-UID-structure.patch
+++ b/debian/patches/0048-gpg-Fix-attempt-to-double-free-an-UID-structure.patch
diff --cc debian/patches/0049-doc-Add-a-note-to-the-trust-model-direct.patch
index 0000000,de1f75d..de1f75d
mode 000000,100644..100644
--- a/debian/patches/0049-doc-Add-a-note-to-the-trust-model-direct.patch
+++ b/debian/patches/0049-doc-Add-a-note-to-the-trust-model-direct.patch
diff --cc debian/patches/0050-gpg-Flush-stdout-before-printing-stats-with-check-si.patch
index 0000000,62cbee9..62cbee9
mode 000000,100644..100644
--- a/debian/patches/0050-gpg-Flush-stdout-before-printing-stats-with-check-si.patch
+++ b/debian/patches/0050-gpg-Flush-stdout-before-printing-stats-with-check-si.patch
diff --cc debian/patches/0051-dirmngr-Ignore-warning-alerts-in-the-GNUTLS-handshak.patch
index 0000000,c30365b..c30365b
mode 000000,100644..100644
--- a/debian/patches/0051-dirmngr-Ignore-warning-alerts-in-the-GNUTLS-handshak.patch
+++ b/debian/patches/0051-dirmngr-Ignore-warning-alerts-in-the-GNUTLS-handshak.patch
diff --cc debian/patches/0052-gpg-Make-sure-the-conflict-set-includes-the-current-.patch
index 0000000,0a11a8e..0a11a8e
mode 000000,100644..100644
--- a/debian/patches/0052-gpg-Make-sure-the-conflict-set-includes-the-current-.patch
+++ b/debian/patches/0052-gpg-Make-sure-the-conflict-set-includes-the-current-.patch
diff --cc debian/patches/0053-dirmngr-Load-the-hosts-file-into-libdns.patch
index 0000000,aae341c..aae341c
mode 000000,100644..100644
--- a/debian/patches/0053-dirmngr-Load-the-hosts-file-into-libdns.patch
+++ b/debian/patches/0053-dirmngr-Load-the-hosts-file-into-libdns.patch
diff --cc debian/patches/0054-dirmngr-Fix-error-handling.patch
index 0000000,5b1d359..5b1d359
mode 000000,100644..100644
--- a/debian/patches/0054-dirmngr-Fix-error-handling.patch
+++ b/debian/patches/0054-dirmngr-Fix-error-handling.patch
diff --cc debian/patches/0055-common-Implicitly-do-a-gpgconf-create-socketdir.patch
index 0000000,f7d7608..f7d7608
mode 000000,100644..100644
--- a/debian/patches/0055-common-Implicitly-do-a-gpgconf-create-socketdir.patch
+++ b/debian/patches/0055-common-Implicitly-do-a-gpgconf-create-socketdir.patch
diff --cc debian/patches/0056-common-Fix-connecting-to-the-agent.patch
index 0000000,4923afb..4923afb
mode 000000,100644..100644
--- a/debian/patches/0056-common-Fix-connecting-to-the-agent.patch
+++ b/debian/patches/0056-common-Fix-connecting-to-the-agent.patch
diff --cc debian/patches/0057-g10-Fix-memory-leak.patch
index 0000000,d6e074f..d6e074f
mode 000000,100644..100644
--- a/debian/patches/0057-g10-Fix-memory-leak.patch
+++ b/debian/patches/0057-g10-Fix-memory-leak.patch
diff --cc debian/patches/0058-common-Avoid-undefined-behavior.patch
index 0000000,ad46b22..ad46b22
mode 000000,100644..100644
--- a/debian/patches/0058-common-Avoid-undefined-behavior.patch
+++ b/debian/patches/0058-common-Avoid-undefined-behavior.patch
diff --cc debian/patches/0059-gpg-Handle-critical-marked-Reason-for-Revocation.patch
index 0000000,8d958d5..8d958d5
mode 000000,100644..100644
--- a/debian/patches/0059-gpg-Handle-critical-marked-Reason-for-Revocation.patch
+++ b/debian/patches/0059-gpg-Handle-critical-marked-Reason-for-Revocation.patch
diff --cc debian/patches/0060-dirmngr-Do-not-assume-that-etc-hosts-exists.patch
index 0000000,7cec8ae..7cec8ae
mode 000000,100644..100644
--- a/debian/patches/0060-dirmngr-Do-not-assume-that-etc-hosts-exists.patch
+++ b/debian/patches/0060-dirmngr-Do-not-assume-that-etc-hosts-exists.patch
diff --cc debian/patches/0061-dirmngr-Always-print-a-warning-for-a-missing-etc-hos.patch
index 0000000,ecf484e..ecf484e
mode 000000,100644..100644
--- a/debian/patches/0061-dirmngr-Always-print-a-warning-for-a-missing-etc-hos.patch
+++ b/debian/patches/0061-dirmngr-Always-print-a-warning-for-a-missing-etc-hos.patch
diff --cc debian/patches/0062-dirmngr-Handle-EIO-which-is-sometimes-returned-by-co.patch
index 0000000,9a53665..9a53665
mode 000000,100644..100644
--- a/debian/patches/0062-dirmngr-Handle-EIO-which-is-sometimes-returned-by-co.patch
+++ b/debian/patches/0062-dirmngr-Handle-EIO-which-is-sometimes-returned-by-co.patch
diff --cc debian/patches/0063-dirmngr-New-option-disable-ipv6.patch
index 0000000,6a8ea61..6a8ea61
mode 000000,100644..100644
--- a/debian/patches/0063-dirmngr-New-option-disable-ipv6.patch
+++ b/debian/patches/0063-dirmngr-New-option-disable-ipv6.patch
diff --cc debian/patches/0064-agent-Serialize-access-to-passphrase-cache.patch
index 0000000,8231848..8231848
mode 000000,100644..100644
--- a/debian/patches/0064-agent-Serialize-access-to-passphrase-cache.patch
+++ b/debian/patches/0064-agent-Serialize-access-to-passphrase-cache.patch
diff --cc debian/patches/0065-gpg-Fix-printing-of-offline-taken-subkey.patch
index 0000000,4c17652..4c17652
mode 000000,100644..100644
--- a/debian/patches/0065-gpg-Fix-printing-of-offline-taken-subkey.patch
+++ b/debian/patches/0065-gpg-Fix-printing-of-offline-taken-subkey.patch
diff --cc debian/patches/0066-doc-Explain-the-in-a-key-listing.patch
index 0000000,aba3532..aba3532
mode 000000,100644..100644
--- a/debian/patches/0066-doc-Explain-the-in-a-key-listing.patch
+++ b/debian/patches/0066-doc-Explain-the-in-a-key-listing.patch
diff --cc debian/patches/0067-dirmngr-Fix-possible-null-reference.patch
index 0000000,d71c926..d71c926
mode 000000,100644..100644
--- a/debian/patches/0067-dirmngr-Fix-possible-null-reference.patch
+++ b/debian/patches/0067-dirmngr-Fix-possible-null-reference.patch
diff --cc debian/patches/0068-tools-Fix-condition-for-gpg-connect-agent.patch
index 0000000,821d0a9..821d0a9
mode 000000,100644..100644
--- a/debian/patches/0068-tools-Fix-condition-for-gpg-connect-agent.patch
+++ b/debian/patches/0068-tools-Fix-condition-for-gpg-connect-agent.patch
diff --cc debian/patches/0069-dirmngr-Fix-alignment-of-ADDR.patch
index 0000000,ef6e2ce..ef6e2ce
mode 000000,100644..100644
--- a/debian/patches/0069-dirmngr-Fix-alignment-of-ADDR.patch
+++ b/debian/patches/0069-dirmngr-Fix-alignment-of-ADDR.patch
diff --cc debian/patches/0070-dirmngr-Fix-http.c-for-sockaddr_storage.patch
index 0000000,a87e7b2..a87e7b2
mode 000000,100644..100644
--- a/debian/patches/0070-dirmngr-Fix-http.c-for-sockaddr_storage.patch
+++ b/debian/patches/0070-dirmngr-Fix-http.c-for-sockaddr_storage.patch
diff --cc debian/patches/0071-g10-Fix-import-export-filter-property-match.patch
index 0000000,5c96039..5c96039
mode 000000,100644..100644
--- a/debian/patches/0071-g10-Fix-import-export-filter-property-match.patch
+++ b/debian/patches/0071-g10-Fix-import-export-filter-property-match.patch
diff --cc debian/patches/0072-g10-Minor-fixes.patch
index 0000000,774e57d..774e57d
mode 000000,100644..100644
--- a/debian/patches/0072-g10-Minor-fixes.patch
+++ b/debian/patches/0072-g10-Minor-fixes.patch
diff --cc debian/patches/0073-dirmngr-Fix-final-close-of-LISTEN_FD.patch
index 0000000,0963208..0963208
mode 000000,100644..100644
--- a/debian/patches/0073-dirmngr-Fix-final-close-of-LISTEN_FD.patch
+++ b/debian/patches/0073-dirmngr-Fix-final-close-of-LISTEN_FD.patch
diff --cc debian/patches/0074-g10-invalidate-the-fd-cache-for-keyring.patch
index 0000000,e366af1..e366af1
mode 000000,100644..100644
--- a/debian/patches/0074-g10-invalidate-the-fd-cache-for-keyring.patch
+++ b/debian/patches/0074-g10-invalidate-the-fd-cache-for-keyring.patch
diff --cc debian/patches/0075-dirmngr-Fix-aliasing-problem-in-dns.c.patch
index 0000000,07c2b54..07c2b54
mode 000000,100644..100644
--- a/debian/patches/0075-dirmngr-Fix-aliasing-problem-in-dns.c.patch
+++ b/debian/patches/0075-dirmngr-Fix-aliasing-problem-in-dns.c.patch
diff --cc debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch
index 0000000,d0d7921..d0d7921
mode 000000,100644..100644
--- a/debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch
+++ b/debian/patches/avoid-spurious-warnings/0078-gpg-Avoid-spurious-warnings-about-trust-packets.patch
diff --cc debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
index 0000000,96a8e0d..96a8e0d
mode 000000,100644..100644
--- a/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
+++ b/debian/patches/block-ptrace-on-agent/0002-Avoid-simple-memory-dumps-via-ptrace.patch
diff --cc debian/patches/debian-packaging/0001-avoid-beta-warning.patch
index 0000000,ea08ce8..ea08ce8
mode 000000,100644..100644
--- a/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
+++ b/debian/patches/debian-packaging/0001-avoid-beta-warning.patch
diff --cc debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
index 0000000,c141e4f..c141e4f
mode 000000,100644..100644
--- a/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
+++ b/debian/patches/debian-packaging/0003-avoid-regenerating-defsincdate-use-shipped-file.patch
diff --cc debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
index 0000000,f1bcde3..f1bcde3
mode 000000,100644..100644
--- a/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
+++ b/debian/patches/dirmngr-idling/0001-dirmngr-hkp-Avoid-potential-race-condition-when-some.patch
diff --cc debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
index 0000000,c23485c..c23485c
mode 000000,100644..100644
--- a/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0002-dimrngr-Avoid-need-for-hkp-housekeeping.patch
diff --cc debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
index 0000000,7791852..7791852
mode 000000,100644..100644
--- a/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
+++ b/debian/patches/dirmngr-idling/0004-dirmngr-Avoid-automatically-checking-upstream-swdb.patch
diff --cc debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
index 0000000,69bdc9d..69bdc9d
mode 000000,100644..100644
--- a/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
+++ b/debian/patches/dirmngr-idling/0005-dirmngr-Drop-useless-housekeeping.patch
diff --cc debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
index 0000000,05817dd..05817dd
mode 000000,100644..100644
--- a/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
+++ b/debian/patches/gpg-agent-idling/0001-agent-Create-framework-of-scheduled-timers.patch
diff --cc debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
index 0000000,317cea5..317cea5
mode 000000,100644..100644
--- a/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
+++ b/debian/patches/gpg-agent-idling/0002-agent-Allow-threads-to-interrupt-main-select-loop-wi.patch
diff --cc debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
index 0000000,f107e78..f107e78
mode 000000,100644..100644
--- a/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
+++ b/debian/patches/gpg-agent-idling/0003-agent-Avoid-tight-timer-tick-when-possible.patch
diff --cc debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
index 0000000,557deff..557deff
mode 000000,100644..100644
--- a/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
+++ b/debian/patches/gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
diff --cc debian/patches/series
index 0000000,4ec24b8..4ec24b8
mode 000000,100644..100644
--- a/debian/patches/series
+++ b/debian/patches/series
diff --cc debian/patches/skel-file-removal/0077-g10-remove-skeleton-options-files.patch
index 0000000,55e63f0..55e63f0
mode 000000,100644..100644
--- a/debian/patches/skel-file-removal/0077-g10-remove-skeleton-options-files.patch
+++ b/debian/patches/skel-file-removal/0077-g10-remove-skeleton-options-files.patch
diff --cc debian/patches/skip-missing-signing-keys/0076-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
index 0000000,628565d..628565d
mode 000000,100644..100644
--- a/debian/patches/skip-missing-signing-keys/0076-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
+++ b/debian/patches/skip-missing-signing-keys/0076-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
diff --cc debian/rules
index 0000000,241cead..241cead
mode 000000,100755..100755
--- a/debian/rules
+++ b/debian/rules
diff --cc debian/scdaemon.examples
index 0000000,29f41a8..29f41a8
mode 000000,100644..100644
--- a/debian/scdaemon.examples
+++ b/debian/scdaemon.examples
diff --cc debian/scdaemon.install
index 0000000,a2a79aa..a2a79aa
mode 000000,100644..100644
--- a/debian/scdaemon.install
+++ b/debian/scdaemon.install
diff --cc debian/scdaemon.lintian-overrides
index 0000000,b575cb1..b575cb1
mode 000000,100644..100644
--- a/debian/scdaemon.lintian-overrides
+++ b/debian/scdaemon.lintian-overrides
diff --cc debian/scdaemon.manpages
index 0000000,9efee23..9efee23
mode 000000,100644..100644
--- a/debian/scdaemon.manpages
+++ b/debian/scdaemon.manpages
diff --cc debian/scdaemon.udev
index 0000000,dd076df..dd076df
mode 000000,100644..100644
--- a/debian/scdaemon.udev
+++ b/debian/scdaemon.udev
diff --cc debian/source/format
index 0000000,163aaf8..163aaf8
mode 000000,100644..100644
--- a/debian/source/format
+++ b/debian/source/format
diff --cc debian/source/lintian-overrides
index 0000000,b5221c7..b5221c7
mode 000000,100644..100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
diff --cc debian/source/options
index 0000000,f0f8ede..f0f8ede
mode 000000,100644..100644
--- a/debian/source/options
+++ b/debian/source/options
diff --cc debian/systemd-user/gpg-agent-browser.socket
index 0000000,67690ce..67690ce
mode 000000,100644..100644
--- a/debian/systemd-user/gpg-agent-browser.socket
+++ b/debian/systemd-user/gpg-agent-browser.socket
diff --cc debian/tests/control
index 0000000,9178821..9178821
mode 000000,100644..100644
--- a/debian/tests/control
+++ b/debian/tests/control
diff --cc debian/tests/gpgv-win32
index 0000000,3142a65..3142a65
mode 000000,100755..100755
--- a/debian/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32
diff --cc debian/upstream/signing-key.asc
index 0000000,1e57599..1e57599
mode 000000,100644..100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
diff --cc debian/watch
index 0000000,e6d36a1..e6d36a1
mode 000000,100644..100644
--- a/debian/watch
+++ b/debian/watch