2 files changed, 2 insertions, 31 deletions

diff --git a/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch b/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch
deleted file mode 100644
index 5540bef940..0000000000
--- a/meta/recipes-support/gnutls/libtasn1/libtasn1_fix_for_automake_1.12.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Pending
-
-This patch avoids following issues with automake 1.12:
-
-| automake: warnings are treated as errors
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libtasn1.la': linking libtool libraries using a non-POSIX
-| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac'
-
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
-2012/05/02
-
-
-Index: libtasn1-2.11/configure.ac
-===================================================================
---- libtasn1-2.11.orig/configure.ac
-+++ libtasn1-2.11/configure.ac
-@@ -38,6 +38,11 @@ lgl_EARLY
- AC_PROG_YACC
- AC_PROG_LN_S
- 
-+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it
-+m4_pattern_allow([AM_PROG_AR])
-+AM_PROG_AR
-+
-+
- dnl Checks for programs.
- AC_PROG_INSTALL
- AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/meta/recipes-support/gnutls/libtasn1_4.0.bb b/meta/recipes-support/gnutls/libtasn1_4.5.bb
index 289833ec80..f874574c53 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.0.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.5.bb
@@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
                     file://README;endline=8;md5=c3803a3e8ca5ab5eb1e5912faa405351"
 
 SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
-           file://libtasn1_fix_for_automake_1.12.patch \
            file://dont-depend-on-help2man.patch \
            "
 
-SRC_URI[md5sum] = "d3d2d9bce3b6668b9827a9df52635be1"
-SRC_URI[sha256sum] = "41d044f7644bdd1c4f8a5c15ac1885ca1fcbf32f5f6dd4760a19278b979857fe"
+SRC_URI[md5sum] = "81d272697545e82d39f6bd14854b68f0"
+SRC_URI[sha256sum] = "89b3b5dce119273431544ecb305081f3530911001bb12e5d76588907edb71bda"
 
 inherit autotools texinfo binconfig lib_package