update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
|
||||
Date: Fri, 1 Sep 2017 10:04:48 +0200
|
||||
Subject: [PATCH] lib/punycode.c (decode_digit): Fix integer overflow
|
||||
|
||||
This fix is a backport from libidn2 and addresses
|
||||
CVE-2017-14062.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit e9e81b8063b095
|
||||
|
||||
lib/punycode.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/punycode.c b/lib/punycode.c
|
||||
index 86819a7deb85..49250a13e2cc 100644
|
||||
--- a/lib/punycode.c
|
||||
+++ b/lib/punycode.c
|
||||
@@ -88,10 +88,10 @@ enum
|
||||
/* point (for use in representing integers) in the range 0 to */
|
||||
/* base-1, or base if cp does not represent a value. */
|
||||
|
||||
-static punycode_uint
|
||||
-decode_digit (punycode_uint cp)
|
||||
+static unsigned
|
||||
+decode_digit (int cp)
|
||||
{
|
||||
- return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
|
||||
+ return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
|
||||
cp - 97 < 26 ? cp - 97 : base;
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
17
bsp/buildroot-2017.02.11/package/libidn/Config.in
Normal file
17
bsp/buildroot-2017.02.11/package/libidn/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_LIBIDN
|
||||
bool "libidn"
|
||||
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
|
||||
help
|
||||
Libidn's purpose is to encode and decode internationalized
|
||||
domain names.
|
||||
|
||||
http://www.gnu.org/software/libidn/
|
||||
|
||||
if BR2_PACKAGE_LIBIDN
|
||||
|
||||
config BR2_PACKAGE_LIBIDN_BINARY
|
||||
bool "idn binary"
|
||||
help
|
||||
Install idn command line tool
|
||||
|
||||
endif
|
||||
4
bsp/buildroot-2017.02.11/package/libidn/libidn.hash
Normal file
4
bsp/buildroot-2017.02.11/package/libidn/libidn.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# From http://lists.nongnu.org/archive/html/help-libidn/2016-07/msg00009.html
|
||||
sha1 57872fdc665dcc585e16f4ac0bb35374b1103f7e libidn-1.33.tar.gz
|
||||
# Calculated based on the hash above
|
||||
sha256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 libidn-1.33.tar.gz
|
||||
32
bsp/buildroot-2017.02.11/package/libidn/libidn.mk
Normal file
32
bsp/buildroot-2017.02.11/package/libidn/libidn.mk
Normal file
@@ -0,0 +1,32 @@
|
||||
################################################################################
|
||||
#
|
||||
# libidn
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIDN_VERSION = 1.33
|
||||
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
||||
LIBIDN_INSTALL_STAGING = YES
|
||||
LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true
|
||||
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
|
||||
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+
|
||||
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
|
||||
# lib/punycode.c patch triggers reconf in doc/
|
||||
LIBIDN_AUTORECONF = YES
|
||||
|
||||
define LIBIDN_REMOVE_BINARY
|
||||
rm -f $(TARGET_DIR)/usr/bin/idn
|
||||
endef
|
||||
|
||||
ifneq ($(BR2_PACKAGE_LIBIDN_BINARY),y)
|
||||
LIBIDN_POST_INSTALL_TARGET_HOOKS += LIBIDN_REMOVE_BINARY
|
||||
endif
|
||||
|
||||
define LIBIDN_REMOVE_EMACS_STUFF
|
||||
rm -rf $(TARGET_DIR)/usr/share/emacs
|
||||
endef
|
||||
|
||||
LIBIDN_POST_INSTALL_TARGET_HOOKS += LIBIDN_REMOVE_EMACS_STUFF
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user