summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2017-03-13 19:39:48 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 20:55:08 +0100
commitcb5116b65066d374ef6ff81b3017a65954c0e7aa (patch)
tree583558dcd20eaeb59a6b60c5e26b242dd175040d /meta/recipes-support
parent868486c238780ce4a11d9ec9a38e40cb6c1cfc01 (diff)
downloadpoky-cb5116b65066d374ef6ff81b3017a65954c0e7aa.tar.gz
pinentry: update to 1.0.0
add pkg-config support for libassuan and gpg-error updated config options (From OE-Core rev: 032f91850d2df819a0b8f2762f12d952cc64284e) (From OE-Core rev: 8ee40c7d75e5eba43a7b36bcabbd4309660686ad) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch100
-rw-r--r--meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch153
-rw-r--r--meta/recipes-support/pinentry/pinentry_1.0.0.bb (renamed from meta/recipes-support/pinentry/pinentry_0.9.2.bb)22
3 files changed, 265 insertions, 10 deletions
diff --git a/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch b/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch
new file mode 100644
index 0000000000..431edb0351
--- /dev/null
+++ b/meta/recipes-support/pinentry/pinentry-1.0.0/gpg-error_pkconf.patch
@@ -0,0 +1,100 @@
1Convert to pkg-config support to match changes done to
2the gpg-error recipe for gpg-error.pc generation.
3
4Upstream-Status: Inappropriate [OE specific]
5
6Signed-off-by: Armin Kuster <akuster@mvista.com>
7
8Index: pinentry-1.0.0/m4/gpg-error.m4
9===================================================================
10--- pinentry-1.0.0.orig/m4/gpg-error.m4
11+++ pinentry-1.0.0/m4/gpg-error.m4
12@@ -25,74 +25,12 @@ dnl config script does not match the hos
13 dnl is added to the gpg_config_script_warn variable.
14 dnl
15 AC_DEFUN([AM_PATH_GPG_ERROR],
16-[ AC_REQUIRE([AC_CANONICAL_HOST])
17- gpg_error_config_prefix=""
18- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
19- dnl since that is consistent with how our three siblings use the directory/
20- dnl package name in --with-$dir_name-prefix=PFX.
21- AC_ARG_WITH(libgpg-error-prefix,
22- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
23- [prefix where GPG Error is installed (optional)]),
24- [gpg_error_config_prefix="$withval"])
25-
26- dnl Accept --with-gpg-error-prefix and make it work the same as
27- dnl --with-libgpg-error-prefix above, for backwards compatibility,
28- dnl but do not document this old, inconsistently-named option.
29- AC_ARG_WITH(gpg-error-prefix,,
30- [gpg_error_config_prefix="$withval"])
31-
32- if test x"${GPG_ERROR_CONFIG}" = x ; then
33- if test x"${gpg_error_config_prefix}" != x ; then
34- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
35- else
36- case "${SYSROOT}" in
37- /*)
38- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
39- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
40- fi
41- ;;
42- '')
43- ;;
44- *)
45- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
46- ;;
47- esac
48- fi
49- fi
50-
51- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
52+[
53 min_gpg_error_version=ifelse([$1], ,0.0,$1)
54- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
55- ok=no
56- if test "$GPG_ERROR_CONFIG" != "no" \
57- && test -f "$GPG_ERROR_CONFIG" ; then
58- req_major=`echo $min_gpg_error_version | \
59- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
60- req_minor=`echo $min_gpg_error_version | \
61- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
62- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
63- major=`echo $gpg_error_config_version | \
64- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
65- minor=`echo $gpg_error_config_version | \
66- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
67- if test "$major" -gt "$req_major"; then
68- ok=yes
69- else
70- if test "$major" -eq "$req_major"; then
71- if test "$minor" -ge "$req_minor"; then
72- ok=yes
73- fi
74- fi
75- fi
76- fi
77+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no])
78 if test $ok = yes; then
79- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
80- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
81- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
82- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
83- AC_MSG_RESULT([yes ($gpg_error_config_version)])
84 ifelse([$2], , :, [$2])
85- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
86+ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none`
87 if test x"$gpg_error_config_host" != xnone ; then
88 if test x"$gpg_error_config_host" != x"$host" ; then
89 AC_MSG_WARN([[
90@@ -107,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
91 fi
92 fi
93 else
94- GPG_ERROR_CFLAGS=""
95- GPG_ERROR_LIBS=""
96- GPG_ERROR_MT_CFLAGS=""
97- GPG_ERROR_MT_LIBS=""
98 AC_MSG_RESULT(no)
99 ifelse([$3], , :, [$3])
100 fi
diff --git a/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch b/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch
new file mode 100644
index 0000000000..11d564f35d
--- /dev/null
+++ b/meta/recipes-support/pinentry/pinentry-1.0.0/libassuan_pkgconf.patch
@@ -0,0 +1,153 @@
1Convert to pkg-config support to match changes done to
2the libassuan recipe for libassuan.pc generation.
3
4Upstream-Status: Inappropriate [OE specific]
5
6Signed-off-by: Armin Kuster <akuster@mvista.com>
7
8Index: pinentry-1.0.0/m4/libassuan.m4
9===================================================================
10--- pinentry-1.0.0.orig/m4/libassuan.m4
11+++ pinentry-1.0.0/m4/libassuan.m4
12@@ -13,34 +13,8 @@ dnl
13 dnl Common code used for libassuan detection [internal]
14 dnl Returns ok set to yes or no.
15 dnl
16-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
17-[ AC_REQUIRE([AC_CANONICAL_HOST])
18- AC_ARG_WITH(libassuan-prefix,
19- AC_HELP_STRING([--with-libassuan-prefix=PFX],
20- [prefix where LIBASSUAN is installed (optional)]),
21- libassuan_config_prefix="$withval", libassuan_config_prefix="")
22- if test x$libassuan_config_prefix != x ; then
23- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
24- if test x${LIBASSUAN_CONFIG+set} != xset ; then
25- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
26- fi
27- else
28- case "${SYSROOT}" in
29- /*)
30- if test -x "${SYSROOT}/bin/libassuan-config" ; then
31- LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config"
32- fi
33- ;;
34- '')
35- ;;
36- *)
37- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
38- ;;
39- esac
40- fi
41-
42- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
43-
44+AC_DEFUN([AM_PATH_LIBASSUAN_COMMON],
45+[
46 tmp=ifelse([$1], ,1:0.9.2,$1)
47 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
48 req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
49@@ -50,51 +24,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
50 min_libassuan_version="$tmp"
51 fi
52
53- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
54- ok=no
55- if test "$LIBASSUAN_CONFIG" != "no" \
56- && test -f "$LIBASSUAN_CONFIG" ; then
57- req_major=`echo $min_libassuan_version | \
58- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
59- req_minor=`echo $min_libassuan_version | \
60- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
61- req_micro=`echo $min_libassuan_version | \
62- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
63-
64- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
65- major=`echo $libassuan_config_version | \
66- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
67- minor=`echo $libassuan_config_version | \
68- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
69- micro=`echo $libassuan_config_version | \
70- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
71-
72- if test "$major" -gt "$req_major"; then
73- ok=yes
74- else
75- if test "$major" -eq "$req_major"; then
76- if test "$minor" -gt "$req_minor"; then
77- ok=yes
78- else
79- if test "$minor" -eq "$req_minor"; then
80- if test "$micro" -ge "$req_micro"; then
81- ok=yes
82- fi
83- fi
84- fi
85- fi
86- fi
87- fi
88-
89- if test $ok = yes; then
90- AC_MSG_RESULT([yes ($libassuan_config_version)])
91- else
92- AC_MSG_RESULT(no)
93- fi
94+ PKG_CHECK_MODULES(LIBASSUAN_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no])
95
96 if test $ok = yes; then
97 if test "$req_libassuan_api" -gt 0 ; then
98- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
99+ tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0`
100 if test "$tmp" -gt 0 ; then
101 AC_MSG_CHECKING([LIBASSUAN API version])
102 if test "$req_libassuan_api" -eq "$tmp" ; then
103@@ -109,7 +43,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
104
105 if test $ok = yes; then
106 if test x"$host" != x ; then
107- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
108+ libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0`
109 if test x"$libassuan_config_host" != xnone ; then
110 if test x"$libassuan_config_host" != x"$host" ; then
111 AC_MSG_WARN([[
112@@ -132,7 +66,7 @@ dnl Test whether libassuan has at least
113 dnl used to test for features only available in newer versions.
114 dnl
115 AC_DEFUN([AM_CHECK_LIBASSUAN],
116-[ _AM_PATH_LIBASSUAN_COMMON($1)
117+[ AM_PATH_LIBASSUAN_COMMON($1)
118 if test $ok = yes; then
119 ifelse([$2], , :, [$2])
120 else
121@@ -148,16 +82,10 @@ dnl [ACTION-IF-FOUND [
122 dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
123 dnl
124 AC_DEFUN([AM_PATH_LIBASSUAN],
125-[ _AM_PATH_LIBASSUAN_COMMON($1)
126+[ AM_PATH_LIBASSUAN_COMMON($1)
127 if test $ok = yes; then
128- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
129- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
130 ifelse([$2], , :, [$2])
131 else
132- LIBASSUAN_CFLAGS=""
133- LIBASSUAN_LIBS=""
134 ifelse([$3], , :, [$3])
135 fi
136- AC_SUBST(LIBASSUAN_CFLAGS)
137- AC_SUBST(LIBASSUAN_LIBS)
138 ])
139Index: pinentry-1.0.0/configure.ac
140===================================================================
141--- pinentry-1.0.0.orig/configure.ac
142+++ pinentry-1.0.0/configure.ac
143@@ -266,8 +266,8 @@ if test "$have_libassuan" = "yes"; then
144 [version of the libassuan library])
145 fi
146
147-COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS"
148-COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS"
149+COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS"
150+COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS"
151
152
153 dnl Checks for libsecmem.
diff --git a/meta/recipes-support/pinentry/pinentry_0.9.2.bb b/meta/recipes-support/pinentry/pinentry_1.0.0.bb
index d315a99d4c..319acd3b4e 100644
--- a/meta/recipes-support/pinentry/pinentry_0.9.2.bb
+++ b/meta/recipes-support/pinentry/pinentry_1.0.0.bb
@@ -8,26 +8,28 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html"
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" 9LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
10 10
11inherit autotools 11inherit autotools pkgconfig
12 12
13DEPENDS = "gettext-native" 13DEPENDS = "gettext-native libassuan libgpg-error"
14 14
15UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 15UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
16SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" 16SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
17 file://libassuan_pkgconf.patch \
18 file://gpg-error_pkconf.patch \
19"
17 20
18SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278" 21SRC_URI[md5sum] = "4a3fad8b31f9b4c5526c8837495015dc"
19SRC_URI[sha256sum] = "fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1" 22SRC_URI[sha256sum] = "1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a"
20 23
21EXTRA_OECONF = "--disable-rpath \ 24EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \
22 --disable-dependency-tracking \ 25 --disable-pinentry-qt5 \
23 " 26"
24 27
25PACKAGECONFIG ??= "ncurses libcap" 28PACKAGECONFIG ??= "ncurses libcap"
26 29
27PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses" 30PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses"
28PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap" 31PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap"
29PACKAGECONFIG[qt4] = "--enable-pinentry-qt4, --disable-pinentry-qt4, qt4-x11" 32PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qt4-x11"
30PACKAGECONFIG[qt4_clipboard] = "--enable-pinentry-qt4-clipboard --enable-pinentry-qt4, --disable-pinentry-qt4-clipboard, qt4-x11"
31PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0" 33PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0"
32 34
33#To use libsecret, add meta-gnome 35#To use libsecret, add meta-gnome
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 16:31:24 +0000