From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 28 May 2015 05:34:15 +0000 (-0700)
Subject: gnupg: 2.1.2 -> 2.1.4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b47ef4ff7ecccabbdc9b383e0c883693d2f38e8e;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

gnupg: 2.1.2 -> 2.1.4

Updated dirmngr-uses-libgpg-error.patch.

(From OE-Core rev: 9c5cb4e2b51e605523d636f57d071593a01014ee)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
index 3dc506c2f27..7af1955d520 100644
--- a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
+++ b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch
@@ -4,13 +4,13 @@ Index: gnupg-2.1.0/dirmngr/Makefile.am
 ===================================================================
 --- gnupg-2.1.0.orig/dirmngr/Makefile.am
 +++ gnupg-2.1.0/dirmngr/Makefile.am
-@@ -71,7 +71,8 @@ endif
+@@ -78,7 +78,8 @@ endif
  dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \
-         ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \
+         $(DNSLIBS) $(LIBASSUAN_LIBS) \
  	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
 -	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
 +	$(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
-+        $(GPG_ERROR_LIBS)
- if !USE_LDAPWRAPPER
++	$(GPG_ERROR_LIBS)
+ if USE_LDAP
  dirmngr_LDADD += $(ldaplibs)
  endif
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.2.bb b/meta/recipes-support/gnupg/gnupg_2.1.4.bb
similarity index 89%
rename from meta/recipes-support/gnupg/gnupg_2.1.2.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.4.bb
index 4784869a2c0..72635a2cd95 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.2.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.4.bb
@@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://dirmngr-uses-libgpg-error.patch \
           "
 
-SRC_URI[md5sum] = "156fbd6566f4c51caac741c858d30d96"
-SRC_URI[sha256sum] = "404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792"
+SRC_URI[md5sum] = "c36f1a4c261ecc81fa5df551356c33f1"
+SRC_URI[sha256sum] = "64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \