summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-11 20:31:15 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:42 +0100
commitb66ec0ff0da12f614cc03501e75a8e8e03078b0e (patch)
tree68fba80ee011b888e6b492fa74cbc9fa7ca69705 /meta/recipes-support
parentaf96bedd0b3e87af57a5d774f0ad84bf1f0c0ce8 (diff)
downloadpoky-b66ec0ff0da12f614cc03501e75a8e8e03078b0e.tar.gz
libtasn1: Backport compiler warning fixes
These patches are backported from master to fix issues raised by clang compiler. (From OE-Core rev: 6e3ff002e1a24936acb20dd209ea758c065cc16a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch28
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch28
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch73
-rw-r--r--meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch56
-rw-r--r--meta/recipes-support/gnutls/libtasn1_4.9.bb4
5 files changed, 189 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch
new file mode 100644
index 0000000000..ae643946f7
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch
@@ -0,0 +1,28 @@
1From 908e9fa4c1172f09e0e45420a403dc25ed0a466c Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:45:33 +0200
4Subject: [PATCH 1/4] configure: don't add -Werror to build flags
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 configure.ac | 2 --
11 1 file changed, 2 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 7a14e04..066f5fe 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings],
18 )
19
20 if test "$gl_gcc_warnings" = yes; then
21- gl_WARN_ADD([-Werror], [WERROR_CFLAGS])
22-
23 nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings
24 nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers
25 nw="$nw -Wtraditional" # Warns on #elif which we use often
26--
271.9.1
28
diff --git a/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch b/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch
new file mode 100644
index 0000000000..dd364223bd
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/0002-ASN.y-corrected-compiler-warning.patch
@@ -0,0 +1,28 @@
1From 3542c01618fcde83b29640ea2c60bfd2629ae0b7 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:47:49 +0200
4Subject: [PATCH 2/4] ASN.y: corrected compiler warning
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 lib/ASN1.y | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/lib/ASN1.y b/lib/ASN1.y
14index 731415d..6db638f 100644
15--- a/lib/ASN1.y
16+++ b/lib/ASN1.y
17@@ -621,7 +621,7 @@ _asn1_create_errorDescription (int error, char *error_desc)
18 case ASN1_NAME_TOO_LONG:
19 snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
20 "%s:%u: name too long (more than %u characters)", file_name,
21- line_number, ASN1_MAX_NAME_SIZE);
22+ line_number, (unsigned)ASN1_MAX_NAME_SIZE);
23 break;
24 case ASN1_IDENTIFIER_NOT_FOUND:
25 snprintf (error_desc, ASN1_MAX_ERROR_DESCRIPTION_SIZE,
26--
271.9.1
28
diff --git a/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch b/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch
new file mode 100644
index 0000000000..24201437b9
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/0003-parser_aux-corrected-potential-null-pointer-derefere.patch
@@ -0,0 +1,73 @@
1From c8903aa27dc9de1d9efeed9d1f7894f1019548f7 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:49:15 +0200
4Subject: [PATCH 3/4] parser_aux: corrected potential null pointer dereferences
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 lib/parser_aux.c | 12 ++++++------
11 1 file changed, 6 insertions(+), 6 deletions(-)
12
13diff --git a/lib/parser_aux.c b/lib/parser_aux.c
14index 2285b20..12ee16f 100644
15--- a/lib/parser_aux.c
16+++ b/lib/parser_aux.c
17@@ -637,7 +637,7 @@ _asn1_change_integer_value (asn1_node node)
18 p = NULL;
19 break;
20 }
21- if (p->right)
22+ if (p && p->right)
23 {
24 p = p->right;
25 break;
26@@ -753,7 +753,7 @@ _asn1_expand_object_id (asn1_node node)
27
28 if (move == RIGHT)
29 {
30- if (p->right)
31+ if (p && p->right)
32 p = p->right;
33 else
34 move = UP;
35@@ -828,7 +828,7 @@ _asn1_expand_object_id (asn1_node node)
36
37 if (move == RIGHT)
38 {
39- if (p->right)
40+ if (p && p->right)
41 p = p->right;
42 else
43 move = UP;
44@@ -898,7 +898,7 @@ _asn1_type_set_config (asn1_node node)
45
46 if (move == RIGHT)
47 {
48- if (p->right)
49+ if (p && p->right)
50 p = p->right;
51 else
52 move = UP;
53@@ -1007,7 +1007,7 @@ _asn1_check_identifier (asn1_node node)
54 p = NULL;
55 break;
56 }
57- if (p->right)
58+ if (p && p->right)
59 {
60 p = p->right;
61 break;
62@@ -1067,7 +1067,7 @@ _asn1_set_default_tag (asn1_node node)
63 p = NULL;
64 break;
65 }
66- if (p->right)
67+ if (p && p->right)
68 {
69 p = p->right;
70 break;
71--
721.9.1
73
diff --git a/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch b/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch
new file mode 100644
index 0000000000..7bda0e6f24
--- /dev/null
+++ b/meta/recipes-support/gnutls/libtasn1/0004-tools-eliminated-compiler-warnings.patch
@@ -0,0 +1,56 @@
1From d647bb2fa1bd288a6ac02c18318f3cba2a34c3a0 Mon Sep 17 00:00:00 2001
2From: Nikos Mavrogiannopoulos <nmav@redhat.com>
3Date: Tue, 26 Jul 2016 08:50:24 +0200
4Subject: [PATCH 4/4] tools: eliminated compiler warnings
5
6---
7Upstream-Status: Backport
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10 src/asn1Coding.c | 2 +-
11 src/asn1Decoding.c | 2 +-
12 src/asn1Parser.c | 2 +-
13 3 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/src/asn1Coding.c b/src/asn1Coding.c
16index d4df593..b516bfe 100644
17--- a/src/asn1Coding.c
18+++ b/src/asn1Coding.c
19@@ -188,7 +188,7 @@ main (int argc, char *argv[])
20 default:
21 fprintf (stderr,
22 "asn1Coding: ?? getopt returned character code Ox%x ??\n",
23- option_result);
24+ (unsigned)option_result);
25 }
26 }
27
28diff --git a/src/asn1Decoding.c b/src/asn1Decoding.c
29index 078963e..20f91ac 100644
30--- a/src/asn1Decoding.c
31+++ b/src/asn1Decoding.c
32@@ -131,7 +131,7 @@ main (int argc, char *argv[])
33 default:
34 fprintf (stderr,
35 "asn1Decoding: ?? getopt returned character code Ox%x ??\n",
36- option_result);
37+ (unsigned)option_result);
38 }
39 }
40
41diff --git a/src/asn1Parser.c b/src/asn1Parser.c
42index 7a3ae67..475bfc9 100644
43--- a/src/asn1Parser.c
44+++ b/src/asn1Parser.c
45@@ -139,7 +139,7 @@ main (int argc, char *argv[])
46 default:
47 fprintf (stderr,
48 "asn1Parser: ?? getopt returned character code Ox%x ??\n",
49- option_result);
50+ (unsigned)option_result);
51 }
52
53 }
54--
551.9.1
56
diff --git a/meta/recipes-support/gnutls/libtasn1_4.9.bb b/meta/recipes-support/gnutls/libtasn1_4.9.bb
index 5ce06d8b4c..9a5c5575d6 100644
--- a/meta/recipes-support/gnutls/libtasn1_4.9.bb
+++ b/meta/recipes-support/gnutls/libtasn1_4.9.bb
@@ -10,6 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
10 10
11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \ 11SRC_URI = "${GNU_MIRROR}/libtasn1/libtasn1-${PV}.tar.gz \
12 file://dont-depend-on-help2man.patch \ 12 file://dont-depend-on-help2man.patch \
13 file://0001-configure-don-t-add-Werror-to-build-flags.patch \
14 file://0002-ASN.y-corrected-compiler-warning.patch \
15 file://0003-parser_aux-corrected-potential-null-pointer-derefere.patch \
16 file://0004-tools-eliminated-compiler-warnings.patch \
13 " 17 "
14 18
15SRC_URI[md5sum] = "3018d0f466a32b66dde41bb122e6cab6" 19SRC_URI[md5sum] = "3018d0f466a32b66dde41bb122e6cab6"