Changes from 2.0 branch to master?

[NIIBE Yutaka]

Thank you.

I looked through more... to the date of gnupg-2.1.0beta3.

I think that we should consider picking following nine changes to
master.

Five commits are about the keyserver.  Those can't be applied
directly.  I includes them here for the references.

I'm going to evaluate two commits of mine, soon.

Remaining two commits are minor.


======= Minor ============

commit 7db5c81e3a40b60e146f29c6744a33fd1b88c090
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 16 10:35:33 2012 +0100

    Comment fixes.
    
    --
    
    Reported-by: Daniel Kahn Gillmor

commit 1731ed88491559aca395bc0596cdc0ee3ea1fa3e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 30 15:29:35 2012 +0200

    Cast second value of a ?: to void in estream.c.
    
    * common/estream.c (ESTREAM_MUTEX_LOCK): Cast pth_mutex_acquire result
    to void.  Some compilers choke on mixing void and int in an
    conditional operator.  Reported by Nelson H. F. Beebe.

======= Mine ============

commit 4f557cb9c2ebe274d6aacc60a09cd919055d01ed
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jun 18 15:08:01 2012 +0900

    scd: acquire lock in new_reader_slot.
    
    * scd/apdu.c (new_reader_slot): Acquire lock.
      (open_ct_reader, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
      (open_ccid_reader, open_rapdu_reader): Release lock.
    
    --
    Fixes a test case of:
       No libpcsclite1 installed.
       Run gpg-agent
       Run command "gpg-connect-agent learn /bye" with no card/token
       Sometimes it fails: ERR 100663356 Not supported <SCD>
       While it should be always: ERR 100663404 Card error <SCD>

commit 233b5ab1ad90588e7a40d2009b9f10d91e3b0c7d
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Jun 18 14:52:53 2012 +0900

    scd: move lock_slot, trylock_slot, unlock_slot functions.
    
    * scd/apdu.c (lock_slot, trylock_slot, unlock_slot): Move.
    
    --
    This is for upcoming changes.


======= Keyserver ============

commit 8c32d4de57b8b0b5e1be3022d4056a854c568745
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Thu Dec 20 18:12:29 2012 -0500

    Make sure srvcount is initialized.
    
    * keyserver/gpgkeys_hkp.c (srv_replace): Initialize srvcount.

commit 732f3d1d4786239db5f31f82cc04ec79326cc13c
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Tue Dec 18 00:08:51 2012 -0500

    No point in defaulting try-dns-srv to on if we don't have SRV support.
    
    * keyserver/gpgkeys_hkp.c (main): Only default try-dns-srv to on if we
      have SRV support in the first place.

commit 6b1f71055ebab36989e2089cfde319d2ba40ada7
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Mon Dec 17 23:52:15 2012 -0500

    Issue 1447: Pass proper Host header and SNI when SRV is used with curl.
    
    * configure.ac: Check for inet_ntop.
    
    * m4/libcurl.m4: Provide a #define for the version of the curl
      library.
    
    * keyserver/gpgkeys_hkp.c (main, srv_replace): Call getaddrinfo() on
      each target.  Once we find one that resolves to an address (whether
      IPv4 or IPv6), pass it into libcurl via CURLOPT_RESOLVE using the
      SRV name as the "host".  Force the HTTP Host header to be the same.

commit cbe98b2cb1e40ba253300e604996681ae191e363
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Sat Dec 15 10:35:19 2012 -0500

    Part of issue 1447: Pass proper Host header when SRV is used.
    
    * common/http.c (send_request, connect_server): Set proper Host header
      (no :port, host is that of the SRV) when SRV is used in the
      curl-shim.

commit ba9e974f1fd85b3dbbfb5e26d7a14f71d07c7cf2
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Sat Dec 15 10:11:11 2012 -0500

    Fix issue 1446: honor ports given in SRV responses.
    
    * common/http.c (send_request, connect_server, http_open): Use a
      struct srv instead of a single srvtag so we can pass the chosen host
      and port back to the caller.
      (connect_server): Use the proper port in the HAVE_GETADDRINFO case.
    
    * keyserver/curl-shim.c (curl_easy_perform): Use struct srv and log
      chosen host and port.
    
    * keyserver/gpgkeys_hkp.c (main): Properly take the port given by SRV.
--