mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
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>
This commit is contained in:
Armin Kuster
committed by
Richard Purdie
Richard Purdie
parent
868486c238
commit
cb5116b650
@@ -0,0 +1,100 @@
|
||||
Convert to pkg-config support to match changes done to
|
||||
the gpg-error recipe for gpg-error.pc generation.
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
Index: pinentry-1.0.0/m4/gpg-error.m4
|
||||
===================================================================
|
||||
--- pinentry-1.0.0.orig/m4/gpg-error.m4
|
||||
+++ pinentry-1.0.0/m4/gpg-error.m4
|
||||
@@ -25,74 +25,12 @@ dnl config script does not match the hos
|
||||
dnl is added to the gpg_config_script_warn variable.
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
-[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
- gpg_error_config_prefix=""
|
||||
- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
|
||||
- dnl since that is consistent with how our three siblings use the directory/
|
||||
- dnl package name in --with-$dir_name-prefix=PFX.
|
||||
- AC_ARG_WITH(libgpg-error-prefix,
|
||||
- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
|
||||
- [prefix where GPG Error is installed (optional)]),
|
||||
- [gpg_error_config_prefix="$withval"])
|
||||
-
|
||||
- dnl Accept --with-gpg-error-prefix and make it work the same as
|
||||
- dnl --with-libgpg-error-prefix above, for backwards compatibility,
|
||||
- dnl but do not document this old, inconsistently-named option.
|
||||
- AC_ARG_WITH(gpg-error-prefix,,
|
||||
- [gpg_error_config_prefix="$withval"])
|
||||
-
|
||||
- if test x"${GPG_ERROR_CONFIG}" = x ; then
|
||||
- if test x"${gpg_error_config_prefix}" != x ; then
|
||||
- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
|
||||
- else
|
||||
- case "${SYSROOT}" in
|
||||
- /*)
|
||||
- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
|
||||
- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
|
||||
- fi
|
||||
- ;;
|
||||
- '')
|
||||
- ;;
|
||||
- *)
|
||||
- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
|
||||
+[
|
||||
min_gpg_error_version=ifelse([$1], ,0.0,$1)
|
||||
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||
- ok=no
|
||||
- if test "$GPG_ERROR_CONFIG" != "no" \
|
||||
- && test -f "$GPG_ERROR_CONFIG" ; then
|
||||
- req_major=`echo $min_gpg_error_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_gpg_error_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version`
|
||||
- major=`echo $gpg_error_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
- minor=`echo $gpg_error_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
- if test "$major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$major" -eq "$req_major"; then
|
||||
- if test "$minor" -ge "$req_minor"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version gpg-error], [ok=yes], [ok=no])
|
||||
if test $ok = yes; then
|
||||
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags`
|
||||
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs`
|
||||
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null`
|
||||
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null`
|
||||
- AC_MSG_RESULT([yes ($gpg_error_config_version)])
|
||||
ifelse([$2], , :, [$2])
|
||||
- gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none`
|
||||
+ gpg_error_config_host=`$PKG_CONFIG --host gpg-error 2>/dev/null || echo none`
|
||||
if test x"$gpg_error_config_host" != xnone ; then
|
||||
if test x"$gpg_error_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
@@ -107,10 +45,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||
fi
|
||||
fi
|
||||
else
|
||||
- GPG_ERROR_CFLAGS=""
|
||||
- GPG_ERROR_LIBS=""
|
||||
- GPG_ERROR_MT_CFLAGS=""
|
||||
- GPG_ERROR_MT_LIBS=""
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
@@ -0,0 +1,153 @@
|
||||
Convert to pkg-config support to match changes done to
|
||||
the libassuan recipe for libassuan.pc generation.
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Armin Kuster <akuster@mvista.com>
|
||||
|
||||
Index: pinentry-1.0.0/m4/libassuan.m4
|
||||
===================================================================
|
||||
--- pinentry-1.0.0.orig/m4/libassuan.m4
|
||||
+++ pinentry-1.0.0/m4/libassuan.m4
|
||||
@@ -13,34 +13,8 @@ dnl
|
||||
dnl Common code used for libassuan detection [internal]
|
||||
dnl Returns ok set to yes or no.
|
||||
dnl
|
||||
-AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
-[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
- AC_ARG_WITH(libassuan-prefix,
|
||||
- AC_HELP_STRING([--with-libassuan-prefix=PFX],
|
||||
- [prefix where LIBASSUAN is installed (optional)]),
|
||||
- libassuan_config_prefix="$withval", libassuan_config_prefix="")
|
||||
- if test x$libassuan_config_prefix != x ; then
|
||||
- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
||||
- if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
- LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
- fi
|
||||
- else
|
||||
- case "${SYSROOT}" in
|
||||
- /*)
|
||||
- if test -x "${SYSROOT}/bin/libassuan-config" ; then
|
||||
- LIBASSUAN_CONFIG="${SYSROOT}/bin/libassuan-config"
|
||||
- fi
|
||||
- ;;
|
||||
- '')
|
||||
- ;;
|
||||
- *)
|
||||
- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
||||
- ;;
|
||||
- esac
|
||||
- fi
|
||||
-
|
||||
- AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
-
|
||||
+AC_DEFUN([AM_PATH_LIBASSUAN_COMMON],
|
||||
+[
|
||||
tmp=ifelse([$1], ,1:0.9.2,$1)
|
||||
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||
req_libassuan_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
||||
@@ -50,51 +24,11 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
min_libassuan_version="$tmp"
|
||||
fi
|
||||
|
||||
- AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
||||
- ok=no
|
||||
- if test "$LIBASSUAN_CONFIG" != "no" \
|
||||
- && test -f "$LIBASSUAN_CONFIG" ; then
|
||||
- req_major=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
- req_minor=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
- req_micro=`echo $min_libassuan_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
-
|
||||
- libassuan_config_version=`$LIBASSUAN_CONFIG --version`
|
||||
- major=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
- minor=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
- micro=`echo $libassuan_config_version | \
|
||||
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||
-
|
||||
- if test "$major" -gt "$req_major"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$major" -eq "$req_major"; then
|
||||
- if test "$minor" -gt "$req_minor"; then
|
||||
- ok=yes
|
||||
- else
|
||||
- if test "$minor" -eq "$req_minor"; then
|
||||
- if test "$micro" -ge "$req_micro"; then
|
||||
- ok=yes
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- if test $ok = yes; then
|
||||
- AC_MSG_RESULT([yes ($libassuan_config_version)])
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- fi
|
||||
+ PKG_CHECK_MODULES(LIBASSUAN_COMMON, [libassuan >= $min_libassuan_version libassuan], [ok=yes], [ok=no])
|
||||
|
||||
if test $ok = yes; then
|
||||
if test "$req_libassuan_api" -gt 0 ; then
|
||||
- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
|
||||
+ tmp=`$PKG_CONFIG --variable=api_version libassuan 2>/dev/null || echo 0`
|
||||
if test "$tmp" -gt 0 ; then
|
||||
AC_MSG_CHECKING([LIBASSUAN API version])
|
||||
if test "$req_libassuan_api" -eq "$tmp" ; then
|
||||
@@ -109,7 +43,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
|
||||
|
||||
if test $ok = yes; then
|
||||
if test x"$host" != x ; then
|
||||
- libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
|
||||
+ libassuan_config_host=`$PKG_CONFIG --host libassuan 2>/dev/null || echo 0`
|
||||
if test x"$libassuan_config_host" != xnone ; then
|
||||
if test x"$libassuan_config_host" != x"$host" ; then
|
||||
AC_MSG_WARN([[
|
||||
@@ -132,7 +66,7 @@ dnl Test whether libassuan has at least
|
||||
dnl used to test for features only available in newer versions.
|
||||
dnl
|
||||
AC_DEFUN([AM_CHECK_LIBASSUAN],
|
||||
-[ _AM_PATH_LIBASSUAN_COMMON($1)
|
||||
+[ AM_PATH_LIBASSUAN_COMMON($1)
|
||||
if test $ok = yes; then
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
@@ -148,16 +82,10 @@ dnl [ACTION-IF-FOUND [
|
||||
dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBASSUAN],
|
||||
-[ _AM_PATH_LIBASSUAN_COMMON($1)
|
||||
+[ AM_PATH_LIBASSUAN_COMMON($1)
|
||||
if test $ok = yes; then
|
||||
- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
||||
- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
- LIBASSUAN_CFLAGS=""
|
||||
- LIBASSUAN_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
- AC_SUBST(LIBASSUAN_CFLAGS)
|
||||
- AC_SUBST(LIBASSUAN_LIBS)
|
||||
])
|
||||
Index: pinentry-1.0.0/configure.ac
|
||||
===================================================================
|
||||
--- pinentry-1.0.0.orig/configure.ac
|
||||
+++ pinentry-1.0.0/configure.ac
|
||||
@@ -266,8 +266,8 @@ if test "$have_libassuan" = "yes"; then
|
||||
[version of the libassuan library])
|
||||
fi
|
||||
|
||||
-COMMON_CFLAGS="$LIBASSUAN_CFLAGS $COMMON_CFLAGS"
|
||||
-COMMON_LIBS="$LIBASSUAN_LIBS $COMMON_LIBS"
|
||||
+COMMON_CFLAGS="$LIBASSUAN_COMMON_CFLAGS $COMMON_CFLAGS"
|
||||
+COMMON_LIBS="$LIBASSUAN_COMMON_LIBS $COMMON_LIBS"
|
||||
|
||||
|
||||
dnl Checks for libsecmem.
|
||||
+12
-10
@@ -8,26 +8,28 @@ HOMEPAGE = "http://www.gnupg.org/related_software/pinentry/index.en.html"
|
||||
LICENSE = "GPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e"
|
||||
|
||||
inherit autotools
|
||||
inherit autotools pkgconfig
|
||||
|
||||
DEPENDS = "gettext-native"
|
||||
DEPENDS = "gettext-native libassuan libgpg-error"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
||||
SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2"
|
||||
SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
|
||||
file://libassuan_pkgconf.patch \
|
||||
file://gpg-error_pkconf.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "f51d454f921111b5156a2291cbf70278"
|
||||
SRC_URI[sha256sum] = "fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1"
|
||||
SRC_URI[md5sum] = "4a3fad8b31f9b4c5526c8837495015dc"
|
||||
SRC_URI[sha256sum] = "1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a"
|
||||
|
||||
EXTRA_OECONF = "--disable-rpath \
|
||||
--disable-dependency-tracking \
|
||||
"
|
||||
EXTRA_OECONF = "--disable-rpath --disable-dependency-tracking \
|
||||
--disable-pinentry-qt5 \
|
||||
"
|
||||
|
||||
PACKAGECONFIG ??= "ncurses libcap"
|
||||
|
||||
PACKAGECONFIG[ncurses] = "--enable-ncurses --with-ncurses-include-dir=${STAGING_INCDIR}, --disable-ncurses, ncurses"
|
||||
PACKAGECONFIG[libcap] = "--with-libcap, --without-libcap, libcap"
|
||||
PACKAGECONFIG[qt4] = "--enable-pinentry-qt4, --disable-pinentry-qt4, qt4-x11"
|
||||
PACKAGECONFIG[qt4_clipboard] = "--enable-pinentry-qt4-clipboard --enable-pinentry-qt4, --disable-pinentry-qt4-clipboard, qt4-x11"
|
||||
PACKAGECONFIG[qt] = "--enable-pinentry-qt, --disable-pinentry-qt, qt4-x11"
|
||||
PACKAGECONFIG[gtk2] = "--enable-pinentry-gtk2, --disable-pinentry-gtk2, gtk+ glib-2.0"
|
||||
|
||||
#To use libsecret, add meta-gnome
|
||||
Reference in New Issue
Block a user