From 9c5cb4e2b51e605523d636f57d071593a01014ee Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 27 May 2015 22:34:15 -0700
Subject: gnupg: 2.1.2 -> 2.1.4

Updated dirmngr-uses-libgpg-error.patch.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../gnupg/gnupg/dirmngr-uses-libgpg-error.patch    |  8 ++---
 meta/recipes-support/gnupg/gnupg_2.1.2.bb          | 41 ----------------------
 meta/recipes-support/gnupg/gnupg_2.1.4.bb          | 41 ++++++++++++++++++++++
 3 files changed, 45 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-support/gnupg/gnupg_2.1.2.bb
 create mode 100644 meta/recipes-support/gnupg/gnupg_2.1.4.bb

(limited to 'meta/recipes-support/gnupg')

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.2.bb
deleted file mode 100644
index 4784869a2c..0000000000
--- a/meta/recipes-support/gnupg/gnupg_2.1.2.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)"
-HOMEPAGE = "http://www.gnupg.org/"
-LICENSE = "GPLv3 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-                    file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-
-DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
-
-inherit autotools gettext texinfo pkgconfig
-
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://pkgconfig.patch \
-           file://use-pkgconfig-instead-of-npth-config.patch \
-           file://dirmngr-uses-libgpg-error.patch \
-          "
-
-SRC_URI[md5sum] = "156fbd6566f4c51caac741c858d30d96"
-SRC_URI[sha256sum] = "404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792"
-
-EXTRA_OECONF = "--disable-ldap \
-		--disable-ccid-driver \
-		--with-zlib=${STAGING_LIBDIR}/.. \
-		--with-bzip2=${STAGING_LIBDIR}/.. \
-                --with-readline=${STAGING_LIBDIR}/.. \
-               "
-RRECOMMENDS_${PN} = "pinentry"
-
-do_configure_prepend () {
-	# Else these could be used in prefernce to those in aclocal-copy
-	rm -f ${S}/m4/gpg-error.m4
-	rm -f ${S}/m4/libassuan.m4
-	rm -f ${S}/m4/ksba.m4
-	rm -f ${S}/m4/libgcrypt.m4
-}
-
-do_install_append() {
-	ln -sf gpg2 ${D}${bindir}/gpg
-	ln -sf gpgv2 ${D}${bindir}/gpgv
-}
-
-RDEPENDS_${PN} = "gnutls"
diff --git a/meta/recipes-support/gnupg/gnupg_2.1.4.bb b/meta/recipes-support/gnupg/gnupg_2.1.4.bb
new file mode 100644
index 0000000000..72635a2cd9
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg_2.1.4.bb
@@ -0,0 +1,41 @@
+SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)"
+HOMEPAGE = "http://www.gnupg.org/"
+LICENSE = "GPLv3 & LGPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
+                    file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
+
+DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
+
+inherit autotools gettext texinfo pkgconfig
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
+           file://pkgconfig.patch \
+           file://use-pkgconfig-instead-of-npth-config.patch \
+           file://dirmngr-uses-libgpg-error.patch \
+          "
+
+SRC_URI[md5sum] = "c36f1a4c261ecc81fa5df551356c33f1"
+SRC_URI[sha256sum] = "64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0"
+
+EXTRA_OECONF = "--disable-ldap \
+		--disable-ccid-driver \
+		--with-zlib=${STAGING_LIBDIR}/.. \
+		--with-bzip2=${STAGING_LIBDIR}/.. \
+                --with-readline=${STAGING_LIBDIR}/.. \
+               "
+RRECOMMENDS_${PN} = "pinentry"
+
+do_configure_prepend () {
+	# Else these could be used in prefernce to those in aclocal-copy
+	rm -f ${S}/m4/gpg-error.m4
+	rm -f ${S}/m4/libassuan.m4
+	rm -f ${S}/m4/ksba.m4
+	rm -f ${S}/m4/libgcrypt.m4
+}
+
+do_install_append() {
+	ln -sf gpg2 ${D}${bindir}/gpg
+	ln -sf gpgv2 ${D}${bindir}/gpgv
+}
+
+RDEPENDS_${PN} = "gnutls"
-- 
cgit 1.2.3-korg