[Pkg-gnupg-commit] [gnupg2] 236/241: Merge tag 'upstream/2.1.10'

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Dec 9 20:32:28 UTC 2015


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

dkg pushed a commit to branch master
in repository gnupg2.

commit 8804b9802629904b784ad2abbb2139bef3154859
Merge: b425ad4 24bfccb
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Dec 9 12:04:33 2015 -0500

    Merge tag 'upstream/2.1.10'
    
    Upstream version 2.1.10

 ChangeLog                                          | 1687 ++++++++++++
 Makefile.am                                        |    2 +-
 Makefile.in                                        |    4 +-
 NEWS                                               |   58 +
 README                                             |    2 +-
 VERSION                                            |    2 +-
 agent/ChangeLog-2011                               |    2 +-
 agent/Makefile.in                                  |    2 +
 agent/cache.c                                      |    2 +-
 agent/call-pinentry.c                              |    4 +-
 agent/call-scd.c                                   |    2 +-
 agent/command-ssh.c                                |    2 +-
 agent/command.c                                    |    4 +-
 agent/divert-scd.c                                 |    2 +-
 agent/findkey.c                                    |    2 +-
 agent/genkey.c                                     |    2 +-
 agent/gpg-agent.c                                  |   21 +-
 agent/trustlist.c                                  |    2 +-
 autogen.sh                                         |    1 +
 build-aux/speedo/w32/inst.nsi                      |    3 +
 common/ChangeLog-2011                              |    2 +-
 common/Makefile.am                                 |   46 +-
 common/Makefile.in                                 |  305 +-
 common/argparse.c                                  |    2 +-
 common/asshelp.c                                   |    4 +-
 common/asshelp.h                                   |    1 +
 common/audit.c                                     |    2 +-
 common/audit.h                                     |    2 +-
 {g13 => common}/call-gpg.c                         |  316 ++-
 {g13 => common}/call-gpg.h                         |   27 +-
 common/convert.c                                   |    6 +-
 common/dotlock.c                                   |    2 +-
 common/exechelp-posix.c                            |    2 +-
 common/exechelp-w32.c                              |    4 +-
 common/exechelp-w32ce.c                            |    2 +-
 common/exechelp.h                                  |    4 +-
 common/helpfile.c                                  |    2 +-
 common/i18n.h                                      |    2 +-
 common/iobuf.c                                     |   56 +-
 common/iobuf.h                                     |   12 +-
 common/localename.c                                |    2 +-
 common/logging.c                                   |   10 +-
 common/mkdir_p.c                                   |   23 +-
 common/mkdir_p.h                                   |    4 +-
 common/openpgp-oid.c                               |    2 +-
 common/session-env.c                               |    2 +-
 common/sexputil.c                                  |    2 +-
 common/srv.c                                       |  333 ---
 common/status-codes.h                              |  100 +-
 common/status.h                                    |    6 +
 common/stringhelp.c                                |  157 +-
 common/stringhelp.h                                |    5 +-
 common/strlist.c                                   |   19 +
 common/strlist.h                                   |    1 +
 common/sysutils.c                                  |    4 +-
 common/t-sexputil.c                                |    2 +-
 common/t-stringhelp.c                              |  137 +
 common/{w32-afunix.h => t-strlist.c}               |   73 +-
 common/t-support.h                                 |   12 +-
 common/t-zb32.c                                    |  214 +-
 common/ttyio.c                                     |    4 +-
 common/userids.c                                   |   97 +-
 common/util.h                                      |   10 +-
 common/w32-afunix.h                                |    2 +-
 common/{srv.h => zb32.h}                           |   44 +-
 config.h.in                                        |    9 +
 configure                                          |  662 +++--
 configure.ac                                       |  225 +-
 dirmngr/Makefile.am                                |   40 +-
 dirmngr/Makefile.in                                |  293 +-
 dirmngr/cdblib.c                                   |    6 +-
 dirmngr/certcache.c                                |    4 +-
 dirmngr/crlcache.c                                 |   10 +-
 dirmngr/crlfetch.c                                 |   16 +-
 dirmngr/dirmngr-client.c                           |  148 +-
 dirmngr/dirmngr.c                                  |   48 +-
 dirmngr/dirmngr.h                                  |    6 +-
 dirmngr/dirmngr_ldap.c                             |    2 +-
 dirmngr/dns-cert.c                                 |  433 ---
 dirmngr/dns-cert.h                                 |   57 -
 dirmngr/dns-stuff.c                                | 1360 +++++++++
 dirmngr/dns-stuff.h                                |  135 +
 {common => dirmngr}/http.c                         |  425 ++-
 {common => dirmngr}/http.h                         |    1 +
 dirmngr/ks-engine-hkp.c                            |  412 +--
 dirmngr/ks-engine-ldap.c                           |   18 +-
 dirmngr/ks-engine.h                                |    2 +-
 dirmngr/ldap-wrapper.c                             |    2 +-
 dirmngr/ldap.c                                     |   75 +-
 dirmngr/misc.c                                     |    2 +-
 dirmngr/ocsp.c                                     |    8 +-
 dirmngr/server.c                                   |  169 +-
 dirmngr/t-dns-cert.c                               |   93 -
 dirmngr/t-dns-stuff.c                              |  283 ++
 {common => dirmngr}/t-http.c                       |    9 +
 {common => dirmngr}/tls-ca.pem                     |    0
 dirmngr/validate.c                                 |    4 +-
 doc/DETAILS                                        |   19 +
 doc/HACKING                                        |   42 +-
 doc/Makefile.am                                    |    8 +-
 doc/Makefile.in                                    |   10 +-
 doc/defsincdate                                    |    2 +-
 doc/dirmngr.texi                                   |   35 +-
 doc/gnupg.info                                     |  367 +--
 doc/gnupg.info-1                                   |  362 ++-
 doc/gnupg.info-2                                   |  614 +++--
 doc/gnupg.texi                                     |    3 +-
 doc/gpg.texi                                       |  131 +-
 doc/gpgv.texi                                      |    8 +
 doc/tools.texi                                     |   75 +-
 doc/yat2m.c                                        |   22 +-
 g10/Makefile.am                                    |   21 +-
 g10/Makefile.in                                    |   63 +-
 g10/call-agent.c                                   |    8 +-
 g10/call-agent.h                                   |    1 +
 g10/call-dirmngr.c                                 |    4 +-
 g10/card-util.c                                    |    6 +
 g10/decrypt-data.c                                 |   33 +-
 g10/delkey.c                                       |    4 +-
 g10/dirmngr-conf.skel                              |    8 +
 g10/encrypt.c                                      |    6 +-
 g10/export.c                                       |  186 +-
 g10/getkey.c                                       |  198 +-
 g10/gpg.c                                          |  538 +++-
 g10/gpg.h                                          |    8 +-
 g10/gpgv.c                                         |   47 +-
 g10/import.c                                       |   50 +-
 g10/keydb.c                                        |  215 +-
 g10/keydb.h                                        |   58 +-
 g10/keyedit.c                                      |  192 +-
 g10/keygen.c                                       |   25 +-
 g10/keyid.c                                        |  153 +-
 g10/keylist.c                                      |   96 +-
 g10/keyring.c                                      |  127 +-
 g10/keyring.h                                      |    3 +-
 g10/keyserver.c                                    |   31 +-
 g10/main.h                                         |   54 +-
 g10/mainproc.c                                     |   98 +-
 g10/misc.c                                         |   79 +-
 g10/options.h                                      |   21 +-
 g10/packet.h                                       |   29 +-
 g10/parse-packet.c                                 |    2 +-
 g10/pkclist.c                                      |   40 +-
 g10/pkglue.c                                       |    2 +-
 g10/plaintext.c                                    |  138 +-
 g10/pubkey-enc.c                                   |    6 +-
 g10/revoke.c                                       |   78 +-
 g10/server.c                                       |    2 +-
 g10/sig-check.c                                    |  314 ++-
 g10/sign.c                                         |   24 +-
 g10/skclist.c                                      |    7 +-
 g10/sqlite.c                                       |  252 ++
 g10/sqlite.h                                       |   62 +
 g10/t-keydb-get-keyblock.c                         |   62 +
 g10/t-keydb-get-keyblock.gpg                       |  Bin 0 -> 138824 bytes
 g10/t-keydb.c                                      |    4 +
 g10/tdbio.c                                        |    8 +-
 g10/test-stubs.c                                   |   40 +-
 g10/tofu.c                                         | 2912 ++++++++++++++++++++
 g10/tofu.h                                         |  114 +
 g10/trust.c                                        |   17 +-
 g10/trustdb.c                                      |  293 +-
 g10/trustdb.h                                      |   13 +-
 g13/Makefile.am                                    |    1 -
 g13/Makefile.in                                    |    8 +-
 g13/create.c                                       |    8 +-
 g13/g13-common.h                                   |    4 +
 g13/g13.c                                          |   10 +
 g13/mount.c                                        |    5 +-
 g13/mountinfo.c                                    |    2 +-
 kbx/Makefile.in                                    |    2 +
 kbx/keybox-blob.c                                  |    2 +-
 kbx/keybox-file.c                                  |    2 +-
 kbx/keybox-init.c                                  |    4 +-
 kbx/keybox-search-desc.h                           |    2 +-
 kbx/keybox-search.c                                |    4 +-
 kbx/keybox-update.c                                |    4 +-
 m4/Makefile.in                                     |    2 +
 po/POTFILES.in                                     |    2 +-
 po/ca.gmo                                          |  Bin 48328 -> 48328 bytes
 po/ca.po                                           | 2419 ++++++++--------
 po/cs.gmo                                          |  Bin 218464 -> 217707 bytes
 po/cs.po                                           | 2440 ++++++++--------
 po/da.gmo                                          |  Bin 148926 -> 148508 bytes
 po/da.po                                           | 2451 ++++++++--------
 po/de.gmo                                          |  Bin 226134 -> 228439 bytes
 po/de.po                                           | 2432 ++++++++--------
 po/el.gmo                                          |  Bin 48492 -> 48492 bytes
 po/el.po                                           | 2420 ++++++++--------
 po/en at boldquot.gmo                                 |  Bin 206293 -> 208596 bytes
 po/en at boldquot.po                                  | 2387 ++++++++--------
 po/en at quot.gmo                                     |  Bin 204117 -> 206268 bytes
 po/en at quot.po                                      | 2386 ++++++++--------
 po/eo.gmo                                          |  Bin 31920 -> 31920 bytes
 po/eo.po                                           | 2418 ++++++++--------
 po/es.gmo                                          |  Bin 148399 -> 147957 bytes
 po/es.po                                           | 2473 +++++++++--------
 po/et.gmo                                          |  Bin 45720 -> 45720 bytes
 po/et.po                                           | 2419 ++++++++--------
 po/fi.gmo                                          |  Bin 48034 -> 48034 bytes
 po/fi.po                                           | 2419 ++++++++--------
 po/fr.gmo                                          |  Bin 229119 -> 228252 bytes
 po/fr.po                                           | 2447 ++++++++--------
 po/gl.gmo                                          |  Bin 47537 -> 47537 bytes
 po/gl.po                                           | 2419 ++++++++--------
 po/gnupg2.pot                                      | 2370 ++++++++--------
 po/hu.gmo                                          |  Bin 47434 -> 47434 bytes
 po/hu.po                                           | 2418 ++++++++--------
 po/id.gmo                                          |  Bin 46149 -> 46149 bytes
 po/id.po                                           | 2419 ++++++++--------
 po/it.gmo                                          |  Bin 47531 -> 47531 bytes
 po/it.po                                           | 2419 ++++++++--------
 po/ja.gmo                                          |  Bin 233701 -> 233011 bytes
 po/ja.po                                           | 2458 +++++++++--------
 po/nb.gmo                                          |  Bin 66055 -> 65966 bytes
 po/nb.po                                           | 2418 ++++++++--------
 po/pl.gmo                                          |  Bin 151900 -> 151484 bytes
 po/pl.po                                           | 2449 ++++++++--------
 po/pt.gmo                                          |  Bin 40443 -> 40443 bytes
 po/pt.po                                           | 2418 ++++++++--------
 po/ro.gmo                                          |  Bin 90308 -> 90216 bytes
 po/ro.po                                           | 2428 ++++++++--------
 po/ru.gmo                                          |  Bin 276722 -> 276687 bytes
 po/ru.po                                           | 2590 +++++++++--------
 po/sk.gmo                                          |  Bin 46983 -> 46983 bytes
 po/sk.po                                           | 2418 ++++++++--------
 po/sv.gmo                                          |  Bin 149117 -> 148708 bytes
 po/sv.po                                           | 2451 ++++++++--------
 po/tr.gmo                                          |  Bin 146509 -> 146172 bytes
 po/tr.po                                           | 2447 ++++++++--------
 po/uk.gmo                                          |  Bin 288290 -> 290899 bytes
 po/uk.po                                           | 2541 +++++++++--------
 po/zh_CN.gmo                                       |  Bin 92097 -> 92014 bytes
 po/zh_CN.po                                        | 2429 ++++++++--------
 po/zh_TW.gmo                                       |  Bin 199751 -> 199035 bytes
 po/zh_TW.po                                        | 2434 ++++++++--------
 scd/Makefile.in                                    |    2 +
 scd/apdu.c                                         |   28 +-
 scd/apdu.h                                         |    2 +-
 scd/app-common.h                                   |    5 -
 scd/app-openpgp.c                                  |   70 +-
 scd/app-p15.c                                      |    2 +-
 scd/app.c                                          |  126 +-
 scd/ccid-driver.c                                  |   35 +-
 scd/ccid-driver.h                                  |    3 +-
 scd/command.c                                      |   19 +-
 scd/iso7816.c                                      |    2 +-
 scd/scdaemon.c                                     |   11 -
 sm/Makefile.in                                     |    2 +
 sm/base64.c                                        |    4 +-
 sm/call-agent.c                                    |    4 +-
 sm/call-dirmngr.c                                  |    2 +-
 sm/certchain.c                                     |    4 +-
 sm/certdump.c                                      |    4 +-
 sm/certreqgen.c                                    |   77 +-
 sm/gpgsm.c                                         |    6 +-
 sm/import.c                                        |    2 +-
 sm/keydb.c                                         |    2 +-
 sm/minip12.c                                       |    6 +-
 sm/qualified.c                                     |    2 +-
 sm/server.c                                        |   10 +-
 tests/Makefile.in                                  |    2 +
 tests/openpgp/Makefile.am                          |   29 +-
 tests/openpgp/Makefile.in                          |   48 +-
 tests/openpgp/conventional-mdc.test                |   11 +-
 tests/openpgp/gpgtar.test                          |   61 +
 .../00FE67F28A52A8AA08FFAED20AF832DA916D1985.asc   |   17 +
 .../1DF48228FEFF3EC2481B106E0ACA8C465C662CC5.asc   |   23 +
 .../A2832820DC9F40751BDCD375BB0945BA33EC6B4C.asc   |   17 +
 .../ADE710D74409777B7729A7653373D820F67892E0.asc   |   17 +
 .../CEFC51AF91F68A2904FBFF62C4F075A4785B803F.asc   |   17 +
 .../E657FB607BB4F21C90BB6651BC067AF28BC90111.asc   |   45 +
 tests/openpgp/tofu-2183839A-1.txt                  |  Bin 0 -> 191 bytes
 tests/openpgp/tofu-BC15C85A-1.txt                  |    9 +
 tests/openpgp/tofu-EE37CF96-1.txt                  |    9 +
 tests/openpgp/tofu-keys-secret.asc                 |   95 +
 tests/openpgp/tofu-keys.asc                        |   47 +
 tests/openpgp/tofu.test                            |  245 ++
 tests/openpgp/use-exact-key.test                   |   55 +
 tests/openpgp/version.test                         |    7 +-
 tests/pkits/Makefile.in                            |    2 +
 tools/Makefile.am                                  |    6 +-
 tools/Makefile.in                                  |   11 +-
 tools/gpg-check-pattern.c                          |    4 +-
 tools/gpg-zip.in                                   |   10 +-
 tools/gpgconf-comp.c                               |    8 +-
 tools/gpgkey2ssh.c                                 |   49 +-
 tools/gpgparsemail.c                               |    2 +-
 tools/gpgtar-create.c                              |   50 +-
 tools/gpgtar-extract.c                             |   90 +-
 tools/gpgtar-list.c                                |   67 +-
 tools/gpgtar.c                                     |  332 ++-
 tools/gpgtar.h                                     |   16 +-
 tools/rfc822parse.c                                |    4 +-
 tools/symcryptrun.c                                |    2 +-
 295 files changed, 52552 insertions(+), 37261 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