[Pkg-gnupg-commit] [gpgme] 128/132: Merge branch 'upstream' into experimental

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Apr 26 01:01:45 UTC 2017


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

dkg pushed a commit to branch experimental
in repository gpgme.

commit a9e51285b68e02339efc96b76d88339760da81e6
Merge: bce2bdb b8f9796
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue Apr 25 20:31:10 2017 -0400

    Merge branch 'upstream' into experimental

 ChangeLog                                          | 1593 +++++++++++++++++++-
 NEWS                                               |   82 +
 README                                             |   10 +-
 VERSION                                            |    2 +-
 configure.ac                                       |  101 +-
 doc/gpgme.texi                                     |  283 +++-
 gpgme.spec                                         |    2 +-
 lang/cpp/src/GpgmeppConfig.cmake.in.in             |    4 +-
 lang/cpp/src/Makefile.am                           |   11 +-
 lang/cpp/src/context.cpp                           |   70 +-
 lang/cpp/src/context.h                             |   28 +-
 lang/cpp/src/context_p.h                           |    1 +
 lang/cpp/src/data.cpp                              |   24 +
 lang/cpp/src/data.h                                |    5 +
 lang/cpp/src/editinteractor.cpp                    |    2 +
 lang/cpp/src/gpggencardkeyinteractor.cpp           |  332 ++++
 lang/cpp/src/gpggencardkeyinteractor.h             |   71 +
 lang/cpp/src/key.cpp                               |   59 +-
 lang/cpp/src/key.h                                 |   22 +
 lang/cpp/src/verificationresult.cpp                |    3 +-
 lang/python/Makefile.am                            |   59 +-
 lang/python/gpg/constants/__init__.py              |    8 +-
 lang/python/gpg/constants/create.py                |   25 +
 lang/python/gpg/constants/keysign.py               |   25 +
 lang/python/gpg/constants/tofu/__init__.py         |   24 +
 lang/python/gpg/constants/tofu/policy.py           |   25 +
 lang/python/gpg/core.py                            |  350 ++++-
 lang/python/gpg/results.py                         |    6 +-
 lang/python/gpgme.i                                |  138 +-
 lang/python/helpers.c                              |   22 +-
 lang/python/setup.py.in                            |   16 +-
 lang/python/tests/Makefile.am                      |   12 +-
 lang/python/tests/initial.py                       |    3 +-
 lang/python/tests/run-tests.py                     |   34 +-
 lang/python/tests/support.py                       |   65 +-
 lang/python/tests/t-callbacks.py                   |    2 +-
 lang/python/tests/t-decrypt-verify.py              |    1 -
 lang/python/tests/t-decrypt.py                     |    1 -
 lang/python/tests/t-edit.py                        |    4 +-
 lang/python/tests/t-encrypt-large.py               |    1 -
 lang/python/tests/t-encrypt-sign.py                |    1 -
 lang/python/tests/t-encrypt-sym.py                 |    2 +-
 lang/python/tests/t-encrypt.py                     |   16 +-
 lang/python/tests/t-export.py                      |    1 -
 lang/python/tests/t-file-name.py                   |    1 -
 lang/python/tests/t-idiomatic.py                   |    2 -
 lang/python/tests/t-import.py                      |    1 -
 .../tests/{t-keylist.py => t-keylist-from-data.py} |  139 +-
 lang/python/tests/t-keylist.py                     |   13 +-
 lang/python/tests/t-protocol-assuan.py             |    9 +-
 lang/python/tests/t-quick-key-creation.py          |  140 ++
 lang/python/tests/t-quick-key-manipulation.py      |  125 ++
 lang/python/tests/t-quick-key-signing.py           |  121 ++
 lang/python/tests/t-quick-subkey-creation.py       |  112 ++
 lang/python/tests/t-sig-notation.py                |    2 -
 lang/python/tests/t-sign.py                        |    2 -
 lang/python/tests/t-signers.py                     |    2 -
 lang/python/tests/t-trustlist.py                   |    1 -
 lang/python/tests/t-verify.py                      |    2 -
 lang/python/tests/t-wait.py                        |    1 -
 lang/qt/src/Makefile.am                            |    9 +-
 lang/qt/src/QGpgmeConfig.cmake.in.in               |    2 +-
 .../qt/{tests/t-support.h => src/cryptoconfig.cpp} |   43 +-
 lang/qt/src/cryptoconfig.h                         |   14 +-
 lang/qt/src/defaultkeygenerationjob.cpp            |   11 +-
 lang/qt/src/dn.cpp                                 |    4 +-
 lang/qt/src/qgpgmenewcryptoconfig.cpp              |   26 +-
 lang/qt/src/qgpgmenewcryptoconfig.h                |    2 +
 lang/qt/src/threadedjobmixin.h                     |    1 +
 lang/qt/tests/Makefile.am                          |   11 +-
 lang/qt/tests/{t-verify.cpp => t-config.cpp}       |   91 +-
 lang/qt/tests/t-encrypt.cpp                        |  125 +-
 lang/qt/tests/t-keylist.cpp                        |   18 +-
 lang/qt/tests/t-keylocate.cpp                      |   26 +-
 lang/qt/tests/t-ownertrust.cpp                     |   18 +-
 lang/qt/tests/t-support.cpp                        |    2 +
 lang/qt/tests/t-support.h                          |   10 +-
 lang/qt/tests/t-tofuinfo.cpp                       |  291 +++-
 lang/qt/tests/t-various.cpp                        |  167 ++
 lang/qt/tests/t-verify.cpp                         |    8 +-
 lang/qt/tests/t-wkspublish.cpp                     |   52 +-
 m4/ax_python_devel.m4                              |    7 +-
 m4/python.m4                                       |  241 +++
 m4/qt.m4                                           |    6 +-
 src/context.h                                      |    6 +-
 src/conversion.c                                   |   19 +
 src/data-compat.c                                  |   13 -
 src/data.c                                         |   14 +
 src/debug.c                                        |   14 +-
 src/decrypt-verify.c                               |   67 +-
 src/decrypt.c                                      |   18 +-
 src/dirinfo.c                                      |   12 +
 src/engine-assuan.c                                |   18 +-
 src/engine-backend.h                               |    8 +-
 src/engine-g13.c                                   |   18 +-
 src/engine-gpg.c                                   |  108 +-
 src/engine-gpgconf.c                               |   71 +-
 src/engine-gpgsm.c                                 |   52 +-
 src/engine-spawn.c                                 |    2 +-
 src/engine-uiserver.c                              |   87 +-
 src/engine.c                                       |   36 +-
 src/engine.h                                       |   17 +-
 src/funopen.c                                      |   63 -
 src/genkey.c                                       |   62 +-
 src/gpgme.c                                        |    8 +
 src/gpgme.def                                      |   13 +-
 src/gpgme.h.in                                     |  805 +++++-----
 src/import.c                                       |    4 +-
 src/key.c                                          |   39 +-
 src/keylist.c                                      |   84 +-
 src/libgpgme.vers                                  |    7 +
 src/op-support.c                                   |    1 +
 src/ops.h                                          |    3 +
 src/posix-io.c                                     |  116 +-
 src/progress.c                                     |    8 +
 src/util.h                                         |   14 +-
 src/vasprintf.c                                    |  206 ---
 src/verify.c                                       |   39 +-
 src/versioninfo.rc.in                              |    2 +-
 src/vfs-create.c                                   |    8 +-
 src/vfs-mount.c                                    |   10 +-
 src/w32-io.c                                       |   14 +-
 src/w32-util.c                                     |    5 +-
 tests/gpg/Makefile.am                              |    3 +-
 tests/gpg/t-gpgconf.c                              |  161 +-
 tests/gpg/t-support.h                              |   28 +
 tests/gpg/t-thread-keylist-verify.c                |    2 +-
 tests/gpg/t-thread-keylist.c                       |    2 +-
 tests/run-decrypt.c                                |   18 +-
 tests/run-encrypt.c                                |   12 +
 tests/run-genkey.c                                 |   69 +-
 tests/run-keylist.c                                |   36 +-
 tests/run-sign.c                                   |    4 +
 tests/start-stop-agent                             |   21 +-
 tests/t-engine-info.c                              |    4 +-
 135 files changed, 6191 insertions(+), 1664 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git



More information about the Pkg-gnupg-commit mailing list