summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-12-15 14:48:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-17 09:57:04 +0000
commit77e2af234e0b511da2cf0523c8131558e495ffdf (patch)
tree37986c369501d52dda8e8b4aa5b54d4f10545551 /meta
parenta1975bcdef1a80c6b5450054b89abc5d14b7bfc6 (diff)
downloadpoky-77e2af234e0b511da2cf0523c8131558e495ffdf.tar.gz
gnutls: update to 3.5.7
Add a 0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch to fix a compile issue (incorrect creation of an empty header). Add a libunistring dependency as gnutls has gained it. (From OE-Core rev: b2ec343ad770c26f39f3a6d335e4bb3ccbf41aec) (From OE-Core rev: 84c6a3bcf44950049bba255075177a0004058a44) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/gnutls/gnutls.inc2
-rw-r--r--meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch27
-rw-r--r--meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch11
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.6.bb9
-rw-r--r--meta/recipes-support/gnutls/gnutls_3.5.7.bb10
5 files changed, 44 insertions, 15 deletions
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 4a5c3dfebf..184a50f6e1 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283 \
12 file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \ 12 file://doc/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
13 file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343" 13 file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343"
14 14
15DEPENDS = "nettle gmp virtual/libiconv" 15DEPENDS = "nettle gmp virtual/libiconv libunistring"
16DEPENDS_append_libc-musl = " argp-standalone" 16DEPENDS_append_libc-musl = " argp-standalone"
17 17
18SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" 18SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
diff --git a/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch b/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
new file mode 100644
index 0000000000..099081022d
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls/0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch
@@ -0,0 +1,27 @@
1From 68ef47ab3472472780939671731c295481b5535f Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 14 Dec 2016 17:42:45 +0200
4Subject: [PATCH] Do not add cli-args.h to cli-args.stamp Makefile target
5
6Upstream-Status: Submitted [https://gitlab.com/gnutls/gnutls/issues/155]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 src/Makefile.am | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/Makefile.am b/src/Makefile.am
13index 49d3af3..827638e 100644
14--- a/src/Makefile.am
15+++ b/src/Makefile.am
16@@ -261,7 +261,7 @@ cli-debug-args.stamp: $(srcdir)/cli-debug-args.def $(srcdir)/args-std.def
17
18 cli-args.h: cli-args.stamp
19 cli-args.c: cli-args.stamp
20-cli-args.stamp cli-args.h: $(srcdir)/cli-args.def $(srcdir)/args-std.def
21+cli-args.stamp: $(srcdir)/cli-args.def $(srcdir)/args-std.def
22 -$(AUTOGEN) $<
23 touch $@
24
25--
262.10.2
27
diff --git a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
index 5e452c52e7..96b023a468 100644
--- a/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
+++ b/meta/recipes-support/gnutls/gnutls/correct_rpl_gettimeofday_signature.patch
@@ -1,7 +1,7 @@
1From ae3370788ed3447bba16969d9eb1bf1b9631e1b7 Mon Sep 17 00:00:00 2001 1From 81b0f04c14f673b99778d2e7d8e85461e0bf2018 Mon Sep 17 00:00:00 2001
2From: Valentin Popa <valentin.popa@intel.com> 2From: Valentin Popa <valentin.popa@intel.com>
3Date: Fri, 25 Apr 2014 13:58:55 +0300 3Date: Fri, 25 Apr 2014 13:58:55 +0300
4Subject: [PATCH] Correct rpl_gettimeofday signature 4Subject: [PATCH 1/3] Correct rpl_gettimeofday signature
5 5
6Currently we fail on uclibc like below 6Currently we fail on uclibc like below
7 7
@@ -29,12 +29,13 @@ eglibc otherwise we will have same issue there too
29Signed-off-by: Khem Raj <raj.khem@gmail.com> 29Signed-off-by: Khem Raj <raj.khem@gmail.com>
30 30
31Upstream-Status: Pending 31Upstream-Status: Pending
32
32--- 33---
33 gl/sys_time.in.h | 8 ++++---- 34 gl/sys_time.in.h | 8 ++++----
34 1 file changed, 4 insertions(+), 4 deletions(-) 35 1 file changed, 4 insertions(+), 4 deletions(-)
35 36
36diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h 37diff --git a/gl/sys_time.in.h b/gl/sys_time.in.h
37index 84a17c9..6ceadc3 100644 38index 5a8caf3..2dc5718 100644
38--- a/gl/sys_time.in.h 39--- a/gl/sys_time.in.h
39+++ b/gl/sys_time.in.h 40+++ b/gl/sys_time.in.h
40@@ -93,20 +93,20 @@ struct timeval 41@@ -93,20 +93,20 @@ struct timeval
@@ -61,7 +62,7 @@ index 84a17c9..6ceadc3 100644
61+ (struct timeval *__restrict, void *__restrict)); 62+ (struct timeval *__restrict, void *__restrict));
62 # endif 63 # endif
63 _GL_CXXALIASWARN (gettimeofday); 64 _GL_CXXALIASWARN (gettimeofday);
64 #elif defined GNULIB_POSIXCHECK 65 # if defined __cplusplus && defined GNULIB_NAMESPACE
65-- 66--
661.9.1 672.10.2
67 68
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.6.bb b/meta/recipes-support/gnutls/gnutls_3.5.6.bb
deleted file mode 100644
index 2e70734a2a..0000000000
--- a/meta/recipes-support/gnutls/gnutls_3.5.6.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require gnutls.inc
2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
4 file://0001-configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \
6 "
7SRC_URI[md5sum] = "7a38b23757aae009c3eb5bb12fb0afda"
8SRC_URI[sha256sum] = "6338b715bf31c758606ffa489c7f87ee1beab947114fbd2ffefd73170a8c6b9a"
9
diff --git a/meta/recipes-support/gnutls/gnutls_3.5.7.bb b/meta/recipes-support/gnutls/gnutls_3.5.7.bb
new file mode 100644
index 0000000000..cf77a20634
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls_3.5.7.bb
@@ -0,0 +1,10 @@
1require gnutls.inc
2
3SRC_URI += "file://correct_rpl_gettimeofday_signature.patch \
4 file://0001-configure.ac-fix-sed-command.patch \
5 file://use-pkg-config-to-locate-zlib.patch \
6 file://0001-Do-not-add-cli-args.h-to-cli-args.stamp-Makefile-tar.patch \
7 "
8SRC_URI[md5sum] = "08ad2c539bc1d91283f610539deef34e"
9SRC_URI[sha256sum] = "60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a"
10