From: Sona Sarmadi <sona.sarmadi@enea.com>
To: <openembedded-core@lists.openembedded.org>
Cc: sona@enea.se
Subject: [PATCH][krogoth 12/12] curl/url: remove unconditional idn2.h include
Date: Fri, 11 Nov 2016 10:49:14 +0100 [thread overview]
Message-ID: <1478857754-61379-12-git-send-email-sona.sarmadi@enea.com> (raw)
In-Reply-To: <1478857754-61379-1-git-send-email-sona.sarmadi@enea.com>
Mistake brought by 9c91ec778104a [fix to CVE-2016-8625]
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
---
.../url-remove-unconditional-idn2.h-include.patch | 28 ++++++++++++++++++++++
meta/recipes-support/curl/curl_7.47.1.bb | 1 +
2 files changed, 29 insertions(+)
create mode 100644 meta/recipes-support/curl/curl/url-remove-unconditional-idn2.h-include.patch
diff --git a/meta/recipes-support/curl/curl/url-remove-unconditional-idn2.h-include.patch b/meta/recipes-support/curl/curl/url-remove-unconditional-idn2.h-include.patch
new file mode 100644
index 0000000..e2a88e4
--- /dev/null
+++ b/meta/recipes-support/curl/curl/url-remove-unconditional-idn2.h-include.patch
@@ -0,0 +1,28 @@
+From c27013c05d99d92370b57e1a7af1b854eef4e7c1 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Mon, 31 Oct 2016 09:49:50 +0100
+Subject: [PATCH] url: remove unconditional idn2.h include
+
+Mistake brought by 9c91ec778104a [fix to CVE-2016-8625]
+
+Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
+---
+ lib/url.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/url.c b/lib/url.c
+index c90a1c5..b997f41 100644
+--- a/lib/url.c
++++ b/lib/url.c
+@@ -67,8 +67,6 @@
+ bool curl_win32_idn_to_ascii(const char *in, char **out);
+ #endif /* USE_LIBIDN2 */
+
+-#include <idn2.h>
+-
+ #include "urldata.h"
+ #include "netrc.h"
+
+--
+1.9.1
+
diff --git a/meta/recipes-support/curl/curl_7.47.1.bb b/meta/recipes-support/curl/curl_7.47.1.bb
index a7f6917..7fab7cf 100644
--- a/meta/recipes-support/curl/curl_7.47.1.bb
+++ b/meta/recipes-support/curl/curl_7.47.1.bb
@@ -26,6 +26,7 @@ SRC_URI += " file://configure_ac.patch \
file://CVE-2016-8623.patch \
file://CVE-2016-8624.patch \
file://CVE-2016-8625.patch \
+ file://url-remove-unconditional-idn2.h-include.patch \
"
SRC_URI[md5sum] = "9ea3123449439bbd960cd25cf98796fb"
--
1.9.1
next prev parent reply other threads:[~2016-11-11 9:49 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-11 9:49 [PATCH][krogoth 01/12] curl: CVE-2016-8615 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 02/12] curl: CVE-2016-8616 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 03/12] curl: CVE-2016-8617 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 04/12] curl: CVE-2016-8618 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 05/12] curl: CVE-2016-8619 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 06/12] curl: CVE-2016-8620 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 07/12] curl: CVE-2016-8621 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 08/12] curl: CVE-2016-8622 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 09/12] curl: CVE-2016-8623 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 10/12] curl: CVE-2016-8624 Sona Sarmadi
2016-11-11 9:49 ` [PATCH][krogoth 11/12] curl: CVE-2016-8625 Sona Sarmadi
2016-11-11 9:49 ` Sona Sarmadi [this message]
2016-11-11 10:53 ` [PATCH][krogoth 12/12] curl/url: remove unconditional idn2.h include Anders Darander
2016-11-11 11:07 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1478857754-61379-12-git-send-email-sona.sarmadi@enea.com \
--to=sona.sarmadi@enea.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=sona@enea.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox