diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-05-27 22:34:15 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-30 22:26:12 +0100 |
| commit | b47ef4ff7ecccabbdc9b383e0c883693d2f38e8e (patch) | |
| tree | ad7dc142a1333a51d1d73575e55c426187ed3ec5 /meta/recipes-support/gnupg | |
| parent | 917ca4d70bc7724bbf9420da94fe846f79a7f7d5 (diff) | |
| download | poky-b47ef4ff7ecccabbdc9b383e0c883693d2f38e8e.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-support/gnupg')
| -rw-r--r-- | meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch | 8 | ||||
| -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 | |||
| 4 | =================================================================== | 4 | =================================================================== |
| 5 | --- gnupg-2.1.0.orig/dirmngr/Makefile.am | 5 | --- gnupg-2.1.0.orig/dirmngr/Makefile.am |
| 6 | +++ gnupg-2.1.0/dirmngr/Makefile.am | 6 | +++ gnupg-2.1.0/dirmngr/Makefile.am |
| 7 | @@ -71,7 +71,8 @@ endif | 7 | @@ -78,7 +78,8 @@ endif |
| 8 | dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ | 8 | dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ |
| 9 | ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ | 9 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ |
| 10 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ | 10 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ |
| 11 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) | 11 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) |
| 12 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ | 12 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ |
| 13 | + $(GPG_ERROR_LIBS) | 13 | + $(GPG_ERROR_LIBS) |
| 14 | if !USE_LDAPWRAPPER | 14 | if USE_LDAP |
| 15 | dirmngr_LDADD += $(ldaplibs) | 15 | dirmngr_LDADD += $(ldaplibs) |
| 16 | endif | 16 | 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 \ | |||
| 14 | file://dirmngr-uses-libgpg-error.patch \ | 14 | file://dirmngr-uses-libgpg-error.patch \ |
| 15 | " | 15 | " |
| 16 | 16 | ||
| 17 | SRC_URI[md5sum] = "156fbd6566f4c51caac741c858d30d96" | 17 | SRC_URI[md5sum] = "c36f1a4c261ecc81fa5df551356c33f1" |
| 18 | SRC_URI[sha256sum] = "404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792" | 18 | SRC_URI[sha256sum] = "64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0" |
| 19 | 19 | ||
| 20 | EXTRA_OECONF = "--disable-ldap \ | 20 | EXTRA_OECONF = "--disable-ldap \ |
| 21 | --disable-ccid-driver \ | 21 | --disable-ccid-driver \ |