Patchwork gpgme: updated to 1.3.2

login
register
mail settings
Submitter Valentin Popa
Date June 20, 2012, 7:56 a.m.
Message ID <1340178971-6053-1-git-send-email-valentin.popa@intel.com>
Download mbox | patch
Permalink /patch/30259/
State New
Headers show

Comments

Valentin Popa - June 20, 2012, 7:56 a.m.
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
 .../disable_gpgconf_check.patch                    |    0
 .../gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb}       |    8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/gpgme/{gpgme-1.3.1 => gpgme-1.3.2}/disable_gpgconf_check.patch (100%)
 rename meta/recipes-support/gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb} (83%)
Richard Purdie - June 21, 2012, 11:57 a.m.
On Wed, 2012-06-20 at 10:56 +0300, Valentin Popa wrote:
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> ---
>  .../disable_gpgconf_check.patch                    |    0
>  .../gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb}       |    8 ++++----
>  2 files changed, 4 insertions(+), 4 deletions(-)
>  rename meta/recipes-support/gpgme/{gpgme-1.3.1 => gpgme-1.3.2}/disable_gpgconf_check.patch (100%)
>  rename meta/recipes-support/gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb} (83%)

Please could you rebase this against master as some other changes have
merged that cause this not to apply and also mention in the commit log
what the license change was please?

Cheers,

Richard

> diff --git a/meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
> similarity index 100%
> rename from meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch
> rename to meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
> diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
> similarity index 83%
> rename from meta/recipes-support/gpgme/gpgme_1.3.1.bb
> rename to meta/recipes-support/gpgme/gpgme_1.3.2.bb
> index 43d8aad..6529fe5 100644
> --- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
> +++ b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
> @@ -5,19 +5,19 @@ 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=942b47052c0674c6a3b9b9e6127628a4 \
> +                    file://src/gpgme.h.in;endline=23;md5=00846fee29ec2a6f5c808bfe7fc24e65 \
>                      file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436"
>  
>  SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
>             file://disable_gpgconf_check.patch"
>  
> -SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
> -SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
> +SRC_URI[md5sum] = "326fe97077141713f0930aa87949a287"
> +SRC_URI[sha256sum] = "cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875"
>  DEPENDS = "libgpg-error libassuan ${PTH}"
>  PTH_libc-uclibc = "npth"
>  PTH = "pth"
>  
> -PR = "r2"
> +PR = "r0"
>  
>  EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
>                  --with-gpg=${bindir}/gpg --without-gpgsm"

Patch

diff --git a/meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
similarity index 100%
rename from meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch
rename to meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
similarity index 83%
rename from meta/recipes-support/gpgme/gpgme_1.3.1.bb
rename to meta/recipes-support/gpgme/gpgme_1.3.2.bb
index 43d8aad..6529fe5 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
@@ -5,19 +5,19 @@  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=942b47052c0674c6a3b9b9e6127628a4 \
+                    file://src/gpgme.h.in;endline=23;md5=00846fee29ec2a6f5c808bfe7fc24e65 \
                     file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
            file://disable_gpgconf_check.patch"
 
-SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
-SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
+SRC_URI[md5sum] = "326fe97077141713f0930aa87949a287"
+SRC_URI[sha256sum] = "cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875"
 DEPENDS = "libgpg-error libassuan ${PTH}"
 PTH_libc-uclibc = "npth"
 PTH = "pth"
 
-PR = "r2"
+PR = "r0"
 
 EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
                 --with-gpg=${bindir}/gpg --without-gpgsm"