summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/cc/gcc.in8
-rw-r--r--config/debug/gdb.in13
-rw-r--r--config/kernel/linux.in29
-rw-r--r--patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch222
-rw-r--r--patches/glibc/2.20/100-sparc-nptl.patch14
l---------patches/glibc/linaro-2.20-2014.111
-rw-r--r--scripts/build/binutils/binutils.sh4
-rw-r--r--scripts/build/cc/gcc.sh16
-rw-r--r--scripts/build/debug/300-gdb.sh5
-rw-r--r--scripts/build/debug/400-ltrace.sh2
-rw-r--r--scripts/build/libc/glibc.sh1
-rw-r--r--scripts/build/libc/newlib.sh3
12 files changed, 291 insertions, 27 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index 65ecd94..a60444e 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -38,7 +38,7 @@ choice
config CC_V_linaro_4_9
bool
- prompt "linaro-4.9-2015.01"
+ prompt "linaro-4.9-2015.03"
depends on CC_GCC_SHOW_LINARO
select CC_GCC_4_9
@@ -59,7 +59,7 @@ config CC_V_4_9_0
config CC_V_linaro_4_8
bool
- prompt "linaro-4.8-2014.11"
+ prompt "linaro-4.8-2015.02"
depends on CC_GCC_SHOW_LINARO
select CC_GCC_4_8
@@ -508,11 +508,11 @@ config CC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "linaro-4.9-2015.01" if CC_V_linaro_4_9
+ default "linaro-4.9-2015.03" if CC_V_linaro_4_9
default "4.9.2" if CC_V_4_9_2
default "4.9.1" if CC_V_4_9_1
default "4.9.0" if CC_V_4_9_0
- default "linaro-4.8-2014.11" if CC_V_linaro_4_8
+ default "linaro-4.8-2015.02" if CC_V_linaro_4_8
default "4.8.4" if CC_V_4_8_4
default "4.8.3" if CC_V_4_8_3
default "4.8.2" if CC_V_4_8_2
diff --git a/config/debug/gdb.in b/config/debug/gdb.in
index 9ca84f5..e6366fb 100644
--- a/config/debug/gdb.in
+++ b/config/debug/gdb.in
@@ -33,12 +33,23 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config GDB_V_7_9
+ bool
+ prompt "7.9"
+ select GDB_7_2_or_later
+
config GDB_V_linaro_7_8
bool
prompt "linaro-7.8-2014.09"
depends on DEBUG_GDB_SHOW_LINARO
select GDB_7_2_or_later
+config GDB_V_7_8_2
+ bool
+ prompt "7.8.2"
+ select GDB_7_2_or_later
+
+
config GDB_V_7_8_1
bool
prompt "7.8.1"
@@ -174,6 +185,8 @@ config GDB_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ default "7.9" if GDB_V_7_9
+ default "7.8.2" if GDB_V_7_8_2
default "linaro-7.8-2014.09" if GDB_V_linaro_7_8
default "7.8.1" if GDB_V_7_8_1
default "7.8" if GDB_V_7_8
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index f1a4c9c..20505ca 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -26,9 +26,13 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
+config KERNEL_V_3_19
+ bool
+ prompt "3.19.1"
+
config KERNEL_V_3_18
bool
- prompt "3.18.3"
+ prompt "3.18.9"
config KERNEL_V_3_17
bool
@@ -44,7 +48,7 @@ config KERNEL_V_3_15
config KERNEL_V_3_14
bool
- prompt "3.14.29 (longterm)"
+ prompt "3.14.35 (longterm)"
config KERNEL_V_3_13
bool
@@ -52,7 +56,7 @@ config KERNEL_V_3_13
config KERNEL_V_3_12
bool
- prompt "3.12.36 (longterm)"
+ prompt "3.12.38 (longterm)"
config KERNEL_V_3_11
bool
@@ -60,7 +64,7 @@ config KERNEL_V_3_11
config KERNEL_V_3_10
bool
- prompt "3.10.65 (longterm)"
+ prompt "3.10.71 (longterm)"
config KERNEL_V_3_9
bool
@@ -84,7 +88,7 @@ config KERNEL_V_3_5
config KERNEL_V_3_4
bool
- prompt "3.4.105 (longterm)"
+ prompt "3.4.106 (longterm)"
config KERNEL_V_3_3
bool
@@ -92,7 +96,7 @@ config KERNEL_V_3_3
config KERNEL_V_3_2
bool
- prompt "3.2.66 (longterm)"
+ prompt "3.2.68 (longterm)"
config KERNEL_V_3_1
bool
@@ -191,23 +195,24 @@ config KERNEL_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
- default "3.18.3" if KERNEL_V_3_18
+ default "3.19.1" if KERNEL_V_3_19
+ default "3.18.9" if KERNEL_V_3_18
default "3.17.8" if KERNEL_V_3_17
default "3.16.7" if KERNEL_V_3_16
default "3.15.10" if KERNEL_V_3_15
- default "3.14.29" if KERNEL_V_3_14
+ default "3.14.35" if KERNEL_V_3_14
default "3.13.11" if KERNEL_V_3_13
- default "3.12.36" if KERNEL_V_3_12
+ default "3.12.38" if KERNEL_V_3_12
default "3.11.10" if KERNEL_V_3_11
- default "3.10.65" if KERNEL_V_3_10
+ default "3.10.71" if KERNEL_V_3_10
default "3.9.11" if KERNEL_V_3_9
default "3.8.13" if KERNEL_V_3_8
default "3.7.10" if KERNEL_V_3_7
default "3.6.11" if KERNEL_V_3_6
default "3.5.7" if KERNEL_V_3_5
- default "3.4.105" if KERNEL_V_3_4
+ default "3.4.106" if KERNEL_V_3_4
default "3.3.8" if KERNEL_V_3_3
- default "3.2.66" if KERNEL_V_3_2
+ default "3.2.68" if KERNEL_V_3_2
default "3.1.10" if KERNEL_V_3_1
default "3.0.101" if KERNEL_V_3_0
default "2.6.39.4" if KERNEL_V_2_6_39
diff --git a/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch b/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
new file mode 100644
index 0000000..803ac6f
--- /dev/null
+++ b/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
@@ -0,0 +1,222 @@
+From 536ae0651b015b1f6140ec01775d4deaacf12c0c Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@suse.de>
+Date: Mon, 21 Jan 2013 17:41:28 +0100
+Subject: [PATCH] Fix parsing of numeric hosts in gethostbyname_r
+
+Ported from master, fixes CVE-2015-0235.
+---
+ nss/Makefile | 2 -
+ nss/digits_dots.c | 73 +++++++++++++------------------------------------
+ nss/getXXbyYY_r.c | 3 ++
+ nss/test-digits-dots.c | 38 +++++++++++++++++++++++++
+ 4 files changed, 62 insertions(+), 54 deletions(-)
+ create mode 100644 nss/test-digits-dots.c
+
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -38,7 +38,7 @@ install-bin := getent makedb
+ makedb-modules = xmalloc hash-string
+ extra-objs += $(makedb-modules:=.o)
+
+-tests = test-netdb tst-nss-test1
++tests = test-netdb tst-nss-test1 test-digits-dots
+ xtests = bug-erange
+
+ include ../Makeconfig
+--- a/nss/digits_dots.c
++++ b/nss/digits_dots.c
+@@ -46,7 +46,10 @@ __nss_hostname_digits_dots (const char *
+ {
+ if (h_errnop)
+ *h_errnop = NETDB_INTERNAL;
+- *result = NULL;
++ if (buffer_size == NULL)
++ *status = NSS_STATUS_TRYAGAIN;
++ else
++ *result = NULL;
+ return -1;
+ }
+
+@@ -83,14 +86,16 @@ __nss_hostname_digits_dots (const char *
+ }
+
+ size_needed = (sizeof (*host_addr)
+- + sizeof (*h_addr_ptrs) + strlen (name) + 1);
++ + sizeof (*h_addr_ptrs)
++ + sizeof (*h_alias_ptr) + strlen (name) + 1);
+
+ if (buffer_size == NULL)
+ {
+ if (buflen < size_needed)
+ {
++ *status = NSS_STATUS_TRYAGAIN;
+ if (h_errnop != NULL)
+- *h_errnop = TRY_AGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ __set_errno (ERANGE);
+ goto done;
+ }
+@@ -109,7 +114,7 @@ __nss_hostname_digits_dots (const char *
+ *buffer_size = 0;
+ __set_errno (save);
+ if (h_errnop != NULL)
+- *h_errnop = TRY_AGAIN;
++ *h_errnop = NETDB_INTERNAL;
+ *result = NULL;
+ goto done;
+ }
+@@ -149,7 +154,9 @@ __nss_hostname_digits_dots (const char *
+ if (! ok)
+ {
+ *h_errnop = HOST_NOT_FOUND;
+- if (buffer_size)
++ if (buffer_size == NULL)
++ *status = NSS_STATUS_NOTFOUND;
++ else
+ *result = NULL;
+ goto done;
+ }
+@@ -190,7 +197,7 @@ __nss_hostname_digits_dots (const char *
+ if (buffer_size == NULL)
+ *status = NSS_STATUS_SUCCESS;
+ else
+- *result = resbuf;
++ *result = resbuf;
+ goto done;
+ }
+
+@@ -201,15 +208,6 @@ __nss_hostname_digits_dots (const char *
+
+ if ((isxdigit (name[0]) && strchr (name, ':') != NULL) || name[0] == ':')
+ {
+- const char *cp;
+- char *hostname;
+- typedef unsigned char host_addr_t[16];
+- host_addr_t *host_addr;
+- typedef char *host_addr_list_t[2];
+- host_addr_list_t *h_addr_ptrs;
+- size_t size_needed;
+- int addr_size;
+-
+ switch (af)
+ {
+ default:
+@@ -225,7 +223,10 @@ __nss_hostname_digits_dots (const char *
+ /* This is not possible. We cannot represent an IPv6 address
+ in an `struct in_addr' variable. */
+ *h_errnop = HOST_NOT_FOUND;
+- *result = NULL;
++ if (buffer_size == NULL)
++ *status = NSS_STATUS_NOTFOUND;
++ else
++ *result = NULL;
+ goto done;
+
+ case AF_INET6:
+@@ -233,42 +234,6 @@ __nss_hostname_digits_dots (const char *
+ break;
+ }
+
+- size_needed = (sizeof (*host_addr)
+- + sizeof (*h_addr_ptrs) + strlen (name) + 1);
+-
+- if (buffer_size == NULL && buflen < size_needed)
+- {
+- if (h_errnop != NULL)
+- *h_errnop = TRY_AGAIN;
+- __set_errno (ERANGE);
+- goto done;
+- }
+- else if (buffer_size != NULL && *buffer_size < size_needed)
+- {
+- char *new_buf;
+- *buffer_size = size_needed;
+- new_buf = realloc (*buffer, *buffer_size);
+-
+- if (new_buf == NULL)
+- {
+- save = errno;
+- free (*buffer);
+- __set_errno (save);
+- *buffer = NULL;
+- *buffer_size = 0;
+- *result = NULL;
+- goto done;
+- }
+- *buffer = new_buf;
+- }
+-
+- memset (*buffer, '\0', size_needed);
+-
+- host_addr = (host_addr_t *) *buffer;
+- h_addr_ptrs = (host_addr_list_t *)
+- ((char *) host_addr + sizeof (*host_addr));
+- hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
+-
+ for (cp = name;; ++cp)
+ {
+ if (!*cp)
+@@ -281,7 +246,9 @@ __nss_hostname_digits_dots (const char *
+ if (inet_pton (AF_INET6, name, host_addr) <= 0)
+ {
+ *h_errnop = HOST_NOT_FOUND;
+- if (buffer_size)
++ if (buffer_size == NULL)
++ *status = NSS_STATUS_NOTFOUND;
++ else
+ *result = NULL;
+ goto done;
+ }
+--- /dev/null
++++ b/nss/test-digits-dots.c
+@@ -0,0 +1,38 @@
++/* Copyright (C) 2013 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <http://www.gnu.org/licenses/>. */
++
++/* Testcase for BZ #15014 */
++
++#include <stdlib.h>
++#include <netdb.h>
++#include <errno.h>
++
++static int
++do_test (void)
++{
++ char buf[32];
++ struct hostent *result = NULL;
++ struct hostent ret;
++ int h_err = 0;
++ int err;
++
++ err = gethostbyname_r ("1.2.3.4", &ret, buf, sizeof (buf), &result, &h_err);
++ return err == ERANGE && h_err == NETDB_INTERNAL ? EXIT_SUCCESS : EXIT_FAILURE;
++}
++
++#define TEST_FUNCTION do_test ()
++#include "../test-skeleton.c"
+--- a/nss/getXXbyYY_r.c
++++ b/nss/getXXbyYY_r.c
+@@ -179,6 +179,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, L
+ case -1:
+ return errno;
+ case 1:
++#ifdef NEED_H_ERRNO
++ any_service = true;
++#endif
+ goto done;
+ }
+ #endif
diff --git a/patches/glibc/2.20/100-sparc-nptl.patch b/patches/glibc/2.20/100-sparc-nptl.patch
new file mode 100644
index 0000000..21f0337
--- /dev/null
+++ b/patches/glibc/2.20/100-sparc-nptl.patch
@@ -0,0 +1,14 @@
+diff --git a/sysdeps/sparc/sparc32/sem_trywait.c b/sysdeps/sparc/sparc32/sem_trywait.c
+index 7d0fc55..ad9b4ad 100644
+--- a/sysdeps/sparc/sparc32/sem_trywait.c
++++ b/sysdeps/sparc/sparc32/sem_trywait.c
+@@ -22,6 +22,7 @@
+ #include <lowlevellock.h>
+ #include <internaltypes.h>
+ #include <semaphore.h>
++#include <sparc-nptl.h>
+
+ #include <shlib-compat.h>
+
+
+
diff --git a/patches/glibc/linaro-2.20-2014.11 b/patches/glibc/linaro-2.20-2014.11
new file mode 120000
index 0000000..9761f73
--- /dev/null
+++ b/patches/glibc/linaro-2.20-2014.11
@@ -0,0 +1 @@
+2.20 \ No newline at end of file
diff --git a/scripts/build/binutils/binutils.sh b/scripts/build/binutils/binutils.sh
index 813d3ce..a23b94a 100644
--- a/scripts/build/binutils/binutils.sh
+++ b/scripts/build/binutils/binutils.sh
@@ -15,8 +15,8 @@ do_binutils_get() {
http://cbuild.validation.linaro.org/snapshots
else
CT_GetFile "binutils-${CT_BINUTILS_VERSION}" \
- ftp://{sourceware.org,gcc.gnu.org}/pub/binutils/{releases,snapshots} \
- {ftp,http}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils
+ {http,ftp}://{ftp.gnu.org/gnu,ftp.kernel.org/pub/linux/devel}/binutils \
+ ftp://{sourceware.org,gcc.gnu.org}/pub/binutils/{releases,snapshots}
fi
fi
diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh
index ed78aa1..835aea0 100644
--- a/scripts/build/cc/gcc.sh
+++ b/scripts/build/cc/gcc.sh
@@ -23,8 +23,8 @@ do_cc_get() {
# Also, Split out linaro mirrors, so that downloads happen faster.
if [ x"${linaro_version}" = x"${CT_CC_VERSION}" ]; then
CT_GetFile "gcc-${CT_CC_VERSION}" \
- ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION} \
- {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION}
+ {http,ftp,https}://ftp.gnu.org/gnu/gcc/gcc-${CT_CC_VERSION} \
+ ftp://{gcc.gnu.org,sourceware.org}/pub/gcc/releases/gcc-${CT_CC_VERSION}
else
YYMM=`echo ${CT_CC_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'`
CT_GetFile "gcc-${CT_CC_VERSION}" \
@@ -39,7 +39,9 @@ do_cc_get() {
# GCC source tree, which will not be there unless we get it and
# put it there ourselves
if [ "${CT_CC_LANG_JAVA_USE_ECJ}" = "y" ]; then
- CT_GetFile ecj-latest .jar ftp://gcc.gnu.org/pub/java \
+ CT_GetFile ecj-latest .jar http://mirrors.kernel.org/sourceware/java/ \
+ http://crosstool-ng.org/pub/java \
+ ftp://gcc.gnu.org/pub/java \
ftp://sourceware.org/pub/java
fi
}
@@ -490,7 +492,9 @@ do_cc_core_backend() {
# check whether compiler has an extension
file="$( ls -1 "${prefix}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
- CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${prefix}/bin/${CT_TARGET}-cc${ext}"
+ if [ -f "${prefix}/bin/${CT_TARGET}-gcc${ext}" ]; then
+ CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${prefix}/bin/${CT_TARGET}-cc${ext}"
+ fi
if [ "${CT_MULTILIB}" = "y" ]; then
if [ "${CT_CANADIAN}" = "y" -a "${mode}" = "baremetal" \
@@ -882,7 +886,9 @@ do_cc_backend() {
# check whether compiler has an extension
file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
- CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
+ if [ -f "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc${ext}" ]; then
+ CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
+ fi
if [ "${CT_MULTILIB}" = "y" ]; then
if [ "${CT_CANADIAN}" = "y" ]; then
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index 8fed3d0..4eee214 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -52,8 +52,9 @@ do_debug_gdb_get() {
if [ x"${linaro_version}" = x"${CT_GDB_VERSION}" ]; then
CT_GetFile "gdb-${CT_GDB_VERSION}" \
- ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases \
- {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb
+ http://mirrors.kernel.org/sourceware/gdb \
+ {http,ftp,https}://ftp.gnu.org/pub/gnu/gdb \
+ ftp://{sourceware.org,gcc.gnu.org}/pub/gdb/releases
else
YYMM=`echo ${CT_GDB_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'`
CT_GetFile "gdb-${CT_GDB_VERSION}" \
diff --git a/scripts/build/debug/400-ltrace.sh b/scripts/build/debug/400-ltrace.sh
index 01e8081..56f2580 100644
--- a/scripts/build/debug/400-ltrace.sh
+++ b/scripts/build/debug/400-ltrace.sh
@@ -2,7 +2,7 @@
do_debug_ltrace_get() {
CT_GetFile "ltrace_${CT_LTRACE_VERSION}.orig" .tar.gz \
- {ftp,http}://ftp.debian.org/debian/pool/main/l/ltrace/
+ {http,ftp}://ftp.debian.org/debian/pool/main/l/ltrace/
# Create a link so that the following steps are easier to do:
CT_Pushd "${CT_TARBALLS_DIR}"
ltrace_ext=$(CT_GetFileExtension "ltrace_${CT_LTRACE_VERSION}.orig")
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 6ab1c50..50adf95 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -565,6 +565,7 @@ do_libc_get() {
esac
if ! CT_GetFile "glibc-${addon}-${CT_LIBC_VERSION}" \
+ http://mirrors.kernel.org/sourceware/glibc \
{http,ftp,https}://ftp.gnu.org/gnu/glibc \
ftp://{sourceware.org,gcc.gnu.org}/pub/glibc/{releases,snapshots}
then
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh
index 9d42035..af04a6d 100644
--- a/scripts/build/libc/newlib.sh
+++ b/scripts/build/libc/newlib.sh
@@ -10,7 +10,8 @@ LIBC_NEWLIB_AVR_HDRS_BASE="avr-headers-3.2.3.970"
LIBC_NEWLIB_AVR_HDRS_EXT=".zip"
do_libc_get() {
- local libc_src="ftp://sourceware.org/pub/newlib"
+ local libc_src="{http://mirrors.kernel.org/sourceware/newlib,
+ ftp://sourceware.org/pub/newlib}"
if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then
CT_GetCustom "newlib" "${CT_LIBC_VERSION}" \
generated by cgit v0.10.2-6-g49f6 at 2024-05-14 18:01:18 (GMT)