From 775529a3891d3f3317ff79b0b1bd2f196f7fa2e8 Mon Sep 17 00:00:00 2001 From: Ionut Radu Date: Wed, 8 May 2013 17:41:59 +0300 Subject: gpgme: Updated from 1.4.0 to 1.4.1 Signed-off-by: Ionut Radu Signed-off-by: Saul Wold --- .../gpgme/gpgme-1.4.0/disable_gpgconf_check.patch | 39 ---------------------- .../gpgme/gpgme-1.4.1/disable_gpgconf_check.patch | 39 ++++++++++++++++++++++ meta/recipes-support/gpgme/gpgme_1.4.0.bb | 31 ----------------- meta/recipes-support/gpgme/gpgme_1.4.1.bb | 29 ++++++++++++++++ 4 files changed, 68 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch create mode 100644 meta/recipes-support/gpgme/gpgme-1.4.1/disable_gpgconf_check.patch delete mode 100644 meta/recipes-support/gpgme/gpgme_1.4.0.bb create mode 100644 meta/recipes-support/gpgme/gpgme_1.4.1.bb (limited to 'meta') diff --git a/meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch deleted file mode 100644 index df0953069c..0000000000 --- a/meta/recipes-support/gpgme/gpgme-1.4.0/disable_gpgconf_check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause -configure failure if not founding them in cross-compile environment. We can -add the gnupg-native to get them, but still have some issues: - -1. need add new package: libksba, update libassuan(not in sato), and extend - native support in some other packages(libgcrypt, libgpg-error, pth...) -2. Even we have gnupg, the g13 only exist in development branch, so that we - still have the g13 check failure in configure. - -I have searched the compile log, and found gpgconf/g13 are not used. So use a -simple method here, throw a warning mesg rather than an error here just like in -non-cross-compile environment. - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [embedded specific] - -Index: gpgme-1.3.0/configure.ac -=================================================================== ---- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800 -+++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800 -@@ -574,7 +574,7 @@ - *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH - ***]) -@@ -670,7 +670,7 @@ - *** Could not find g13, install g13 or use --with-g13=PATH to enable it - ***]) - else -- AC_MSG_ERROR([ -+ AC_MSG_WARN([ - *** - *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH - ***]) diff --git a/meta/recipes-support/gpgme/gpgme-1.4.1/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.4.1/disable_gpgconf_check.patch new file mode 100644 index 0000000000..df0953069c --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme-1.4.1/disable_gpgconf_check.patch @@ -0,0 +1,39 @@ +From 1.2.0, gpgme will check if gpgconf & g13(from 1.3.0) exist, and cause +configure failure if not founding them in cross-compile environment. We can +add the gnupg-native to get them, but still have some issues: + +1. need add new package: libksba, update libassuan(not in sato), and extend + native support in some other packages(libgcrypt, libgpg-error, pth...) +2. Even we have gnupg, the g13 only exist in development branch, so that we + still have the g13 check failure in configure. + +I have searched the compile log, and found gpgconf/g13 are not used. So use a +simple method here, throw a warning mesg rather than an error here just like in +non-cross-compile environment. + +Signed-off-by: Zhai Edwin + +Upstream-Status: Inappropriate [embedded specific] + +Index: gpgme-1.3.0/configure.ac +=================================================================== +--- gpgme-1.3.0.orig/configure.ac 2010-07-21 09:38:09.000000000 +0800 ++++ gpgme-1.3.0/configure.ac 2010-07-21 09:39:19.000000000 +0800 +@@ -574,7 +574,7 @@ + *** Could not find gpgconf, install gpgconf or use --with-gpgconf=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to gpgconf when cross-compiling, use --with-gpgconf=PATH + ***]) +@@ -670,7 +670,7 @@ + *** Could not find g13, install g13 or use --with-g13=PATH to enable it + ***]) + else +- AC_MSG_ERROR([ ++ AC_MSG_WARN([ + *** + *** Can not determine path to g13 when cross-compiling, use --with-g13=PATH + ***]) diff --git a/meta/recipes-support/gpgme/gpgme_1.4.0.bb b/meta/recipes-support/gpgme/gpgme_1.4.0.bb deleted file mode 100644 index a8c1157c66..0000000000 --- a/meta/recipes-support/gpgme/gpgme_1.4.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "High-level GnuPG encryption/signing API" -DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" -HOMEPAGE = "http://www.gnupg.org/gpgme.html" -BUGTRACKER = "https://bugs.g10code.com/gnupg/index" - -LICENSE = "GPLv2+ & LGPLv2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ - file://src/gpgme.h.in;endline=23;md5=a7b9706396e8e12c17be7d8d556ef7a5 \ - file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" - -SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \ - file://disable_gpgconf_check.patch" - -SRC_URI[md5sum] = "a0f93aba6d8a831ba14905085027f2f9" -SRC_URI[sha256sum] = "728c959abb0795ed4357b308cdbba92210d22998b075664d1e038d3cc7145619" -DEPENDS = "libgpg-error libassuan ${PTH}" -PTH_libc-uclibc = "npth" -PTH = "pth" - -PR = "r0" - -EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \ - --with-gpg=${bindir}/gpg --without-gpgsm" - -inherit autotools binconfig - -PACKAGES =+ "${PN}-pth ${PN}-pthread" -FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*" -FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" -FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" diff --git a/meta/recipes-support/gpgme/gpgme_1.4.1.bb b/meta/recipes-support/gpgme/gpgme_1.4.1.bb new file mode 100644 index 0000000000..13bc508aa9 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme_1.4.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "High-level GnuPG encryption/signing API" +DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications. It provides a High-Level Crypto API for encryption, decryption, signing, signature verification and key management" +HOMEPAGE = "http://www.gnupg.org/gpgme.html" +BUGTRACKER = "https://bugs.g10code.com/gnupg/index" + +LICENSE = "GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \ + file://src/gpgme.h.in;endline=23;md5=a7b9706396e8e12c17be7d8d556ef7a5 \ + file://src/engine.h;endline=22;md5=4b6d8ba313d9b564cc4d4cfb1640af9d" + +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \ + file://disable_gpgconf_check.patch" + +SRC_URI[md5sum] = "07f1c0eb6596a94efa3ffb75e74bfbba" +SRC_URI[sha256sum] = "7ab63e5086ebe4cfe7f78face1bb059a7a60da586b1e5c6a77bedcd6d04019b8" +DEPENDS = "libgpg-error libassuan ${PTH}" +PTH_libc-uclibc = "npth" +PTH = "pth" + +EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \ + --with-gpg=${bindir}/gpg --without-gpgsm" + +inherit autotools binconfig + +PACKAGES =+ "${PN}-pth ${PN}-pthread" +FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*" +FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*" +FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*" -- cgit v1.2.3