summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2019-01-02 08:36:16 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 21:16:00 +0000
commita39f6074d42136e8b993f6eba44ef8c1be7708ca (patch)
treef801c27cf734a1245b6dfeddba8ddb9328e8ff33
parent142bfedad4e5eb829a3b321e57a947d7fe2f5145 (diff)
downloadpoky-a39f6074d42136e8b993f6eba44ef8c1be7708ca.tar.gz
libassuan: update to 2.5.2
Refresh patch (From OE-Core rev: ccb638d4463caffb4319910f24acb9843ab751c6) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch105
-rw-r--r--meta/recipes-support/libassuan/libassuan_2.5.2.bb (renamed from meta/recipes-support/libassuan/libassuan_2.5.1.bb)4
2 files changed, 39 insertions, 70 deletions
diff --git a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
index 525b076205..0e81454c63 100644
--- a/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
@@ -9,60 +9,11 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
9forward ported to 2.4.4 9forward ported to 2.4.4
10Signed-off-by: Armin Kuster <akuster@mvista.com> 10Signed-off-by: Armin Kuster <akuster@mvista.com>
11 11
12Index: libassuan-2.4.4/libassuan.pc.in 12Index: libassuan-2.5.2/src/libassuan.m4
13=================================================================== 13===================================================================
14--- /dev/null 14--- libassuan-2.5.2.orig/src/libassuan.m4
15+++ libassuan-2.4.4/libassuan.pc.in 15+++ libassuan-2.5.2/src/libassuan.m4
16@@ -0,0 +1,13 @@ 16@@ -16,27 +16,6 @@ dnl Returns ok set to yes or no.
17+prefix=@exec_prefix@
18+libdir=@libdir@
19+includedir=@includedir@
20+api_version=@LIBASSUAN_CONFIG_API_VERSION@
21+host=@LIBASSUAN_CONFIG_HOST@
22+
23+Name: libassuan
24+Description: IPC library used by GnuPG and GPGME
25+Requires:
26+Version: @VERSION@
27+Libs: -L${libdir} -lassuan
28+Libs.private: -lgpg-error
29+Cflags: -I${includedir}
30Index: libassuan-2.4.4/Makefile.am
31===================================================================
32--- a/Makefile.am
33+++ b/Makefile.am
34@@ -25,10 +25,13 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-doc
35 # (A suitable gitlog-to-changelog script can be found in GnuPG master.)
36 GITLOG_TO_CHANGELOG=gitlog-to-changelog
37
38+pkgconfigdir = $(libdir)/pkgconfig
39+pkgconfig_DATA = libassuan.pc
40+
41 EXTRA_DIST = autogen.sh autogen.rc README.GIT VERSION \
42 ChangeLog-2011 doc/ChangeLog-2011 src/ChangeLog-2011 \
43 tests/ChangeLog-2011 contrib/ChangeLog-2011 \
44- build-aux/git-log-footer build-aux/git-log-fix
45+ build-aux/git-log-footer build-aux/git-log-fix libassuan.pc.in
46
47 if BUILD_DOC
48 doc = doc
49Index: 2.4.4-r0/libassuan-2.4.4/configure.ac
50===================================================================
51--- a/configure.ac
52+++ b/configure.ac
53@@ -485,6 +485,7 @@ AC_CONFIG_FILES([doc/Makefile])
54 AC_CONFIG_FILES([tests/Makefile])
55 AC_CONFIG_FILES([src/libassuan-config], [chmod +x src/libassuan-config])
56 AC_CONFIG_FILES([src/versioninfo.rc])
57+AC_CONFIG_FILES([libassuan.pc])
58
59 AC_OUTPUT
60
61Index: libassuan-2.4.4/src/libassuan.m4
62===================================================================
63--- a/src/libassuan.m4
64+++ b/src/libassuan.m4
65@@ -16,18 +16,6 @@ dnl Returns ok set to yes or no.
66 dnl 17 dnl
67 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 18 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
68 [ AC_REQUIRE([AC_CANONICAL_HOST]) 19 [ AC_REQUIRE([AC_CANONICAL_HOST])
@@ -71,24 +22,32 @@ Index: libassuan-2.4.4/src/libassuan.m4
71- [prefix where LIBASSUAN is installed (optional)]), 22- [prefix where LIBASSUAN is installed (optional)]),
72- libassuan_config_prefix="$withval", libassuan_config_prefix="") 23- libassuan_config_prefix="$withval", libassuan_config_prefix="")
73- if test x$libassuan_config_prefix != x ; then 24- if test x$libassuan_config_prefix != x ; then
74- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
75- if test x${LIBASSUAN_CONFIG+set} != xset ; then 25- if test x${LIBASSUAN_CONFIG+set} != xset ; then
76- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config 26- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
77- fi 27- fi
78- fi 28- fi
79- 29-
80- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no) 30- use_gpgrt_config=""
31- if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
32- if $GPGRT_CONFIG libassuan --exists; then
33- LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
34- AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
35- use_gpgrt_config=yes
36- fi
37- fi
38- if test -z "$use_gpgrt_config"; then
39- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
40- fi
81 41
82 tmp=ifelse([$1], ,1:0.9.2,$1) 42 tmp=ifelse([$1], ,1:0.9.2,$1)
83 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 43 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
84@@ -38,51 +26,12 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 44@@ -47,58 +26,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
85 min_libassuan_version="$tmp" 45 min_libassuan_version="$tmp"
86 fi 46 fi
87 47
88- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) 48- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
89- ok=no 49- ok=no
90- if test "$LIBASSUAN_CONFIG" != "no" \ 50- if test "$LIBASSUAN_CONFIG" != "no"; then
91- && test -f "$LIBASSUAN_CONFIG" ; then
92- req_major=`echo $min_libassuan_version | \ 51- req_major=`echo $min_libassuan_version | \
93- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` 52- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
94- req_minor=`echo $min_libassuan_version | \ 53- req_minor=`echo $min_libassuan_version | \
@@ -96,7 +55,11 @@ Index: libassuan-2.4.4/src/libassuan.m4
96- req_micro=`echo $min_libassuan_version | \ 55- req_micro=`echo $min_libassuan_version | \
97- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` 56- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
98- 57-
99- libassuan_config_version=`$LIBASSUAN_CONFIG --version` 58- if test -z "$use_gpgrt_config"; then
59- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
60- else
61- libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
62- fi
100- major=`echo $libassuan_config_version | \ 63- major=`echo $libassuan_config_version | \
101- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` 64- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
102- minor=`echo $libassuan_config_version | \ 65- minor=`echo $libassuan_config_version | \
@@ -130,26 +93,32 @@ Index: libassuan-2.4.4/src/libassuan.m4
130 93
131 if test $ok = yes; then 94 if test $ok = yes; then
132 if test "$req_libassuan_api" -gt 0 ; then 95 if test "$req_libassuan_api" -gt 0 ; then
133 tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` 96- if test -z "$use_gpgrt_config"; then
97- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
98- else
99- tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
100- fi
134+ tmp=`$PKG_CONFIG --variable=api_version libassuan` 101+ tmp=`$PKG_CONFIG --variable=api_version libassuan`
135 if test "$tmp" -gt 0 ; then 102 if test "$tmp" -gt 0 ; then
136 AC_MSG_CHECKING([LIBASSUAN API version]) 103 AC_MSG_CHECKING([LIBASSUAN API version])
137 if test "$req_libassuan_api" -eq "$tmp" ; then 104 if test "$req_libassuan_api" -eq "$tmp" ; then
138@@ -97,7 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], 105@@ -114,9 +46,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
139
140 if test $ok = yes; then 106 if test $ok = yes; then
141 if test x"$host" != x ; then 107 if test x"$host" != x ; then
142- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` 108 if test -z "$use_gpgrt_config"; then
143+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan` 109- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
110- else
111- libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
112+ libassuan_config_host=`$PKG_CONFIG --variable=host libassuan`
113 fi
144 if test x"$libassuan_config_host" != xnone ; then 114 if test x"$libassuan_config_host" != xnone ; then
145 if test x"$libassuan_config_host" != x"$host" ; then 115 if test x"$libassuan_config_host" != x"$host" ; then
146 AC_MSG_WARN([[ 116@@ -158,12 +88,8 @@ dnl
147@@ -138,12 +87,8 @@ dnl
148 AC_DEFUN([AM_PATH_LIBASSUAN], 117 AC_DEFUN([AM_PATH_LIBASSUAN],
149 [ _AM_PATH_LIBASSUAN_COMMON($1) 118 [ _AM_PATH_LIBASSUAN_COMMON($1)
150 if test $ok = yes; then 119 if test $ok = yes; then
151- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` 120- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
152- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` 121- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
153 ifelse([$2], , :, [$2]) 122 ifelse([$2], , :, [$2])
154 else 123 else
155- LIBASSUAN_CFLAGS="" 124- LIBASSUAN_CFLAGS=""
diff --git a/meta/recipes-support/libassuan/libassuan_2.5.1.bb b/meta/recipes-support/libassuan/libassuan_2.5.2.bb
index 34d5f1642f..515d60f7f6 100644
--- a/meta/recipes-support/libassuan/libassuan_2.5.1.bb
+++ b/meta/recipes-support/libassuan/libassuan_2.5.2.bb
@@ -17,8 +17,8 @@ SRC_URI = "${GNUPG_MIRROR}/libassuan/libassuan-${PV}.tar.bz2 \
17 file://libassuan-add-pkgconfig-support.patch \ 17 file://libassuan-add-pkgconfig-support.patch \
18 " 18 "
19 19
20SRC_URI[md5sum] = "4354b7ae296894f232ada226a062d7d7" 20SRC_URI[md5sum] = "4d0d5738936bd8f4f0287e1dd80432b6"
21SRC_URI[sha256sum] = "47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449" 21SRC_URI[sha256sum] = "986b1bf277e375f7a960450fbb8ffbd45294d06598916ad4ebf79aee0cb788e7"
22 22
23BINCONFIG = "${bindir}/libassuan-config" 23BINCONFIG = "${bindir}/libassuan-config"
24 24