From 188dff3daf048e369bcab0d1db2964490e43d734 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 30 Apr 2012 13:37:43 -0700 Subject: [PATCH] gnutls: Update to 2.12.18 Change the SRC_URI to use the GNU_MIRROR (From OE-Core rev: 753b22012f10c393c191d3116b9d38ee4be6d112) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../{gnutls-2.12.17 => gnutls-2.12.18}/configure-fix.patch | 0 .../correct_rpl_gettimeofday_signature.patch | 0 .../fix-gettext-version.patch | 0 .../{gnutls-2.12.17 => gnutls-2.12.18}/gnutls-openssl.patch | 0 .../gnutls-texinfo-euro.patch | 0 meta/recipes-support/gnutls/gnutls.inc | 2 +- .../gnutls/{gnutls_2.12.17.bb => gnutls_2.12.18.bb} | 4 ++-- 7 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/gnutls/{gnutls-2.12.17 => gnutls-2.12.18}/configure-fix.patch (100%) rename meta/recipes-support/gnutls/{gnutls-2.12.17 => gnutls-2.12.18}/correct_rpl_gettimeofday_signature.patch (100%) rename meta/recipes-support/gnutls/{gnutls-2.12.17 => gnutls-2.12.18}/fix-gettext-version.patch (100%) rename meta/recipes-support/gnutls/{gnutls-2.12.17 => gnutls-2.12.18}/gnutls-openssl.patch (100%) rename meta/recipes-support/gnutls/{gnutls-2.12.17 => gnutls-2.12.18}/gnutls-texinfo-euro.patch (100%) rename meta/recipes-support/gnutls/{gnutls_2.12.17.bb => gnutls_2.12.18.bb} (77%) diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/configure-fix.patch similarity index 100% rename from meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch rename to meta/recipes-support/gnutls/gnutls-2.12.18/configure-fix.patch diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/correct_rpl_gettimeofday_signature.patch similarity index 100% rename from meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch rename to meta/recipes-support/gnutls/gnutls-2.12.18/correct_rpl_gettimeofday_signature.patch diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/fix-gettext-version.patch similarity index 100% rename from meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch rename to meta/recipes-support/gnutls/gnutls-2.12.18/fix-gettext-version.patch diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-openssl.patch similarity index 100% rename from meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch rename to meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-openssl.patch diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-texinfo-euro.patch similarity index 100% rename from meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch rename to meta/recipes-support/gnutls/gnutls-2.12.18/gnutls-texinfo-euro.patch diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 157612e2b3..f489fb6f9f 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://lib/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libextra/COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.bz2" inherit autotools binconfig pkgconfig gettext diff --git a/meta/recipes-support/gnutls/gnutls_2.12.17.bb b/meta/recipes-support/gnutls/gnutls_2.12.18.bb similarity index 77% rename from meta/recipes-support/gnutls/gnutls_2.12.17.bb rename to meta/recipes-support/gnutls/gnutls_2.12.18.bb index 7a33ec2cf0..7355855fff 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.17.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.18.bb @@ -7,8 +7,8 @@ SRC_URI += "file://gnutls-openssl.patch \ file://configure-fix.patch \ " -SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854" -SRC_URI[sha256sum] = "588ad6b0901c789f2f6afcec88ac4d688801bf1a024c9afa08706bb8d9868bf3" +SRC_URI[md5sum] = "e9215d00d2930e09bc8f23f02b54f2d1" +SRC_URI[sha256sum] = "780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a" python() { if not ((d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1):