Changes from 2.0 branch to master?

[Werner Koch]

On Fri,  7 Mar 2014 06:41, gniibe at fsij.org said:

> Bring the fix for bug 739 on 1.4 over to 2.0 (bug 1479)
> author	David Shaw <dshaw at jabberwocky.com>	
> Fri, 1 Mar 2013 03:48:58 +0900 (13:48 -0500)
> commit	fe85638284880805b80778fe87ae551d3de0ca32

This is not required because of:

2010-07-16  Werner Koch  <wk at g10code.com>

	* http.h (HTTP_FLAG_IGNORE_CL): Add flag .
	* http.c (WITHOUT_GNU_PTH): Test macro for Pth support.
	(http_parse_uri): s/xcalloc/xtrycalloc/.
	(send_request): Replace of discrete allocation and sprintf by
	xtryasprintf.
	(http_wait_response): Replace HTTP_FLAG_NO_SHUTDOWN by
	HTTP_FLAG_SHUTDOWN to change the default to no shutdown.


> Emulate curl_easy_getinfo and CURLINFO_RESPONSE_CODE in curl-shim.
> author	David Shaw <dshaw at jabberwocky.com>	
> Sun, 3 Mar 2013 10:07:27 +0900 (20:07 -0500)
> commit	7808e4a763692b8bcd95264d39caf85fad32f0bd

Not required because curl is not anymore used.

> Differentiate between success (full or partial), not-found, and failure.
> author	David Shaw <dshaw at jabberwocky.com>	
> Sun, 3 Mar 2013 10:39:48 +0900 (20:39 -0500)
> commit	6d0e41815a726ad4b170ed18cc772a1817559299

I'll make sure that the new dirmngr code works similar.

> *
> Allow marking options as ignored.
> author	Werner Koch <wk at gnupg.org>	
> Thu, 18 Apr 2013 21:40:43 +0900 (14:40 +0200)
> commit	54c54e2824aab5716a187bbbf6dff8860d6a6056

Taken.

> Ignore obsolete option --disable-keypad.
> author	Werner Koch <wk at gnupg.org>	
> Thu, 18 Apr 2013 21:40:43 +0900 (14:40 +0200)
> commit	e24e92d7e244edd578c0c1f0fba6e0070cb5f104

Taken.

> Allow building gpgkeys_ldap with the 32 bit mingw-w64 toolchain.
> author	Werner Koch <wk at gnupg.org>	
> Wed, 24 Apr 2013 00:04:56 +0900 (17:04 +0200)
> commit	a557a74615774b228dae14cf83a92ec26e2b03b5

To be considered for the new dirmngr.

> w32: Almost everywhere include winsock2.h before windows.h.
> author	Werner Koch <wk at gnupg.org>	
> Wed, 24 Apr 2013 01:06:46 +0900 (18:06 +0200)
> commit	40ca0022a7035ce5c3d715f36e0c70f310ea4c61

To many changes with a lot of white space changes.  It will be easier to
fix that by looking at the warnings.

> Fix syntax error for building on APPLE.
> author	Werner Koch <wk at gnupg.org>	
> Thu, 25 Apr 2013 20:00:16 +0900 (12:00 +0100)
> commit	8ddf604659b93754ffa6dea295678a8adc293f90

Taken.

> agent: Fix binary vs. text mode problem in ssh.
> author	Werner Koch <wk at gnupg.org>	
> Wed, 3 Jul 2013 20:10:29 +0900 (13:10 +0200)
> commit	ed056d67c7c93306b68829f83a2565e978dcfd9b

Taken.

> ssh: Add support for Putty.
> author	Werner Koch <wk at gnupg.org>	
> Wed, 3 Jul 2013 20:29:47 +0900 (13:29 +0200)
> commit	9f32499f99a0817f63f7a73b09bdcebe60d4775d

Taken.

>
> agent: Make --allow-mark-trusted the default.
> author	Werner Koch <wk at gnupg.org>	
> Wed, 3 Jul 2013 22:20:25 +0900 (15:20 +0200)
> commit	90b419f3e9d05e509348d047e05fcc79e87be6cf

Taken.

> w32: Remove unused code.
> author	Werner Koch <wk at gnupg.org>	
> Thu, 1 Aug 2013 21:02:50 +0900 (14:02 +0200)
> commit	1b89863ec195dbfdbc33432569a7b2e7f0f83821

Taken.

> gpg: Remove legacy keyserver examples from the template conf file.
> author	Werner Koch <wk at gnupg.org>	
> Tue, 6 Aug 2013 17:04:12 +0900 (10:04 +0200)
> commit	f3c5cc8bcd37e38b5d65db6a50466e22d03d1f0c

Taken.

>
> Improve libcurl detection.
> author	Werner Koch <wk at gnupg.org>	
> Tue, 6 Aug 2013 17:31:54 +0900 (10:31 +0200)
> commit	110b52fffa77b339e6d59eba939408f7e87e7138

Taken.  However we donot use libcurl.

> gpgv: Init Libgcrypt to avoid syslog warning.
> author	Werner Koch <wk at gnupg.org>	
> Mon, 19 Aug 2013 18:22:11 +0900 (11:22 +0200)
> commit	3966eb244518d5612385d35a5149f7164a9fb707

Taken.

> agent: Fix UPDATESTARTUPTTY for ssh.
> author	Werner Koch <wk at gnupg.org>	
> Mon, 19 Aug 2013 18:44:59 +0900 (11:44 +0200)
> commit	9f5578c29adba6d4f7d3650121d07322c2f8d254

Taken.

> keyserver: Allow use of cURL's default CA store.
> author	Werner Koch <wk at gnupg.org>	
> Fri, 4 Oct 2013 15:28:12 +0900 (08:28 +0200)
> commit	e957b9b3f408491f36660499b215aebcf2633a95

Not needed.

> gpg: Protect against rogue keyservers sending secret keys.
> author	Werner Koch <wk at gnupg.org>	
> Fri, 4 Oct 2013 20:44:39 +0900 (13:44 +0200)
> commit	e7abed3448c1c1a4e756c12f95b665b517d22ebe

Taken.

> gpg: Print a "not found" message for an unknown key in --key-edit.
> author	Werner Koch <wk at gnupg.org>	
> Sat, 5 Oct 2013 01:34:56 +0900 (18:34 +0200)
> commit	0bf54e60d31389812d05c3fd29bece876204561d

Taken

> gpg: Do not require a trustdb with --always-trust.
> author	Werner Koch <wk at gnupg.org>	
> Fri, 11 Oct 2013 16:25:58 +0900 (09:25 +0200)
> commit	1a0eeaacd1bf09fe5125dbc3f56016bc20f3512e

Taken.  Also added fix for Bug 1622.

> common: Fix build problem with Sun Studio compiler.
> author	Werner Koch <wk at gnupg.org>	
> Fri, 15 Nov 2013 17:08:58 +0900 (09:08 +0100)
> commit	571bcd4662a351cfa55bbf1a79ed1bc26da5780f

Taken.



Salam-Shalom,

   Werner

-- 
Die Gedanken sind frei.  Ausnahmen regelt ein Bundesgesetz.