summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-12-01 05:12:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-01 10:50:08 (GMT)
commitd60d72635969cfbbf19bfe43384b784f9ded725b (patch)
tree2a57792667dc7517dece99b64008258db80032d4
parenta7ca3b42756f9467fde3f1c7e7a5827b92b80c05 (diff)
downloadpoky-d60d72635969cfbbf19bfe43384b784f9ded725b.tar.gz
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>
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/configure-fix.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.11/configure-fix.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch20
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-openssl.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-openssl.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.14/gnutls-texinfo-euro.patch (renamed from meta/recipes-support/gnutls/gnutls-2.12.11/gnutls-texinfo-euro.patch)0
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.11.bb9
-rw-r--r--meta/recipes-support/gnutls/gnutls_2.12.14.bb10
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 14f87e0..14f87e0 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 0000000..7a41120
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.14/fix-gettext-version.patch
@@ -0,0 +1,20 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: gnutls-2.12.14/lib/po/Makefile.in.in
7===================================================================
8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in 2011-11-28 20:15:56.000000000 -0800
9+++ gnutls-2.12.14/lib/po/Makefile.in.in 2011-11-28 20:17:21.386078977 -0800
10@@ -8,8 +8,8 @@
11 # Please note that the actual code of GNU gettext is covered by the GNU
12 # General Public License and is *not* in the public domain.
13 #
14-# Origin: gettext-0.17
15-GETTEXT_MACRO_VERSION = 0.17
16+# Origin: gettext-0.18
17+GETTEXT_MACRO_VERSION = 0.18
18
19 PACKAGE = @PACKAGE@
20 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 ef70674..ef70674 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 10e3774..10e3774 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 bd5ebb3..0000000
--- a/meta/recipes-support/gnutls/gnutls_2.12.11.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require gnutls.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch"
7
8SRC_URI[md5sum] = "f08234b64a8025d6d5aa1307868b02ed"
9SRC_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 0000000..385bb2c
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_2.12.14.bb
@@ -0,0 +1,10 @@
1require gnutls.inc
2
3PR = "${INC_PR}.0"
4
5SRC_URI += "file://gnutls-openssl.patch \
6 file://configure-fix.patch \
7 file://fix-gettext-version.patch"
8
9SRC_URI[md5sum] = "555687a7ffefba0bd9de1e71cb61402c"
10SRC_URI[sha256sum] = "5ee72ba6de7a23cf315792561954451e022dac8730149ca95f93c61e95be2ce3"