Re: [OE-core] [PATCH 05/15] libidn: Fix hardened build with musl

2017-06-02 Thread Khem Raj 
Armin

Please backport this patch to pyro as well.

On Sun, May 21, 2017 at 10:00 PM, Khem Raj  wrote:
> Re-introduce the patch that was deemed to be not needed
> but it infact is still needed with musl
>
> Signed-off-by: Khem Raj 
> ---
>  .../libidn/0001-idn-format-security-warnings.patch | 181 
> +
>  meta/recipes-extended/libidn/libidn_1.33.bb|   1 +
>  2 files changed, 182 insertions(+)
>  create mode 100644 
> meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
>
> diff --git 
> a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch 
> b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
> new file mode 100644
> index 00..5adc7d9fd9
> --- /dev/null
> +++ 
> b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
> @@ -0,0 +1,181 @@
> +From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
> +Date: Tue, 28 Jun 2016 12:43:31 +0100
> +Subject: [PATCH] idn: fix printf() format security warnings
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +| ../../libidn-1.32/src/idn.c: In function 'main':
> +| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be 
> specified"));
> +|^
> +| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|  fprintf (stderr, _("Type each input string on a line by itself, "
> +|  ^~~
> +| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +| error (EXIT_FAILURE, errno, _("input error"));
> +| ^
> +| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +| _("could not convert from UTF-8 to UCS-4"));
> +| ^
> +| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +| _("could not convert from UTF-8 to UCS-4"));
> +| ^
> +| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|   _("could not convert from UTF-8 to UCS-4"));
> +|   ^
> +| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|   _("could not convert from UCS-4 to UTF-8"));
> +|   ^
> +| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|   _("could not convert from UCS-4 to UTF-8"));
> +|   ^
> +| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +| _("could not convert from UCS-4 to UTF-8"));
> +| ^
> +| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|   _("could not convert from UTF-8 to UCS-4"));
> +|   ^
> +| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|  _("could not convert from UTF-8 to UCS-4"));
> +|  ^
> +| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|   error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
> +|   ^
> +| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and 
> no format arguments [-Werror=format-security]
> +|  _("could not convert from UTF-8 to UCS-4"));
> +|  ^
> +
> +Signed-off-by: André Draszik 
> +---
> +Upstream-Status: Pending
> +
> + src/idn.c | 27 ++-
> + 1 file changed, 14 insertions(+), 13 deletions(-)
> +
> +diff --git a/src/idn.c b/src/idn.c
> +index be1c7d1..68e4291 100644
> +--- a/src/idn.c
>  b/src/idn.c
> +@@ -170,7 +170,7 @@ main (int argc, char *argv[])
> +   (args_info.idna_to_unicode_given ? 1 : 0) +
> +   (args_info.nfkc_given ? 1 : 0) != 1)
> + {
> +-  error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be 
> specified"));
> ++  error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be 
> specified"));
> +   usage (EXIT_FAILURE);
> + }
> +
> +@@ -185,7 +185,7 @@ main (int argc, char *argv[])
> +   if (!args_info.quiet_given
> +   && args_info.inputs_num == 0
> +   && isatty (fileno (stdin)))
> +-fprintf (stderr, _("Type each input string on a line by itself, "
> ++fprintf (stderr, "%s", _("Type each input string on a line by itself, "
> +

[OE-core] [PATCH 05/15] libidn: Fix hardened build with musl

2017-05-21 Thread Khem Raj 
Re-introduce the patch that was deemed to be not needed
but it infact is still needed with musl

Signed-off-by: Khem Raj 
---
 .../libidn/0001-idn-format-security-warnings.patch | 181 +
 meta/recipes-extended/libidn/libidn_1.33.bb|   1 +
 2 files changed, 182 insertions(+)
 create mode 100644 
meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch

diff --git 
a/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch 
b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
new file mode 100644
index 00..5adc7d9fd9
--- /dev/null
+++ 
b/meta/recipes-extended/libidn/libidn/0001-idn-format-security-warnings.patch
@@ -0,0 +1,181 @@
+From 82f98dcbc429bbe89a9837c533cbcbc02e77c790 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Draszik?= 
+Date: Tue, 28 Jun 2016 12:43:31 +0100
+Subject: [PATCH] idn: fix printf() format security warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| ../../libidn-1.32/src/idn.c: In function 'main':
+| ../../libidn-1.32/src/idn.c:172:7: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be 
specified"));
+|^
+| ../../libidn-1.32/src/idn.c:187:5: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|  fprintf (stderr, _("Type each input string on a line by itself, "
+|  ^~~
+| ../../libidn-1.32/src/idn.c:202:4: error: format not a string literal and no 
format arguments [-Werror=format-security]
+| error (EXIT_FAILURE, errno, _("input error"));
+| ^
+| ../../libidn-1.32/src/idn.c:220:8: error: format not a string literal and no 
format arguments [-Werror=format-security]
+| _("could not convert from UTF-8 to UCS-4"));
+| ^
+| ../../libidn-1.32/src/idn.c:245:8: error: format not a string literal and no 
format arguments [-Werror=format-security]
+| _("could not convert from UTF-8 to UCS-4"));
+| ^
+| ../../libidn-1.32/src/idn.c:281:6: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|   _("could not convert from UTF-8 to UCS-4"));
+|   ^
+| ../../libidn-1.32/src/idn.c:340:6: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|   _("could not convert from UCS-4 to UTF-8"));
+|   ^
+| ../../libidn-1.32/src/idn.c:364:6: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|   _("could not convert from UCS-4 to UTF-8"));
+|   ^
+| ../../libidn-1.32/src/idn.c:442:8: error: format not a string literal and no 
format arguments [-Werror=format-security]
+| _("could not convert from UCS-4 to UTF-8"));
+| ^
+| ../../libidn-1.32/src/idn.c:498:6: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|   _("could not convert from UTF-8 to UCS-4"));
+|   ^
+| ../../libidn-1.32/src/idn.c:527:5: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|  _("could not convert from UTF-8 to UCS-4"));
+|  ^
+| ../../libidn-1.32/src/idn.c:540:6: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|   error (EXIT_FAILURE, 0, _("could not do NFKC normalization"));
+|   ^
+| ../../libidn-1.32/src/idn.c:551:5: error: format not a string literal and no 
format arguments [-Werror=format-security]
+|  _("could not convert from UTF-8 to UCS-4"));
+|  ^
+
+Signed-off-by: André Draszik 
+---
+Upstream-Status: Pending
+
+ src/idn.c | 27 ++-
+ 1 file changed, 14 insertions(+), 13 deletions(-)
+
+diff --git a/src/idn.c b/src/idn.c
+index be1c7d1..68e4291 100644
+--- a/src/idn.c
 b/src/idn.c
+@@ -170,7 +170,7 @@ main (int argc, char *argv[])
+   (args_info.idna_to_unicode_given ? 1 : 0) +
+   (args_info.nfkc_given ? 1 : 0) != 1)
+ {
+-  error (0, 0, _("only one of -s, -e, -d, -a, -u or -n can be 
specified"));
++  error (0, 0, "%s", _("only one of -s, -e, -d, -a, -u or -n can be 
specified"));
+   usage (EXIT_FAILURE);
+ }
+ 
+@@ -185,7 +185,7 @@ main (int argc, char *argv[])
+   if (!args_info.quiet_given
+   && args_info.inputs_num == 0
+   && isatty (fileno (stdin)))
+-fprintf (stderr, _("Type each input string on a line by itself, "
++fprintf (stderr, "%s", _("Type each input string on a line by itself, "
+  "terminated by a newline character.\n"));
+ 
+   do
+@@ -197,7 +197,7 @@ main (int argc, char *argv[])
+ if (feof (stdin))
+   break;
+ 
+-error (EXIT_FAILURE, errno, _("input error"));
++error (EXIT_FAILURE, errno, "%s", _("input error"));
+   }
+ 
+   if (strlen (line) > 0)
+@@ -215,7