summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-06-07 19:54:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:15 +0100
commit6e54d3bc95ad906468cf577bc76f8f59866bdd46 (patch)
tree35c08d2978fd65d4b92e9ef26e9ed8cbe83f7f36 /meta
parentbd418a059b5b95315dc9a47b9dfb89afe972cefa (diff)
downloadpoky-6e54d3bc95ad906468cf577bc76f8f59866bdd46.tar.gz
gpgme: 1.4.3 -> 1.5.4
* Update pkgconfig.patch * Remove gpgme-fix-CVE-2014-3564.patch since it is a backport patch * The license checksum of src/gpgme.h.in is changed because it added the year 2014, the conten are the same. * Remove --without-gpgsm --with-g13 --with-gpgconf --with-gpg from EXTRA_OECONF, it doesn't have these options any more, and the values will checked located at runtime. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch56
-rw-r--r--meta/recipes-support/gpgme/gpgme/gpgme.pc (renamed from meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc)0
-rw-r--r--meta/recipes-support/gpgme/gpgme/pkgconfig.patch (renamed from meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch)117
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.5.4.bb (renamed from meta/recipes-support/gpgme/gpgme_1.4.3.bb)10
4 files changed, 63 insertions, 120 deletions
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
deleted file mode 100644
index c728f58658..0000000000
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme-fix-CVE-2014-3564.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1Upstream-Status: Backport
2
3Backport patch to fix CVE-2014-3564.
4
5http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=2cbd76f7911fc215845e89b50d6af5ff4a83dd77
6
7Signed-off-by: Kai Kang <kai.kang@windriver.com>
8---
9From 2cbd76f7911fc215845e89b50d6af5ff4a83dd77 Mon Sep 17 00:00:00 2001
10From: Werner Koch <wk@gnupg.org>
11Date: Wed, 30 Jul 2014 11:04:55 +0200
12Subject: [PATCH 1/1] Fix possible realloc overflow for gpgsm and uiserver
13 engines.
14
15After a realloc (realloc is also used for initial alloc) the allocated
16size if the buffer is not correctly recorded. Thus an overflow can be
17introduced by receiving data with different line lengths in a specific
18order. This is not easy exploitable because libassuan constructs the
19line. However a crash has been reported and thus it might be possible
20to constructs an exploit.
21
22CVE-id: CVE-2014-3564
23Reported-by: Tomáš Trnka
24---
25 src/engine-gpgsm.c | 2 +-
26 src/engine-uiserver.c | 2 +-
27 3 files changed, 5 insertions(+), 2 deletions(-)
28
29diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
30index 8ec1598..3a83757 100644
31--- a/src/engine-gpgsm.c
32+++ b/src/engine-gpgsm.c
33@@ -836,7 +836,7 @@ status_handler (void *opaque, int fd)
34 else
35 {
36 *aline = newline;
37- gpgsm->colon.attic.linesize += linelen + 1;
38+ gpgsm->colon.attic.linesize = *alinelen + linelen + 1;
39 }
40 }
41 if (!err)
42diff --git a/src/engine-uiserver.c b/src/engine-uiserver.c
43index 2738c36..a7184b7 100644
44--- a/src/engine-uiserver.c
45+++ b/src/engine-uiserver.c
46@@ -698,7 +698,7 @@ status_handler (void *opaque, int fd)
47 else
48 {
49 *aline = newline;
50- uiserver->colon.attic.linesize += linelen + 1;
51+ uiserver->colon.attic.linesize = *alinelen + linelen + 1;
52 }
53 }
54 if (!err)
55--
562.1.4
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc b/meta/recipes-support/gpgme/gpgme/gpgme.pc
index 30a4d56d6e..30a4d56d6e 100644
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/gpgme.pc
+++ b/meta/recipes-support/gpgme/gpgme/gpgme.pc
diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
index b29cd70790..f79e8658ae 100644
--- a/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
@@ -4,11 +4,11 @@ simpler and less error prone when cross compiling.
4Upstream-Status: Rejected [Upstream not interested in pkg-config support] 4Upstream-Status: Rejected [Upstream not interested in pkg-config support]
5RP 2015/4/17 5RP 2015/4/17
6 6
7Index: gpgme-1.4.3/configure.ac 7diff --git a/configure.ac b/configure.ac
8=================================================================== 8index 298a22b..c778b61 100644
9--- gpgme-1.4.3.orig/configure.ac 9--- a/configure.ac
10+++ gpgme-1.4.3/configure.ac 10+++ b/configure.ac
11@@ -1058,6 +1058,7 @@ AC_CONFIG_FILES(Makefile src/Makefile 11@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
12 src/versioninfo.rc 12 src/versioninfo.rc
13 src/gpgme.h) 13 src/gpgme.h)
14 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) 14 AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
@@ -16,13 +16,13 @@ Index: gpgme-1.4.3/configure.ac
16 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) 16 AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
17 AC_OUTPUT 17 AC_OUTPUT
18 18
19Index: gpgme-1.4.3/src/Makefile.am 19diff --git a/src/Makefile.am b/src/Makefile.am
20=================================================================== 20index 58922f9..40d0dca 100644
21--- gpgme-1.4.3.orig/src/Makefile.am 21--- a/src/Makefile.am
22+++ gpgme-1.4.3/src/Makefile.am 22+++ b/src/Makefile.am
23@@ -20,11 +20,13 @@ 23@@ -20,11 +20,13 @@
24 24
25 # Note: moc_kdpipeiodevice should actually be a dependcy below. 25 # Note: moc_kdpipeiodevice should actually be a dependecy below.
26 EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ 26 EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
27- gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp 27- gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
28+ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in 28+ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in
@@ -34,32 +34,12 @@ Index: gpgme-1.4.3/src/Makefile.am
34+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc 34+pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
35 nodist_include_HEADERS = gpgme.h 35 nodist_include_HEADERS = gpgme.h
36 36
37 if HAVE_PTHREAD 37 bin_PROGRAMS = gpgme-tool
38Index: gpgme-1.4.3/src/gpgme.pc.in 38diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
39=================================================================== 39new file mode 100644
40index 0000000..980a48e
40--- /dev/null 41--- /dev/null
41+++ gpgme-1.4.3/src/gpgme.pc.in 42+++ b/src/gpgme-pthread.pc.in
42@@ -0,0 +1,15 @@
43+prefix=@prefix@
44+exec_prefix=@exec_prefix@
45+libdir=@libdir@
46+includedir=@includedir@
47+
48+# API info
49+api_version=@GPGME_CONFIG_API_VERSION@
50+host=@GPGME_CONFIG_HOST@
51+
52+Name: gpgme
53+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
54+Version: @VERSION@
55+Libs: -L${libdir} -lgpgme
56+Cflags: -I${includedir}
57+Requires: libassuan gpg-error
58\ No newline at end of file
59Index: gpgme-1.4.3/src/gpgme-pthread.pc.in
60===================================================================
61--- /dev/null
62+++ gpgme-1.4.3/src/gpgme-pthread.pc.in
63@@ -0,0 +1,15 @@ 43@@ -0,0 +1,15 @@
64+prefix=@prefix@ 44+prefix=@prefix@
65+exec_prefix=@exec_prefix@ 45+exec_prefix=@exec_prefix@
@@ -76,12 +56,12 @@ Index: gpgme-1.4.3/src/gpgme-pthread.pc.in
76+Libs: -L${libdir} -lgpgme-pthread -lpthread 56+Libs: -L${libdir} -lgpgme-pthread -lpthread
77+Cflags: -I${includedir} 57+Cflags: -I${includedir}
78+Requires: libassuan gpg-error 58+Requires: libassuan gpg-error
79Index: gpgme-1.4.3/src/gpgme.m4 59diff --git a/src/gpgme.m4 b/src/gpgme.m4
80=================================================================== 60index 6c2be44..d8a75cb 100644
81--- gpgme-1.4.3.orig/src/gpgme.m4 61--- a/src/gpgme.m4
82+++ gpgme-1.4.3/src/gpgme.m4 62+++ b/src/gpgme.m4
83@@ -36,7 +36,7 @@ dnl [ACTION-IF-FOUND [, AC 63@@ -79,7 +79,7 @@ dnl config script does not match the host specification the script
84 dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. 64 dnl is added to the gpg_config_script_warn variable.
85 dnl 65 dnl
86 AC_DEFUN([AM_PATH_GPGME], 66 AC_DEFUN([AM_PATH_GPGME],
87-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl 67-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl
@@ -89,11 +69,10 @@ Index: gpgme-1.4.3/src/gpgme.m4
89 tmp=ifelse([$1], ,1:0.4.2,$1) 69 tmp=ifelse([$1], ,1:0.4.2,$1)
90 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 70 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
91 req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 71 req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
92@@ -45,37 +45,12 @@ AC_DEFUN([AM_PATH_GPGME], 72@@ -89,36 +89,12 @@ AC_DEFUN([AM_PATH_GPGME],
93 req_gpgme_api=0
94 min_gpgme_version="$tmp" 73 min_gpgme_version="$tmp"
95 fi 74 fi
96- 75
97- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) 76- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version)
98- ok=no 77- ok=no
99- if test "$GPGME_CONFIG" != "no" ; then 78- if test "$GPGME_CONFIG" != "no" ; then
@@ -105,7 +84,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
105- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 84- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
106- if test "$gpgme_version_major" -gt "$req_major"; then 85- if test "$gpgme_version_major" -gt "$req_major"; then
107- ok=yes 86- ok=yes
108- else 87- else
109- if test "$gpgme_version_major" -eq "$req_major"; then 88- if test "$gpgme_version_major" -eq "$req_major"; then
110- if test "$gpgme_version_minor" -gt "$req_minor"; then 89- if test "$gpgme_version_minor" -gt "$req_minor"; then
111- ok=yes 90- ok=yes
@@ -119,7 +98,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
119- fi 98- fi
120- fi 99- fi
121- fi 100- fi
122+ PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no]) 101+ PKG_CHECK_MODULES(GPGME, [gpgme >= $min_gpgme_version], [ok=yes], [ok=no])
123 if test $ok = yes; then 102 if test $ok = yes; then
124 # If we have a recent GPGME, we should also check that the 103 # If we have a recent GPGME, we should also check that the
125 # API is compatible. 104 # API is compatible.
@@ -129,7 +108,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
129 if test "$tmp" -gt 0 ; then 108 if test "$tmp" -gt 0 ; then
130 if test "$req_gpgme_api" -ne "$tmp" ; then 109 if test "$req_gpgme_api" -ne "$tmp" ; then
131 ok=no 110 ok=no
132@@ -84,18 +59,10 @@ AC_DEFUN([AM_PATH_GPGME], 111@@ -127,19 +103,11 @@ AC_DEFUN([AM_PATH_GPGME],
133 fi 112 fi
134 fi 113 fi
135 if test $ok = yes; then 114 if test $ok = yes; then
@@ -137,6 +116,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
137- GPGME_LIBS=`$GPGME_CONFIG --libs` 116- GPGME_LIBS=`$GPGME_CONFIG --libs`
138- AC_MSG_RESULT(yes) 117- AC_MSG_RESULT(yes)
139 ifelse([$2], , :, [$2]) 118 ifelse([$2], , :, [$2])
119 _AM_PATH_GPGME_CONFIG_HOST_CHECK
140 else 120 else
141- GPGME_CFLAGS="" 121- GPGME_CFLAGS=""
142- GPGME_LIBS="" 122- GPGME_LIBS=""
@@ -148,7 +128,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
148 ]) 128 ])
149 129
150 dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, 130 dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION,
151@@ -104,7 +71,7 @@ dnl Test for libgpgme and define GPGME_P 131@@ -148,7 +116,7 @@ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS
152 dnl and GPGME_PTHREAD_LIBS. 132 dnl and GPGME_PTHREAD_LIBS.
153 dnl 133 dnl
154 AC_DEFUN([AM_PATH_GPGME_PTHREAD], 134 AC_DEFUN([AM_PATH_GPGME_PTHREAD],
@@ -157,7 +137,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
157 tmp=ifelse([$1], ,1:0.4.2,$1) 137 tmp=ifelse([$1], ,1:0.4.2,$1)
158 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 138 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
159 req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` 139 req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
160@@ -114,38 +81,13 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], 140@@ -158,38 +126,12 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
161 min_gpgme_version="$tmp" 141 min_gpgme_version="$tmp"
162 fi 142 fi
163 143
@@ -173,7 +153,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
173- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 153- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
174- if test "$gpgme_version_major" -gt "$req_major"; then 154- if test "$gpgme_version_major" -gt "$req_major"; then
175- ok=yes 155- ok=yes
176- else 156- else
177- if test "$gpgme_version_major" -eq "$req_major"; then 157- if test "$gpgme_version_major" -eq "$req_major"; then
178- if test "$gpgme_version_minor" -gt "$req_minor"; then 158- if test "$gpgme_version_minor" -gt "$req_minor"; then
179- ok=yes 159- ok=yes
@@ -188,8 +168,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
188- fi 168- fi
189- fi 169- fi
190- fi 170- fi
191+ PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no]) 171+ PKG_CHECK_MODULES(GPGME_PTHREAD, [gpgme-pthread >= $min_gpgme_version], [ok=yes], [ok=no])
192+
193 if test $ok = yes; then 172 if test $ok = yes; then
194 # If we have a recent GPGME, we should also check that the 173 # If we have a recent GPGME, we should also check that the
195 # API is compatible. 174 # API is compatible.
@@ -199,7 +178,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
199 if test "$tmp" -gt 0 ; then 178 if test "$tmp" -gt 0 ; then
200 if test "$req_gpgme_api" -ne "$tmp" ; then 179 if test "$req_gpgme_api" -ne "$tmp" ; then
201 ok=no 180 ok=no
202@@ -154,18 +96,10 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], 181@@ -198,19 +140,11 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD],
203 fi 182 fi
204 fi 183 fi
205 if test $ok = yes; then 184 if test $ok = yes; then
@@ -207,6 +186,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
207- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` 186- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs`
208- AC_MSG_RESULT(yes) 187- AC_MSG_RESULT(yes)
209 ifelse([$2], , :, [$2]) 188 ifelse([$2], , :, [$2])
189 _AM_PATH_GPGME_CONFIG_HOST_CHECK
210 else 190 else
211- GPGME_PTHREAD_CFLAGS="" 191- GPGME_PTHREAD_CFLAGS=""
212- GPGME_PTHREAD_LIBS="" 192- GPGME_PTHREAD_LIBS=""
@@ -218,7 +198,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
218 ]) 198 ])
219 199
220 200
221@@ -184,36 +118,13 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], 201@@ -229,36 +163,12 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
222 min_gpgme_version="$tmp" 202 min_gpgme_version="$tmp"
223 fi 203 fi
224 204
@@ -233,7 +213,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
233- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 213- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
234- if test "$gpgme_version_major" -gt "$req_major"; then 214- if test "$gpgme_version_major" -gt "$req_major"; then
235- ok=yes 215- ok=yes
236- else 216- else
237- if test "$gpgme_version_major" -eq "$req_major"; then 217- if test "$gpgme_version_major" -eq "$req_major"; then
238- if test "$gpgme_version_minor" -gt "$req_minor"; then 218- if test "$gpgme_version_minor" -gt "$req_minor"; then
239- ok=yes 219- ok=yes
@@ -248,7 +228,6 @@ Index: gpgme-1.4.3/src/gpgme.m4
248- fi 228- fi
249- fi 229- fi
250+ PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no]) 230+ PKG_CHECK_MODULES(GPGME_GLIB, [gpgme >= $min_gpgme_version glib-2.0], [ok=yes], [ok=no])
251+
252 if test $ok = yes; then 231 if test $ok = yes; then
253 # If we have a recent GPGME, we should also check that the 232 # If we have a recent GPGME, we should also check that the
254 # API is compatible. 233 # API is compatible.
@@ -258,7 +237,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
258 if test "$tmp" -gt 0 ; then 237 if test "$tmp" -gt 0 ; then
259 if test "$req_gpgme_api" -ne "$tmp" ; then 238 if test "$req_gpgme_api" -ne "$tmp" ; then
260 ok=no 239 ok=no
261@@ -222,17 +133,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], 240@@ -267,17 +177,9 @@ AC_DEFUN([AM_PATH_GPGME_GLIB],
262 fi 241 fi
263 fi 242 fi
264 if test $ok = yes; then 243 if test $ok = yes; then
@@ -266,6 +245,7 @@ Index: gpgme-1.4.3/src/gpgme.m4
266- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` 245- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs`
267- AC_MSG_RESULT(yes) 246- AC_MSG_RESULT(yes)
268 ifelse([$2], , :, [$2]) 247 ifelse([$2], , :, [$2])
248 _AM_PATH_GPGME_CONFIG_HOST_CHECK
269 else 249 else
270- GPGME_GLIB_CFLAGS="" 250- GPGME_GLIB_CFLAGS=""
271- GPGME_GLIB_LIBS="" 251- GPGME_GLIB_LIBS=""
@@ -275,4 +255,25 @@ Index: gpgme-1.4.3/src/gpgme.m4
275- AC_SUBST(GPGME_GLIB_CFLAGS) 255- AC_SUBST(GPGME_GLIB_CFLAGS)
276- AC_SUBST(GPGME_GLIB_LIBS) 256- AC_SUBST(GPGME_GLIB_LIBS)
277 ]) 257 ])
278 258diff --git a/src/gpgme.pc.in b/src/gpgme.pc.in
259new file mode 100644
260index 0000000..b69539f
261--- /dev/null
262+++ b/src/gpgme.pc.in
263@@ -0,0 +1,15 @@
264+prefix=@prefix@
265+exec_prefix=@exec_prefix@
266+libdir=@libdir@
267+includedir=@includedir@
268+
269+# API info
270+api_version=@GPGME_CONFIG_API_VERSION@
271+host=@GPGME_CONFIG_HOST@
272+
273+Name: gpgme
274+Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program.
275+Version: @VERSION@
276+Libs: -L${libdir} -lgpgme
277+Cflags: -I${includedir}
278+Requires: libassuan gpg-error
279\ No newline at end of file
diff --git a/meta/recipes-support/gpgme/gpgme_1.4.3.bb b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
index f80457842b..1598377d6e 100644
--- a/meta/recipes-support/gpgme/gpgme_1.4.3.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.5.4.bb
@@ -6,22 +6,20 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
6LICENSE = "GPLv2+ & LGPLv2.1+" 6LICENSE = "GPLv2+ & LGPLv2.1+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ 8 file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
9 file://src/gpgme.h.in;endline=23;md5=dccb4bb624011e36513c61ef0422d054 \ 9 file://src/gpgme.h.in;endline=23;md5=71ba2ae8d6ca034ed10bd099a8cf473c \
10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" 10 file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d"
11 11
12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \ 12SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/${BP}.tar.bz2 \
13 file://gpgme.pc \ 13 file://gpgme.pc \
14 file://pkgconfig.patch \ 14 file://pkgconfig.patch \
15 file://gpgme-fix-CVE-2014-3564.patch \
16 " 15 "
17 16
18SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672" 17SRC_URI[md5sum] = "feafa03ea064e1d1dc11bc2b88404623"
19SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496" 18SRC_URI[sha256sum] = "bb38c0ec8815c9e94e6047b484984808a8dad9d6bec8df33dc5339fd55ffea6c"
20 19
21DEPENDS = "libgpg-error libassuan" 20DEPENDS = "libgpg-error libassuan"
22 21
23BINCONFIG = "${bindir}/gpgme-config" 22BINCONFIG = "${bindir}/gpgme-config"
24EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm --with-gpgconf=no --with-g13=no"
25 23
26inherit autotools texinfo binconfig-disabled pkgconfig 24inherit autotools texinfo binconfig-disabled pkgconfig
27 25