summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-05-27 22:34:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-29 14:38:31 +0100
commit9c5cb4e2b51e605523d636f57d071593a01014ee (patch)
treebcc55294f9c53f17d84eb95dc0a446ef2758ae25
parent1aeeb17a01c4a585b84ed52bd29d47e3e027d0b0 (diff)
downloadopenembedded-core-contrib-9c5cb4e2b51e605523d636f57d071593a01014ee.tar.gz
openembedded-core-contrib-9c5cb4e2b51e605523d636f57d071593a01014ee.tar.bz2
openembedded-core-contrib-9c5cb4e2b51e605523d636f57d071593a01014ee.zip
gnupg: 2.1.2 -> 2.1.4
Updated dirmngr-uses-libgpg-error.patch. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch8
-rw-r--r--meta/recipes-support/gnupg/gnupg_2.1.4.bb (renamed from meta/recipes-support/gnupg/gnupg_2.1.2.bb)4
2 files changed, 6 insertions, 6 deletions
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 3dc506c2f2..7af1955d52 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
index 4784869a2c..72635a2cd9 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 \