gnutls: Update to 2.12.14

* Add patch for fixing gettext version from 0.17 -> 0.18

(From OE-Core rev: 1c7fbbf6cbdcf804c232c750f10b0a967204e54a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

6 files changed, 30 insertions, 9 deletions

diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch
index 14f87e03d3..14f87e03d3 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
new file mode 100644
index 0000000000..7a41120792
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
@@ -0,0 +1,20 @@
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gnutls-2.12.14/lib/po/Makefile.in.in
+===================================================================
+--- gnutls-2.12.14.orig/lib/po/Makefile.in.in   2011-11-28 20:15:56.000000000 -0800
++++ gnutls-2.12.14/lib/po/Makefile.in.in        2011-11-28 20:17:21.386078977 -0800
+@@ -8,8 +8,8 @@
+ # Please note that the actual code of GNU gettext is covered by the GNU
+ # General Public License and is *not* in the public domain.
+ #
+-# Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++# Origin: gettext-0.18
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-openssl.patch
index ef70674881..ef70674881 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-openssl.patch
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-texinfo-euro.patch
index 10e377407a..10e377407a 100644
--- a/meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-texinfo-euro.patch
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.11.bb b/meta/recipes-support/gnutls/gnutls_2.12.11.bb
deleted file mode 100644
index bd5ebb36ca..0000000000
--- a/meta/recipes-support/gnutls/gnutls_2.12.11.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require gnutls.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI += "file://gnutls-openssl.patch \
-            file://configure-fix.patch"
-
-SRC_URI[md5sum] = "f08234b64a8025d6d5aa1307868b02ed"
-SRC_URI[sha256sum] = "00b58e1aafe99bbd0cb371e7f1df9cc58bf807301cf70a7eebedeee093991360"
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.14.bb b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
new file mode 100644
index 0000000000..385bb2c3fd
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -0,0 +1,10 @@
+require gnutls.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://gnutls-openssl.patch \
+            file://configure-fix.patch \
+            file://fix-gettext-version.patch"
+
+SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
+SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"