src/libgcrypt-config.in | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 drop -lgpg-error from libgcrypt-config --libs output.

src/libgcrypt-config.in | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 do not print standard multiarch path
 {/usr,}/lib/i386-linux-gnu are in the standard search path, there is no
 need to explicitly point gcc there with a -L argument.

autogen.sh | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 do not pull revision info from git
 Stop trying to pull version info from GIT when autoconf is run.

NEWS | 4 4 + 0 - 0 !
configure.ac | 3 1 + 2 - 0 !
2 files changed, 5 insertions(+), 2 deletions(-)

 [patch 1/6] post release updates

--

mpi/mpi-internal.h | 3 0 + 3 - 0 !
1 file changed, 3 deletions(-)

 [patch 2/6] mpi: fix redefinition of types.

* mpi/mpi-internal.h (mpi_ptr_t): Remove, as it moved to mpi.h.
(mpi_size_t): Likewise.

--

Cherry-pick master commit of:
	85927387741fad2aba4f8cc01e3b10ff4ff4c57f

Fixes-commit: 88ae76d069c331ad947ecab8419df9a00f979b0e
GnuPG-bug-id: 7775
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

random/rndjent.c | 12 8 + 4 - 0 !
1 file changed, 8 insertions(+), 4 deletions(-)

 [patch 3/6] random:jent: fix for jent_rng_is_initialized.

* random/rndjent.c (_gcry_rndjent_poll): Set jent_rng_is_initialized
after successful initialization.
(_gcry_rndjent_fini): Clear jent_rng_is_initialized.

--

Cherry-pick master commit of:
	0ceca9993f5a94389624f6cf12e07165cd2391e4

Reported-by: Eric Berry <eric.berry@canonical.com>

mpi/mpiutil.c | 2 0 + 2 - 0 !
random/jitterentropy-base.c | 3 3 + 0 - 0 !
2 files changed, 3 insertions(+), 2 deletions(-)

 [patch 4/6] random:jent: fix build with address sanitizer.

* random/jitterentropy-base.c (jent_entropy_collector_alloc_internal):
Annotate with gpgrt_annotate_leaked_object.

--

Cherry-pick the master commit of:
	def1d4ea8f66abf23ef0def6d8d34060e1ee923e

Fixes-commit: 0ceca9993f5a94389624f6cf12e07165cd2391e4
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

src/secmem.c | 11 10 + 1 - 0 !
1 file changed, 10 insertions(+), 1 deletion(-)

 [patch 5/6] secmem: handle have_broken_mlock for the case with asan.

* src/secmem.c [HAVE_BROKEN_MLOCK] (lock_pool_pages): Take care when
build with address sanitizer.

--

Cherry pick the master commit of:
	fe06287003a153d358f2ddb62ce5d1ec112b2e5c

GnuPG-bug-id: 7889
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

cipher/aria.c | 8 1 + 7 - 0 !
1 file changed, 1 insertion(+), 7 deletions(-)

 [patch 6/6] cipher:aria: fix compiler error on netbsd.

* cipher/aria.c (bswap32): Remove function that conflicts with system
definitions on NetBSD.