[Pkg-gnupg-commit] [gnupg2] 01/02: more minor fixes from upstream
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jan 6 12:45:59 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gnupg2.
commit f5835556166579a65f71483945896dc99e8cab2b
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Fri Jan 6 07:27:39 2017 -0500
more minor fixes from upstream
---
...ease-announcement-pointers-to-NEWS-entrie.patch | 460 +++++++++++++++++++++
.../0022-g10-avoid-warning-when-disable-tofu.patch | 27 ++
...ion-gpgv-in-the-description-of-gpg-verify.patch | 30 ++
.../0024-Silence-two-Wlogical-op-warnings.patch | 48 +++
...doc-Document-summary-values-of-TOFU_STATS.patch | 36 ++
debian/patches/series | 5 +
6 files changed, 606 insertions(+)
diff --git a/debian/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch b/debian/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch
new file mode 100644
index 0000000..e3fdecd
--- /dev/null
+++ b/debian/patches/0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch
@@ -0,0 +1,460 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Wed, 4 Jan 2017 18:37:36 +0100
+Subject: doc: Add release announcement pointers to NEWS entries.
+
+--
+
+These are used by the website buider to link to the announcement
+mails.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit 588121c158384b05099388097053d8d1e8bdf143)
+---
+ NEWS | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 97 insertions(+), 2 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 5633c55b0..1e91af31f 100644
+--- a/NEWS
++++ b/NEWS
+@@ -33,6 +33,8 @@ Noteworthy changes in version 2.1.17 (2016-12-20)
+ * Major improvements to the test suite. For example it is possible
+ to run the external test suite of GPGME.
+
++ See-also: gnupg-announce/2016q4/000400.html
++
+
+ Noteworthy changes in version 2.1.16 (2016-11-18)
+ -------------------------------------------------
+@@ -105,6 +107,8 @@ Noteworthy changes in version 2.1.16 (2016-11-18)
+
+ * Many changes and improvements for the test suite.
+
++ See-also: gnupg-announce/2016q4/000398.html
++
+
+ Noteworthy changes in version 2.1.15 (2016-08-18)
+ -------------------------------------------------
+@@ -156,6 +160,8 @@ Noteworthy changes in version 2.1.15 (2016-08-18)
+
+ * Spelling and grammar fixes.
+
++ See-also: gnupg-announce/2016q3/000396.html
++
+
+ Noteworthy changes in version 2.1.14 (2016-07-14)
+ -------------------------------------------------
+@@ -214,6 +220,8 @@ Noteworthy changes in version 2.1.14 (2016-07-14)
+
+ * The rendering of the man pages has been improved.
+
++ See-also: gnupg-announce/2016q3/000393.html
++
+
+ Noteworthy changes in version 2.1.13 (2016-06-16)
+ -------------------------------------------------
+@@ -264,6 +272,8 @@ Noteworthy changes in version 2.1.13 (2016-06-16)
+
+ * Speedup fd closing after a fork.
+
++ See-also: gnupg-announce/2016q2/000390.html
++
+
+ Noteworthy changes in version 2.1.12 (2016-05-04)
+ -------------------------------------------------
+@@ -317,6 +327,8 @@ Noteworthy changes in version 2.1.12 (2016-05-04)
+
+ * Lots of internal cleanups and bug fixes.
+
++ See-also: gnupg-announce/2016q2/000387.html
++
+
+ Noteworthy changes in version 2.1.11 (2016-01-26)
+ -------------------------------------------------
+@@ -368,6 +380,8 @@ Noteworthy changes in version 2.1.11 (2016-01-26)
+ * Print a warning if a GnuPG component is using an older version of
+ gpg-agent, dirmngr, or scdaemon.
+
++ See-also: gnupg-announce/2016q1/000383.html
++
+
+ Noteworthy changes in version 2.1.10 (2015-12-04)
+ -------------------------------------------------
+@@ -426,6 +440,8 @@ Noteworthy changes in version 2.1.10 (2015-12-04)
+
+ * Many other cleanups and bug fixes.
+
++ See-also: gnupg-announce/2015q4/000381.html
++
+
+ Noteworthy changes in version 2.1.9 (2015-10-09)
+ ------------------------------------------------
+@@ -456,6 +472,8 @@ Noteworthy changes in version 2.1.9 (2015-10-09)
+ * dirmngr: Add option --keyserver. Deprecate that option for gpg.
+ Install a dirmngr.conf file from a skeleton for new installations.
+
++ See-also: gnupg-announce/2015q4/000380.html
++
+
+ Noteworthy changes in version 2.1.8 (2015-09-10)
+ ------------------------------------------------
+@@ -483,6 +501,8 @@ Noteworthy changes in version 2.1.8 (2015-09-10)
+
+ * Various minor bug fixes.
+
++ See-also: gnupg-announce/2015q3/000379.html
++
+
+ Noteworthy changes in version 2.1.7 (2015-08-11)
+ ------------------------------------------------
+@@ -508,6 +528,8 @@ Noteworthy changes in version 2.1.7 (2015-08-11)
+
+ * Various other bug fixes.
+
++ See-also: gnupg-announce/2015q3/000371.html
++
+
+ Noteworthy changes in version 2.1.6 (2015-07-01)
+ ------------------------------------------------
+@@ -538,6 +560,8 @@ Noteworthy changes in version 2.1.6 (2015-07-01)
+
+ * Various other bug fixes.
+
++ See-also: gnupg-announce/2015q3/000370.html
++
+
+ Noteworthy changes in version 2.1.5 (2015-06-11)
+ ------------------------------------------------
+@@ -552,6 +576,8 @@ Noteworthy changes in version 2.1.5 (2015-06-11)
+
+ * Code cleanups and minor bug fixes.
+
++ See-also: gnupg-announce/2015q2/000369.html
++
+
+ Noteworthy changes in version 2.1.4 (2015-05-12)
+ ------------------------------------------------
+@@ -577,6 +603,8 @@ Noteworthy changes in version 2.1.4 (2015-05-12)
+
+ * Fixed lots of smaller bugs.
+
++ See-also: gnupg-announce/2015q2/000366.html
++
+
+ Noteworthy changes in version 2.1.3 (2015-04-11)
+ ------------------------------------------------
+@@ -614,6 +642,8 @@ Noteworthy changes in version 2.1.3 (2015-04-11)
+ * Fixed possible problems due to compiler optimization, two minor
+ regressions, and other bugs.
+
++ See-also: gnupg-announce/2015q2/000365.html
++
+
+ Noteworthy changes in version 2.1.2 (2015-02-11)
+ ------------------------------------------------
+@@ -648,6 +678,8 @@ Noteworthy changes in version 2.1.2 (2015-02-11)
+ * Fixed several bugs related to bogus keyrings and improved some
+ other code.
+
++ See-also: gnupg-announce/2015q1/000361.html
++
+
+ Noteworthy changes in version 2.1.1 (2014-12-16)
+ ------------------------------------------------
+@@ -700,6 +732,8 @@ Noteworthy changes in version 2.1.1 (2014-12-16)
+
+ * Improved portability and the usual bunch of bug fixes.
+
++ See-also: gnupg-announce/2014q4/000360.html
++
+
+ Noteworthy changes in version 2.1.0 (2014-11-06)
+ ------------------------------------------------
+@@ -1017,6 +1051,8 @@ Noteworthy changes in version 2.1.0 (2014-11-06)
+ * Numerical values may now be used as an alternative to the
+ debug-level keywords.
+
++ See-also: gnupg-announce/2014q4/000358.html
++
+
+ Version 2.0.28 (2015-06-02)
+ Version 2.0.27 (2015-02-18)
+@@ -1060,6 +1096,8 @@ Noteworthy changes in version 2.0.13 (2009-09-04)
+
+ * Minor bug fixes.
+
++ See-also: gnupg-announce/2009q3/000294.html
++
+
+ Noteworthy changes in version 2.0.12 (2009-06-17)
+ -------------------------------------------------
+@@ -1087,6 +1125,8 @@ Noteworthy changes in version 2.0.12 (2009-06-17)
+
+ * Changed code to avoid a possible Mac OS X system freeze.
+
++ See-also: gnupg-announce/2009q2/000288.html
++
+
+ Noteworthy changes in version 2.0.11 (2009-03-03)
+ -------------------------------------------------
+@@ -1103,6 +1143,8 @@ Noteworthy changes in version 2.0.11 (2009-03-03)
+ due to interoperability problems with Outlook 2003 which still
+ can't cope with AES.
+
++ See-also: gnupg-announce/2009q1/000287.html
++
+
+ Noteworthy changes in version 2.0.10 (2009-01-12)
+ -------------------------------------------------
+@@ -1158,6 +1200,8 @@ Noteworthy changes in version 2.0.10 (2009-01-12)
+
+ * Libgcrypt 1.4 is now required.
+
++ See-also: gnupg-announce/2009q1/000284.html
++
+
+ Noteworthy changes in version 2.0.9 (2008-03-26)
+ ------------------------------------------------
+@@ -1181,6 +1225,7 @@ Noteworthy changes in version 2.0.9 (2008-03-26)
+ * Minor bug fixes.
+
+
++
+ Noteworthy changes in version 2.0.8 (2007-12-20)
+ ------------------------------------------------
+
+@@ -1214,6 +1259,8 @@ Noteworthy changes in version 2.0.8 (2007-12-20)
+ taken into account. This required a change of our socket emulation
+ code and changed the IPC protocol under Windows.
+
++ See-also: gnupg-announce/2007q4/000267.html
++
+
+ Noteworthy changes in version 2.0.7 (2007-09-10)
+ ------------------------------------------------
+@@ -1232,6 +1279,8 @@ Noteworthy changes in version 2.0.7 (2007-09-10)
+ installed versions of the programs and does not anymore search via
+ PATH for them.
+
++ See-also: gnupg-announce/2007q3/000259.html
++
+
+ Noteworthy changes in version 2.0.6 (2007-08-16)
+ ------------------------------------------------
+@@ -1247,6 +1296,8 @@ Noteworthy changes in version 2.0.6 (2007-08-16)
+
+ * Improved Windows support.
+
++ See-also: gnupg-announce/2007q3/000258.html
++
+
+ Noteworthy changes in version 2.0.5 (2007-07-05)
+ ------------------------------------------------
+@@ -1264,6 +1315,8 @@ Noteworthy changes in version 2.0.5 (2007-07-05)
+ * Changed key generation to reveal less information about the
+ machine. Bug fixes for gpg2's card key generation.
+
++ See-also: gnupg-announce/2007q3/000255.html
++
+
+ Noteworthy changes in version 2.0.4 (2007-05-09)
+ ------------------------------------------------
+@@ -1276,6 +1329,8 @@ Noteworthy changes in version 2.0.4 (2007-05-09)
+
+ * Improved the libgcrypt logging support in all modules.
+
++ See-also: gnupg-announce/2007q2/000254.html
++
+
+ Noteworthy changes in version 2.0.3 (2007-03-08)
+ ------------------------------------------------
+@@ -1296,6 +1351,8 @@ Noteworthy changes in version 2.0.3 (2007-03-08)
+ * The PIN pad of the Cherry XX44 keyboard is now supported. The
+ DINSIG and the NKS applications are now also aware of PIN pads.
+
++ See-also: gnupg-announce/2007q1/000252.html
++
+
+ Noteworthy changes in version 2.0.2 (2007-01-31)
+ ------------------------------------------------
+@@ -1314,6 +1371,8 @@ Noteworthy changes in version 2.0.2 (2007-01-31)
+
+ * The status code BEGIN_SIGNING now shows the used hash algorithms.
+
++ See-also: gnupg-announce/2007q1/000249.html
++
+
+ Noteworthy changes in version 2.0.1 (2006-11-28)
+ ------------------------------------------------
+@@ -1327,12 +1386,16 @@ Noteworthy changes in version 2.0.1 (2006-11-28)
+
+ * Fixed a buffer overflow in gpg2. [bug#728,CVE-2006-6169]
+
++ See-also: gnupg-announce/2006q4/000242.html
++
+
+ Noteworthy changes in version 2.0.0 (2006-11-11)
+ ------------------------------------------------
+
+ * First stable version of a GnuPG integrating OpenPGP and S/MIME.
+
++ See-also: gnupg-announce/2006q4/000239.html
++
+
+ Noteworthy changes in version 1.9.95 (2006-11-06)
+ -------------------------------------------------
+@@ -1373,6 +1436,8 @@ Noteworthy changes in version 1.9.92 (2006-10-11)
+
+ * Bug fixes.
+
++ See-also: gnupg-announce/2006q4/000236.html
++
+
+ Noteworthy changes in version 1.9.91 (2006-10-04)
+ -------------------------------------------------
+@@ -1874,6 +1939,8 @@ Noteworthy changes in version 1.3.2 (2003-05-27)
+ of GnuPG and other OpenPGP programs, please do not use this
+ algorithm.
+
++ See-also: gnupg-announce/2003q2/000153.html
++
+
+ Noteworthy changes in version 1.3.1 (2002-11-12)
+ ------------------------------------------------
+@@ -2200,6 +2267,8 @@ Noteworthy changes in version 1.0.7 (2002-04-29)
+
+ * Read only keyrings are now handled as expected.
+
++ See-also: gnupg-announce/2002q2/000135.html
++
+
+ Noteworthy changes in version 1.0.6 (2001-05-29)
+ ------------------------------------------------
+@@ -2218,6 +2287,8 @@ Noteworthy changes in version 1.0.6 (2001-05-29)
+
+ * non-writable keyrings are now correctly handled.
+
++ See-also: gnupg-announce/2001q2/000123.html
++
+
+ Noteworthy changes in version 1.0.5 (2001-04-29)
+ ------------------------------------------------
+@@ -2276,6 +2347,8 @@ Noteworthy changes in version 1.0.5 (2001-04-29)
+
+ * New translations: Estonian, Turkish.
+
++ See-also: gnupg-announce/2001q2/000122.html
++
+
+ Noteworthy changes in version 1.0.4 (2000-10-17)
+ ------------------------------------------------
+@@ -2291,6 +2364,9 @@ Noteworthy changes in version 1.0.4 (2000-10-17)
+
+ * --with-colons now works with --print-md[s].
+
++ See-also: gnupg-announce/2000q4/000082.html
++
++
+ Noteworthy changes in version 1.0.3 (2000-09-18)
+ ------------------------------------------------
+
+@@ -2322,6 +2398,8 @@ Noteworthy changes in version 1.0.3 (2000-09-18)
+ this. Older versions of GnuPG don't support it, so they should be
+ upgraded to at least 1.0.2
+
++ See-also: gnupg-announce/2000q3/000075.html
++
+
+ Noteworthy changes in version 1.0.2 (2000-07-12)
+ ----------------------------------------------
+@@ -2380,6 +2458,9 @@ Noteworthy changes in version 1.0.2 (2000-07-12)
+
+ * Danish translation
+
++ See-also: gnupg-announce/2000q3/000069.html
++
++
+ Noteworthy changes in version 1.0.1 (1999-12-16)
+ -----------------------------------
+
+@@ -2411,6 +2492,8 @@ Noteworthy changes in version 1.0.1 (1999-12-16)
+ * Removed the GNU Privacy Handbook from the distribution as it will go
+ into a separate one.
+
++ See-also: gnupg-announce/1999q4/000050.html
++
+
+ Noteworthy changes in version 1.0.0 (1999-09-07)
+ -----------------------------------
+@@ -2420,6 +2503,8 @@ Noteworthy changes in version 1.0.0 (1999-09-07)
+
+ * Changed the version number to GnuPG 2001 ;-)
+
++ See-also: gnupg-announce/1999q3/000037.html
++
+
+ Noteworthy changes in version 0.9.11 (1999-09-03)
+ ------------------------------------
+@@ -2431,6 +2516,8 @@ Noteworthy changes in version 0.9.11 (1999-09-03)
+
+ * Fixed a problem when importing new subkeys (duplicated signatures).
+
++ See-also: gnupg-announce/1999q3/000036.html
++
+
+ Noteworthy changes in version 0.9.10 (1999-07-23)
+ ------------------------------------
+@@ -2439,6 +2526,8 @@ Noteworthy changes in version 0.9.10 (1999-07-23)
+
+ * Cleaned up the dox a bit.
+
++ See-also: gnupg-announce/1999q3/000034.html
++
+
+ Noteworthy changes in version 0.9.9
+ -----------------------------------
+@@ -2466,6 +2555,8 @@ Noteworthy changes in version 0.9.9
+ * New option --allow-non-selfsigned-uid to work around a problem with
+ the German IN way of separating signing and encryption keys.
+
++ See-also: gnupg-announce/1999q3/000028.html
++
+
+ Noteworthy changes in version 0.9.8 (1999-06-26)
+ -----------------------------------
+@@ -2487,6 +2578,8 @@ Noteworthy changes in version 0.9.8 (1999-06-26)
+
+ * Better support for HPUX.
+
++ See-also: gnupg-announce/1999q2/000016.html
++
+
+ Noteworthy changes in version 0.9.7 (1999-05-23)
+ -----------------------------------
+@@ -2496,6 +2589,8 @@ Noteworthy changes in version 0.9.7 (1999-05-23)
+
+ * Enhanced some status outputs.
+
++ See-also: gnupg-announce/1999q2/000000.html
++
+
+ Noteworthy changes in version 0.9.6 (1999-05-06)
+ -----------------------------------
+@@ -2812,7 +2907,7 @@ Noteworthy changes in version 0.3.3 (1998-08-08)
+ a copy of the old program.
+ 2. Disable the network, make sure that you are the only
+ user, be sure that there are no Trojan horses etc ....
+- 3. Use your old gpg (version 0.3.[12]) and set the
++ 3. Use your old gpg (version 0.3.1 or 0.3.2) and set the
+ passphrases of ALL your secret keys to empty!
+ (gpg --change-passphrase your-user-id).
+ 4. Save your ownertrusts (see the next point)
+@@ -2825,7 +2920,7 @@ Noteworthy changes in version 0.3.3 (1998-08-08)
+
+ * The format of the trust database has changed; you must delete
+ the old one, so gnupg can create a new one.
+- IMPORTANT: Use version 0.3.[12] to save your assigned ownertrusts
++ IMPORTANT: Use version 0.3.1 or .2 to save your assigned ownertrusts
+ ("gpgm --list-ownertrust >saved-trust"); then build this new version
+ and restore the ownertrust with this new version
+ ("gpgm --import-ownertrust saved-trust"). Please note that
diff --git a/debian/patches/0022-g10-avoid-warning-when-disable-tofu.patch b/debian/patches/0022-g10-avoid-warning-when-disable-tofu.patch
new file mode 100644
index 0000000..4443007
--- /dev/null
+++ b/debian/patches/0022-g10-avoid-warning-when-disable-tofu.patch
@@ -0,0 +1,27 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Wed, 4 Jan 2017 08:31:06 -0500
+Subject: g10: avoid warning when --disable-tofu
+
+If configured with --disable-tofu, we see compiler warnings about an
+unused variable. This should remove those warnings.
+
+(cherry picked from commit 38671cfe5a2a40bb991619f4cb992c42b5f1e8cd)
+---
+ g10/trustdb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/g10/trustdb.c b/g10/trustdb.c
+index d402cb2ba..c113b7e9d 100644
+--- a/g10/trustdb.c
++++ b/g10/trustdb.c
+@@ -1002,9 +1002,9 @@ tdb_get_validity_core (ctrl_t ctrl,
+ ulong recno;
+ #ifdef USE_TOFU
+ unsigned int tofu_validity = TRUST_UNKNOWN;
++ int free_kb = 0;
+ #endif
+ unsigned int validity = TRUST_UNKNOWN;
+- int free_kb = 0;
+
+ if (kb && pk)
+ log_assert (keyid_cmp (pk_main_keyid (pk),
diff --git a/debian/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch b/debian/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch
new file mode 100644
index 0000000..a05c742
--- /dev/null
+++ b/debian/patches/0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch
@@ -0,0 +1,30 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Thu, 5 Jan 2017 20:25:16 +0100
+Subject: doc: Mention gpgv in the description of gpg --verify.
+
+--
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit 353f6ff37646ad4c24d309a495e6c6f41e5235e3)
+---
+ doc/gpg.texi | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/doc/gpg.texi b/doc/gpg.texi
+index 469e5484a..4ea2cd21e 100644
+--- a/doc/gpg.texi
++++ b/doc/gpg.texi
+@@ -255,6 +255,13 @@ out the actual signed data, but there are other pitfalls with this
+ format as well. It is suggested to avoid cleartext signatures in
+ favor of detached signatures.
+
++Note: Sometimes the use of the @command{gpgv} tool is easier than
++using the full-fledged @command{gpg} with this option. @command{gpgv}
++is designed to compare signed data against a list of trusted keys and
++returns with success only for a good signature. It has its own manual
++page.
++
++
+ @item --multifile
+ @opindex multifile
+ This modifies certain other commands to accept multiple files for
diff --git a/debian/patches/0024-Silence-two-Wlogical-op-warnings.patch b/debian/patches/0024-Silence-two-Wlogical-op-warnings.patch
new file mode 100644
index 0000000..78fd134
--- /dev/null
+++ b/debian/patches/0024-Silence-two-Wlogical-op-warnings.patch
@@ -0,0 +1,48 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Thu, 5 Jan 2017 20:42:55 +0100
+Subject: Silence two -Wlogical-op warnings.
+
+* common/tlv.c (parse_ber_header): Avoid compiler warning about a
+duplicate condition.
+* tools/gpgtar-create.c (pattern_valid_p): Likewise.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+(cherry picked from commit 6170eb809033c9d144abf3b1f31f8b936878cdd4)
+---
+ common/tlv.c | 4 ++--
+ tools/gpgtar-create.c | 6 +++++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/common/tlv.c b/common/tlv.c
+index 6813c585a..0058b67ca 100644
+--- a/common/tlv.c
++++ b/common/tlv.c
+@@ -214,9 +214,9 @@ parse_ber_header (unsigned char const **buffer, size_t *size,
+ else
+ {
+ unsigned long len = 0;
+- int count = c & 0x7f;
++ int count = (c & 0x7f);
+
+- if (count > sizeof (len) || count > sizeof (size_t))
++ if (count > (sizeof(len)<sizeof(size_t)?sizeof(len):sizeof(size_t)))
+ return gpg_err_make (default_errsource, GPG_ERR_BAD_BER);
+
+ for (; count; count--)
+diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
+index ef906a5dd..ffd239f42 100644
+--- a/tools/gpgtar-create.c
++++ b/tools/gpgtar-create.c
+@@ -429,7 +429,11 @@ pattern_valid_p (const char *pattern)
+ return 0;
+ if (*pattern == '.' && pattern[1] == '.')
+ return 0;
+- if (*pattern == '/' || *pattern == DIRSEP_C)
++ if (*pattern == '/'
++#ifdef HAVE_DOSISH_SYSTEM
++ || *pattern == '\\'
++#endif
++ )
+ return 0; /* Absolute filenames are not supported. */
+ #ifdef HAVE_DRIVE_LETTERS
+ if (((*pattern >= 'a' && *pattern <= 'z')
diff --git a/debian/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch b/debian/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch
new file mode 100644
index 0000000..1ee390f
--- /dev/null
+++ b/debian/patches/0025-doc-Document-summary-values-of-TOFU_STATS.patch
@@ -0,0 +1,36 @@
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Fri, 6 Jan 2017 12:26:01 +0100
+Subject: doc: Document summary values of TOFU_STATS
+
+--
+
+Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
+(cherry picked from commit e1f68337b979fe4b7c3bd095a83ea832e14efb74)
+---
+ doc/DETAILS | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/doc/DETAILS b/doc/DETAILS
+index 568500e51..ac599fc62 100644
+--- a/doc/DETAILS
++++ b/doc/DETAILS
+@@ -761,6 +761,19 @@ pkd:0:1024:B665B1435F4C2 .... FF26ABB:
+ takes on value 0. Instead, if there is a conflict, VALIDITY still
+ reflects the key's validity (values: 1-4).
+
++ SUMMARY values use the euclidean distance (m = sqrt(a² + b²)) rather
++ then the sum of the magnitudes (m = a + b) to ensure a balance between
++ verified signatures and encrypted messages.
++
++ Values are calculated based on the number of days where a key was used
++ for verifying a signature or to encrypt to it.
++ The ranges for the values are:
++
++ - 1 :: signature_days + encryption_days == 0
++ - 2 :: 1 <= sqrt(signature_days² + encryption_days²) < 8
++ - 3 :: 8 <= sqrt(signature_days² + encryption_days²) < 42
++ - 4 :: sqrt(signature_days² + encryption_days²) >= 42
++
+ SIGN-COUNT and ENCRYPTION-COUNT are the number of messages that we
+ have seen that have been signed by this key / encryption to this
+ key.
diff --git a/debian/patches/series b/debian/patches/series
index 100d01f..1ea9189 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,8 @@ gpg-agent-idling/0004-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
0018-dirmngr-New-debug-message-on-correctly-initialized-l.patch
0019-dirmngr-Make-sure-Tor-mode-is-also-set-for-DNS-on-SI.patch
0020-doc-Extend-dirmngr-s-allow-version-check-description.patch
+0021-doc-Add-release-announcement-pointers-to-NEWS-entrie.patch
+0022-g10-avoid-warning-when-disable-tofu.patch
+0023-doc-Mention-gpgv-in-the-description-of-gpg-verify.patch
+0024-Silence-two-Wlogical-op-warnings.patch
+0025-doc-Document-summary-values-of-TOFU_STATS.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list