[Pkg-gnupg-commit] [gnupg2] 96/112: Merge tag 'upstream/2.1.15'

Daniel Kahn Gillmor dkg at fifthhorseman.net
Tue Aug 30 17:48:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 932cf69af908250c7114bfefb44ffe02eb9df44a
Merge: e359e6c d5cdb89
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 29 10:09:39 2016 -0400

    Merge tag 'upstream/2.1.15'
    
    Upstream version 2.1.15

 ChangeLog                                          |  645 +++++++
 NEWS                                               |   51 +
 README                                             |   13 +-
 VERSION                                            |    2 +-
 agent/Makefile.am                                  |    2 +-
 agent/agent.h                                      |    1 +
 agent/cache.c                                      |   13 +-
 agent/command-ssh.c                                |  289 +---
 agent/command.c                                    |   13 +-
 agent/cvt-openpgp.c                                |    2 +-
 agent/gpg-agent.c                                  |   21 +-
 agent/learncard.c                                  |    6 +-
 agent/preset-passphrase.c                          |   10 +-
 agent/protect-tool.c                               |    9 +-
 common/Makefile.am                                 |    7 +-
 common/asshelp.c                                   |   47 +-
 common/exechelp-posix.c                            |    4 +-
 common/exectool.c                                  |   72 +-
 common/fwddecl.h                                   |    2 +-
 common/homedir.c                                   |   50 +-
 common/i18n.c                                      |    6 +-
 common/init.c                                      |    8 +
 common/iobuf.c                                     |   20 +-
 common/keyserver.h                                 |    4 +-
 common/logging.c                                   |    5 +-
 common/miscellaneous.c                             |   68 +-
 common/sexputil.c                                  |   50 +
 common/simple-pwquery.c                            |  429 ++---
 common/simple-pwquery.h                            |   43 -
 common/status-codes.h                              |   16 +-
 common/status.h                                    |    1 +
 common/stringhelp.c                                |   79 +-
 common/stringhelp.h                                |    5 +-
 common/t-exectool.c                                |  223 +++
 common/util.h                                      |   11 +-
 common/{fwddecl.h => utilproto.h}                  |   21 +-
 common/w32-afunix.c                                |  148 --
 common/w32-afunix.h                                |   63 -
 configure.ac                                       |    6 +-
 dirmngr/Makefile.am                                |    4 +-
 dirmngr/cdblib.c                                   |    2 +-
 dirmngr/certcache.c                                |    3 -
 dirmngr/crlcache.c                                 |    4 +-
 dirmngr/dirmngr.c                                  |  188 +--
 dirmngr/dirmngr.h                                  |    2 -
 dirmngr/http.c                                     |   13 +-
 dirmngr/ldap-wrapper.c                             |    4 +-
 dirmngr/ocsp.c                                     |    6 +-
 dirmngr/server.c                                   |   48 +-
 dirmngr/t-http.c                                   |    2 +-
 dirmngr/validate.c                                 |   12 +-
 doc/DETAILS                                        |   72 +-
 doc/TRANSLATE                                      |    4 +-
 doc/defsincdate                                    |    2 +-
 doc/dirmngr.texi                                   |   41 +-
 doc/gnupg.info                                     |  355 ++--
 doc/gnupg.info-1                                   |  174 +-
 doc/gnupg.info-2                                   |  154 +-
 doc/gpg-agent.texi                                 |   10 +-
 doc/gpg.texi                                       |   74 +-
 doc/gpgsm.texi                                     |    4 +-
 doc/scdaemon.texi                                  |   10 +-
 doc/tools.texi                                     |   10 +-
 doc/whats-new-in-2.1.txt                           |  185 +-
 g10/encrypt.c                                      |    7 +-
 g10/export.c                                       |    2 +-
 g10/getkey.c                                       |    2 +-
 g10/gpg.c                                          |   69 +-
 g10/gpg.h                                          |    2 +
 g10/gpgcompose.c                                   |    2 +-
 g10/gpgv.c                                         |   25 +-
 g10/import.c                                       |  109 +-
 g10/keydb.h                                        |    6 +-
 g10/keyedit.c                                      |    2 +-
 g10/keylist.c                                      |   56 +-
 g10/keyring.c                                      |   18 +-
 g10/mainproc.c                                     |   38 +-
 g10/options.h                                      |   17 +-
 g10/packet.h                                       |    3 +-
 g10/parse-packet.c                                 |    5 +-
 g10/passphrase.c                                   |  233 +--
 g10/pkclist.c                                      |    4 +
 g10/progress.c                                     |   22 +-
 g10/sig-check.c                                    |    4 +-
 g10/sign.c                                         |   17 +-
 g10/tdbio.c                                        |    4 +-
 g10/test-stubs.c                                   |   18 +-
 g10/tofu.c                                         |  873 ++--------
 g10/tofu.h                                         |    4 +-
 g13/Makefile.am                                    |    2 +-
 g13/backend.c                                      |   18 +
 g13/backend.h                                      |    1 +
 g13/be-dmcrypt.c                                   |   17 +
 g13/be-dmcrypt.h                                   |    1 +
 g13/call-syshelp.c                                 |  143 ++
 g13/call-syshelp.h                                 |    6 +
 g13/g13-syshelp.c                                  |    9 +-
 g13/g13-syshelp.h                                  |    1 +
 g13/g13.c                                          |   35 +-
 g13/keyblob.c                                      |   22 -
 g13/keyblob.h                                      |    3 -
 g13/mount.c                                        |  115 +-
 g13/server.c                                       |   27 +
 g13/server.h                                       |    4 +
 g13/sh-cmd.c                                       |  161 +-
 g13/sh-dmcrypt.c                                   |   93 ++
 g13/suspend.c                                      |    1 +
 kbx/kbxutil.c                                      |   10 +-
 kbx/keybox-update.c                                |   38 +-
 kbx/keybox-util.c                                  |   92 +-
 kbx/keybox.h                                       |    3 +-
 m4/ksba.m4                                         |    6 +-
 m4/libgcrypt.m4                                    |    6 +-
 m4/ntbtls.m4                                       |    8 +-
 po/POTFILES.in                                     |    2 +-
 po/ca.po                                           | 1626 +++++++++---------
 po/cs.po                                           | 1613 +++++++++---------
 po/da.po                                           | 1618 +++++++++---------
 po/de.po                                           | 1618 +++++++++---------
 po/el.po                                           | 1606 +++++++++---------
 po/en at boldquot.po                                  | 1559 +++++++++--------
 po/en at quot.po                                      | 1559 +++++++++--------
 po/eo.po                                           | 1602 +++++++++---------
 po/es.po                                           | 1618 +++++++++---------
 po/et.po                                           | 1604 +++++++++---------
 po/fi.po                                           | 1602 +++++++++---------
 po/fr.po                                           | 1618 +++++++++---------
 po/gl.po                                           | 1604 +++++++++---------
 po/gnupg2.pot                                      | 1544 ++++++++---------
 po/hu.po                                           | 1610 +++++++++---------
 po/id.po                                           | 1604 +++++++++---------
 po/it.po                                           | 1604 +++++++++---------
 po/ja.po                                           | 1640 +++++++++---------
 po/nb.po                                           | 1762 ++++++++++----------
 po/pl.po                                           | 1618 +++++++++---------
 po/pt.po                                           | 1606 +++++++++---------
 po/ro.po                                           | 1606 +++++++++---------
 po/ru.po                                           | 1635 +++++++++---------
 po/sk.po                                           | 1604 +++++++++---------
 po/sv.po                                           | 1618 +++++++++---------
 po/tr.po                                           | 1618 +++++++++---------
 po/uk.po                                           | 1616 +++++++++---------
 po/zh_CN.po                                        | 1597 +++++++++---------
 po/zh_TW.po                                        | 1612 +++++++++---------
 scd/app-p15.c                                      |    4 +-
 scd/app.c                                          |    4 +
 scd/ccid-driver.c                                  |    2 +-
 scd/command.c                                      |   96 +-
 scd/scdaemon.c                                     |   12 +-
 sm/gpgsm.c                                         |   11 +-
 sm/keylist.c                                       |    1 -
 sm/server.c                                        |    6 +-
 sm/sign.c                                          |    2 +-
 tests/gpgscm/Makefile.am                           |    2 +-
 tests/gpgscm/ffi-private.h                         |    2 +-
 tests/gpgscm/ffi.c                                 |   29 +-
 tests/gpgscm/init.scm                              |    4 +-
 tests/gpgscm/lib.scm                               |    3 +-
 tests/gpgscm/main.c                                |    2 +-
 tests/gpgscm/scheme.c                              |    2 +-
 tests/gpgscm/tests.scm                             |   42 +-
 tests/migrations/Makefile.am                       |    9 +-
 tests/migrations/common.scm                        |   13 +
 tests/migrations/extended-pkf.scm                  |    3 +
 tests/migrations/from-classic.scm                  |    3 +
 .../migrations/{extended-pkf.scm => issue2276.scm} |   33 +-
 tests/migrations/issue2276.tar.asc                 |  326 ++++
 tests/openpgp/Makefile.am                          |   46 +-
 tests/openpgp/README                               |    2 +-
 tests/openpgp/armor.scm                            |    2 +-
 tests/openpgp/defs.scm                             |   18 +-
 tests/openpgp/fake-pinentry.c                      |    6 +-
 tests/openpgp/gpg-agent.conf.tmpl                  |    1 +
 tests/openpgp/gpgtar.scm                           |    4 +-
 tests/openpgp/gpgv-forged-keyring.scm              |   67 +
 .../extended-pkf.scm => openpgp/issue2015.scm}     |   30 +-
 .../extended-pkf.scm => openpgp/issue2346.scm}     |   32 +-
 .../extended-pkf.scm => openpgp/issue2417.scm}     |   48 +-
 .../extended-pkf.scm => openpgp/issue2419.scm}     |   33 +-
 tests/openpgp/run-tests.scm                        |  215 +++
 tests/openpgp/samplekeys/issue2346.gpg             |   57 +
 tests/openpgp/samplekeys/ssh-dsa.key               |   12 +
 tests/openpgp/samplekeys/ssh-ecdsa.key             |    5 +
 tests/openpgp/samplekeys/ssh-ed25519.key           |    7 +
 tests/openpgp/samplekeys/ssh-rsa.key               |   27 +
 tests/openpgp/samplemsgs/issue2419.asc             |    7 +
 tests/openpgp/setup.scm                            |    8 -
 tests/openpgp/ssh.scm                              |   66 +
 tests/openpgp/tofu.scm                             |    2 +-
 tools/Makefile.am                                  |   19 +-
 tools/gpg-check-pattern.c                          |    9 +-
 tools/gpg-connect-agent.c                          |    2 +-
 tools/gpg-wks-client.c                             |    5 +-
 tools/gpg-wks-server.c                             |   74 +-
 tools/gpgconf-comp.c                               |    4 +-
 tools/gpgconf.c                                    |   22 +-
 tools/gpgconf.h                                    |    1 +
 tools/gpgsplit.c                                   |    2 +-
 tools/gpgtar.c                                     |    2 +-
 tools/gpgtar.h                                     |    2 +-
 tools/symcryptrun.c                                |   11 +-
 201 files changed, 27353 insertions(+), 27061 deletions(-)

-- 
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