gnupg, branch npth

Merge branch 'master' into npth

2012-01-03T17:13:19Z

Conflicts: ChangeLog-2011 Makefile.am agent/ChangeLog-2011 agent/gpg-agent.c dirmngr/ChangeLog-2011 dirmngr/dirmngr.c doc/HACKING g13/g13.c po/de.po scd/ChangeLog-2011 scd/apdu.c scd/command.c scd/scdaemon.c scripts/gitlog-to-changelog tools/ChangeLog-2011

Silence gcc warning.

2012-01-03T16:38:24Z

* sm/call-dirmngr.c (get_cached_cert): Make sure buflen is initialized.

Revert last change, add comment about link() return values.

2012-01-03T16:32:41Z

* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Do not check return value of link().

Fix compiler warnings.

2012-01-03T16:08:01Z

* common/dotlock.c (use_hardlinks_p, dotlock_take_unix): Check return value of link(). * g13/g13.c: Make sure err is initialized. * scd/scdaemon.c (main) [!USE_GCRY_THREAD_CBS]: Do not define ERR.

Fix last change: Only set gcrypt thread callback for older versions.

2012-01-03T15:50:52Z

* dirmngr/dirmngr.c, g13/g13.c: Rename FIX_GCRY_PTH_INIT to USE_GCRY_THREAD_CBS.

Terminate csh commands with a semicolon also for dirmngr.

2012-01-03T10:14:14Z

* dirmngr/dirmngr.c (main): Terminate csh style output with a semicolon.

Terminate csh commands with a semicolon.

2012-01-03T10:13:30Z

Fixes bug#1386. * agent/gpg-agent.c (main): Terminate csh style output with a semicolon. * scd/scdaemon.c: Ditto.

Only set gcrypt thread callback for older version of gcrypt.

2012-01-02T21:15:00Z

* agent/gpg-agent.c, dirmngr/dirmngr.c, g13/g13.c, scd/scdaemon.c (USE_GCRY_THREAD_CBS): New macro, defined if GCRY_THREAD_OPTION_VERSION is 0. (fixed_gcry_pth_init) [!USE_GCRY_THREAD_CBS]: Don't define. (main) [!USE_GCRY_THREAD_CBS]: Do not install thread callbacks.

Use the longest key ID available when talking to a HKP server.

2011-12-28T21:53:36Z

This is issue 1340. Now that PKSD is dead, and SKS supports long key IDs, this is safe to do. Patch from Daniel Kahn Gillmor .

Post-release version number update

2011-12-20T16:10:28Z