Bump buildroot to version 2018.02.8
This commit is contained in:
126
bsp/buildroot/package/attr/0002-Switch-back-to-syscall.patch
Normal file
126
bsp/buildroot/package/attr/0002-Switch-back-to-syscall.patch
Normal file
@@ -0,0 +1,126 @@
|
||||
From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Gruenbacher <agruenba@redhat.com>
|
||||
Date: Fri, 17 Aug 2018 14:07:31 +0200
|
||||
Subject: Switch back to syscall()
|
||||
|
||||
Switch back to syscall() for the *xattr system calls. The current
|
||||
mechanism of forwarding those calls to glibc breaks libraries like
|
||||
libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
|
||||
-fsanitize=address).
|
||||
|
||||
Those libraries provide wrappers for functions defined in other shared
|
||||
libraries, usually glibc, do their own processing, and forward calls to
|
||||
the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name"). In
|
||||
our case, dlsym returns the libattr_*xattr wrappers. However, when our
|
||||
wrappers try calling glibc, they end up calling the libfakeroot /
|
||||
libasan wrappers instead because those override the original symbols =>
|
||||
recursion.
|
||||
|
||||
The libattr_*xattr wrappers will only be used when symbols are looked up
|
||||
at runtime (dlopen / dlsym). Programs linking against libattr will
|
||||
directly use the glibc provided symbols. Therefore, the slightly worse
|
||||
performance of syscall() won't affect any of the "normal" users of
|
||||
libattr.
|
||||
|
||||
[nicolas.cavallari: with uclibc-ng, the recursion always happen]
|
||||
Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
|
||||
---
|
||||
libattr/syscalls.c | 26 ++++++++++++++------------
|
||||
1 file changed, 14 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/libattr/syscalls.c b/libattr/syscalls.c
|
||||
index 3013aa0..721ad7f 100644
|
||||
--- a/libattr/syscalls.c
|
||||
+++ b/libattr/syscalls.c
|
||||
@@ -22,6 +22,8 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <unistd.h>
|
||||
+#include <sys/syscall.h>
|
||||
#include <sys/xattr.h>
|
||||
|
||||
#ifdef HAVE_VISIBILITY_ATTRIBUTE
|
||||
@@ -31,67 +33,67 @@
|
||||
int libattr_setxattr(const char *path, const char *name,
|
||||
void *value, size_t size, int flags)
|
||||
{
|
||||
- return setxattr(path, name, value, size, flags);
|
||||
+ return syscall(__NR_setxattr, path, name, value, size, flags);
|
||||
}
|
||||
|
||||
int libattr_lsetxattr(const char *path, const char *name,
|
||||
void *value, size_t size, int flags)
|
||||
{
|
||||
- return lsetxattr(path, name, value, size, flags);
|
||||
+ return syscall(__NR_lsetxattr, path, name, value, size, flags);
|
||||
}
|
||||
|
||||
int libattr_fsetxattr(int filedes, const char *name,
|
||||
void *value, size_t size, int flags)
|
||||
{
|
||||
- return fsetxattr(filedes, name, value, size, flags);
|
||||
+ return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
|
||||
}
|
||||
|
||||
ssize_t libattr_getxattr(const char *path, const char *name,
|
||||
void *value, size_t size)
|
||||
{
|
||||
- return getxattr(path, name, value, size);
|
||||
+ return syscall(__NR_getxattr, path, name, value, size);
|
||||
}
|
||||
|
||||
ssize_t libattr_lgetxattr(const char *path, const char *name,
|
||||
void *value, size_t size)
|
||||
{
|
||||
- return lgetxattr(path, name, value, size);
|
||||
+ return syscall(__NR_lgetxattr, path, name, value, size);
|
||||
}
|
||||
|
||||
ssize_t libattr_fgetxattr(int filedes, const char *name,
|
||||
void *value, size_t size)
|
||||
{
|
||||
- return fgetxattr(filedes, name, value, size);
|
||||
+ return syscall(__NR_fgetxattr, filedes, name, value, size);
|
||||
}
|
||||
|
||||
ssize_t libattr_listxattr(const char *path, char *list, size_t size)
|
||||
{
|
||||
- return listxattr(path, list, size);
|
||||
+ return syscall(__NR_listxattr, path, list, size);
|
||||
}
|
||||
|
||||
ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
|
||||
{
|
||||
- return llistxattr(path, list, size);
|
||||
+ return syscall(__NR_llistxattr, path, list, size);
|
||||
}
|
||||
|
||||
ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
|
||||
{
|
||||
- return flistxattr(filedes, list, size);
|
||||
+ return syscall(__NR_flistxattr, filedes, list, size);
|
||||
}
|
||||
|
||||
int libattr_removexattr(const char *path, const char *name)
|
||||
{
|
||||
- return removexattr(path, name);
|
||||
+ return syscall(__NR_removexattr, path, name);
|
||||
}
|
||||
|
||||
int libattr_lremovexattr(const char *path, const char *name)
|
||||
{
|
||||
- return lremovexattr(path, name);
|
||||
+ return syscall(__NR_lremovexattr, path, name);
|
||||
}
|
||||
|
||||
int libattr_fremovexattr(int filedes, const char *name)
|
||||
{
|
||||
- return fremovexattr(filedes, name);
|
||||
+ return syscall(__NR_fremovexattr, filedes, name);
|
||||
}
|
||||
|
||||
#ifdef HAVE_VISIBILITY_ATTRIBUTE
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 6e1fd09f7bc131c8f16d9cc43e2455ba4650c651 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <casantos@datacom.com.br>
|
||||
Date: Sat, 3 Nov 2018 08:25:58 -0300
|
||||
Subject: [PATCH] Fix audispd path in auditd.conf
|
||||
|
||||
audispd is installed at /usr/sbin but the configuration file pointed
|
||||
to /sbin, causing auditd to fail on startup.
|
||||
|
||||
This patch cannot be sent upstream because audispd does not exist
|
||||
anymore on the master branch (it was merged to auditd).
|
||||
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.com.br>
|
||||
---
|
||||
init.d/auditd.conf | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/init.d/auditd.conf b/init.d/auditd.conf
|
||||
index 4dcda83..998904f 100644
|
||||
--- a/init.d/auditd.conf
|
||||
+++ b/init.d/auditd.conf
|
||||
@@ -13,7 +13,7 @@ max_log_file = 8
|
||||
num_logs = 5
|
||||
priority_boost = 4
|
||||
disp_qos = lossy
|
||||
-dispatcher = /sbin/audispd
|
||||
+dispatcher = /usr/sbin/audispd
|
||||
name_format = NONE
|
||||
##name = mydomain
|
||||
max_log_file_action = ROTATE
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#Locally computed
|
||||
sha256 67b59b2b77afee9ed87afa4d80ffc8e6f3a1f4bbedd5f2871f387c952147bcba audit-2.8.2.tar.gz
|
||||
sha256 a410694d09fc5708d980a61a5abcb9633a591364f1ecc7e97ad5daef9c898c38 audit-2.8.4.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AUDIT_VERSION = 2.8.2
|
||||
AUDIT_VERSION = 2.8.4
|
||||
AUDIT_SITE = http://people.redhat.com/sgrubb/audit
|
||||
AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
|
||||
AUDIT_LICENSE_FILES = COPYING COPYING.LIB
|
||||
@@ -38,7 +38,7 @@ AUDIT_CONF_OPTS += --disable-systemd
|
||||
endif
|
||||
|
||||
define AUDIT_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 755 package/audit/S01auditd $(TARGET_DIR)/etc/init.d/S01auditd
|
||||
$(INSTALL) -D -m 755 package/audit/S02auditd $(TARGET_DIR)/etc/init.d/S02auditd
|
||||
endef
|
||||
|
||||
define AUDIT_INSTALL_INIT_SYSTEMD
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From 254dc19788ba2a03504fc6d1036fef477a60035f Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Fri, 22 Jan 2016 08:31:02 -0300
|
||||
Subject: [PATCH] Rename ptrsize to ptr_size
|
||||
|
||||
This is to compensate for a uClibc mess caused by commit
|
||||
70a04a287a2875c82e6822c36e071afba5b63a62 where ptrsize is defined for
|
||||
mips, hence causing build breakage under certain conditions for programs
|
||||
that use this variable name.
|
||||
|
||||
Status: definitely not upstreamable.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
lib/dns/rbt.c | 6 +++---
|
||||
lib/dns/rbtdb.c | 4 ++--
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c
|
||||
index 86b5183..5fd55de 100644
|
||||
--- a/lib/dns/rbt.c
|
||||
+++ b/lib/dns/rbt.c
|
||||
@@ -113,7 +113,7 @@ struct file_header {
|
||||
* information about the system on which the map file was generated
|
||||
* will be used to tell if we can load the map file or not
|
||||
*/
|
||||
- isc_uint32_t ptrsize;
|
||||
+ isc_uint32_t ptr_size;
|
||||
unsigned int bigendian:1; /* big or little endian system */
|
||||
unsigned int rdataset_fixed:1; /* compiled with --enable-rrset-fixed */
|
||||
unsigned int nodecount; /* shadow from rbt structure */
|
||||
@@ -517,7 +517,7 @@ write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset,
|
||||
memmove(header.version1, FILE_VERSION, sizeof(header.version1));
|
||||
memmove(header.version2, FILE_VERSION, sizeof(header.version2));
|
||||
header.first_node_offset = first_node_offset;
|
||||
- header.ptrsize = (isc_uint32_t) sizeof(void *);
|
||||
+ header.ptr_size = (isc_uint32_t) sizeof(void *);
|
||||
header.bigendian = (1 == htonl(1)) ? 1 : 0;
|
||||
|
||||
#ifdef DNS_RDATASET_FIXED
|
||||
@@ -902,7 +902,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize,
|
||||
}
|
||||
#endif
|
||||
|
||||
- if (header->ptrsize != (isc_uint32_t) sizeof(void *)) {
|
||||
+ if (header->ptr_size != (isc_uint32_t) sizeof(void *)) {
|
||||
result = ISC_R_INVALIDFILE;
|
||||
goto cleanup;
|
||||
}
|
||||
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
|
||||
index c7168cb..dbcf944 100644
|
||||
--- a/lib/dns/rbtdb.c
|
||||
+++ b/lib/dns/rbtdb.c
|
||||
@@ -114,7 +114,7 @@ typedef struct rbtdb_file_header rbtdb_file_header_t;
|
||||
|
||||
struct rbtdb_file_header {
|
||||
char version1[32];
|
||||
- isc_uint32_t ptrsize;
|
||||
+ isc_uint32_t ptr_size;
|
||||
unsigned int bigendian:1;
|
||||
isc_uint64_t tree;
|
||||
isc_uint64_t nsec;
|
||||
@@ -7593,7 +7593,7 @@ rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location,
|
||||
memset(&header, 0, sizeof(rbtdb_file_header_t));
|
||||
memmove(header.version1, FILE_VERSION, sizeof(header.version1));
|
||||
memmove(header.version2, FILE_VERSION, sizeof(header.version2));
|
||||
- header.ptrsize = (isc_uint32_t) sizeof(void *);
|
||||
+ header.ptr_size = (isc_uint32_t) sizeof(void *);
|
||||
header.bigendian = (1 == htonl(1)) ? 1 : 0;
|
||||
header.tree = (isc_uint64_t) tree_location;
|
||||
header.nsec = (isc_uint64_t) nsec_location;
|
||||
--
|
||||
2.4.10
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.4-P1/bind-9.11.4-P1.tar.gz.asc
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.5/bind-9.11.5.tar.gz.asc
|
||||
# with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57
|
||||
sha256 a85af7b629109d41285c7adeae1515daac638bbe4d5dc30d1f4b343dff09d811 bind-9.11.4-P2.tar.gz
|
||||
sha256 a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322 bind-9.11.5.tar.gz
|
||||
sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BIND_VERSION = 9.11.4-P2
|
||||
BIND_VERSION = 9.11.5
|
||||
BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
# bind does not support parallel builds.
|
||||
BIND_MAKE = $(MAKE1)
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
bfd/ChangeLog
|
||||
2016-08-23 Nick Clifton <address@hidden>
|
||||
|
||||
* elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if
|
||||
there is no arm data associated with the section.
|
||||
|
||||
[Thomas: taken from https://lists.gnu.org/archive/html/bug-binutils/2016-08/msg00165.html.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
|
||||
index 1eba21b..4478238 100644
|
||||
--- a/bfd/elf32-arm.c
|
||||
+++ b/bfd/elf32-arm.c
|
||||
@@ -18688,7 +18688,7 @@ elf32_arm_count_additional_relocs (asection *sec)
|
||||
{
|
||||
struct _arm_elf_section_data *arm_data;
|
||||
arm_data = get_arm_elf_section_data (sec);
|
||||
- return arm_data->additional_reloc_count;
|
||||
+ return arm_data == NULL ? 0 : arm_data->additional_reloc_count;
|
||||
}
|
||||
|
||||
/* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which
|
||||
@@ -1,46 +0,0 @@
|
||||
From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 11:38:13 +0100
|
||||
Subject: [PATCH] sh-conf
|
||||
|
||||
Likewise, binutils has no idea about any of these new targets either, so we
|
||||
fix that up too.. now we're able to actually build a real toolchain for
|
||||
sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more
|
||||
inept targets than that one, really. Go look, I promise).
|
||||
|
||||
[Romain: rebase on top of 2.26]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
configure | 2 +-
|
||||
configure.ac | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 34b66f7..905bc7b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3939,7 +3939,7 @@ case "${target}" in
|
||||
or1k*-*-*)
|
||||
noconfigdirs="$noconfigdirs gdb"
|
||||
;;
|
||||
- sh-*-* | sh64-*-*)
|
||||
+ sh*-*-* | sh64-*-*)
|
||||
case "${target}" in
|
||||
sh*-*-elf)
|
||||
;;
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4977d97..1e69ee2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1276,7 +1276,7 @@ case "${target}" in
|
||||
or1k*-*-*)
|
||||
noconfigdirs="$noconfigdirs gdb"
|
||||
;;
|
||||
- sh-*-* | sh64-*-*)
|
||||
+ sh*-*-* | sh64-*-*)
|
||||
case "${target}" in
|
||||
sh*-*-elf)
|
||||
;;
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 78fb7e37eb8bb08ae537d6c487996ff17c810332 Mon Sep 17 00:00:00 2001
|
||||
From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
|
||||
Date: Mon, 26 Sep 2016 12:42:11 -0400
|
||||
Subject: [PATCH] tc-xtensa.c: fixup xg_reverse_shift_count typo
|
||||
|
||||
gas/ChangeLog:
|
||||
|
||||
2016-09-26 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
|
||||
|
||||
* config/tc-xtensa.c (xg_reverse_shift_count): Pass cnt_arg instead of
|
||||
cnt_argp to concat.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
gas/config/tc-xtensa.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
|
||||
index d062044..ca261ae 100644
|
||||
--- a/gas/config/tc-xtensa.c
|
||||
+++ b/gas/config/tc-xtensa.c
|
||||
@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp)
|
||||
cnt_arg = *cnt_argp;
|
||||
|
||||
/* replace the argument with "31-(argument)" */
|
||||
- new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL);
|
||||
+ new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL);
|
||||
|
||||
free (cnt_arg);
|
||||
*cnt_argp = new_arg;
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Wed, 2 Aug 2017 00:36:05 -0700
|
||||
Subject: [PATCH] xtensa: fix memory corruption by broken sysregs
|
||||
|
||||
In some xtensa configurations there may be system/user registers in
|
||||
xtensa-modules with negative index. ISA initialization for such config
|
||||
may clobber heap and result in program termination.
|
||||
Don't update lookup table entries for register with negative indices.
|
||||
They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this
|
||||
change should not affect processing of valid assembly/binary code.
|
||||
|
||||
bfd/
|
||||
2017-08-02 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* xtensa-isa.c (xtensa_isa_init): Don't update lookup table
|
||||
entries for sysregs with negative indices.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a
|
||||
|
||||
bfd/xtensa-isa.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
|
||||
index 8da75bea8109..8c6ee88fdeae 100644
|
||||
--- a/bfd/xtensa-isa.c
|
||||
+++ b/bfd/xtensa-isa.c
|
||||
@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p)
|
||||
xtensa_sysreg_internal *sreg = &isa->sysregs[n];
|
||||
is_user = sreg->is_user;
|
||||
|
||||
- isa->sysreg_table[is_user][sreg->number] = n;
|
||||
+ if (sreg->number >= 0)
|
||||
+ isa->sysreg_table[is_user][sreg->number] = n;
|
||||
}
|
||||
|
||||
/* Set up the interface lookup table. */
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 11:40:53 +0100
|
||||
Subject: [PATCH] ld-makefile
|
||||
|
||||
[Romain: rebase on top of 2.26]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
ld/Makefile.am | 2 +-
|
||||
ld/Makefile.in | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ld/Makefile.am b/ld/Makefile.am
|
||||
index 0b3b049..3871c74 100644
|
||||
--- a/ld/Makefile.am
|
||||
+++ b/ld/Makefile.am
|
||||
@@ -57,7 +57,7 @@ endif
|
||||
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
||||
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
||||
# directives need to be different for native and cross linkers.
|
||||
-scriptdir = $(tooldir)/lib
|
||||
+scriptdir = $(libdir)
|
||||
|
||||
EMUL = @EMUL@
|
||||
EMULATION_OFILES = @EMULATION_OFILES@
|
||||
diff --git a/ld/Makefile.in b/ld/Makefile.in
|
||||
index ed98f87..530e4c9 100644
|
||||
--- a/ld/Makefile.in
|
||||
+++ b/ld/Makefile.in
|
||||
@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
|
||||
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
||||
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
||||
# directives need to be different for native and cross linkers.
|
||||
-scriptdir = $(tooldir)/lib
|
||||
+scriptdir = $(libdir)
|
||||
BASEDIR = $(srcdir)/..
|
||||
BFDDIR = $(BASEDIR)/bfd
|
||||
INCDIR = $(BASEDIR)/include
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 11:41:47 +0100
|
||||
Subject: [PATCH] check-ldrunpath-length
|
||||
|
||||
[Romain: rebase on top of 2.26]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
ld/emultempl/elf32.em | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
|
||||
index 0405d4f..efd3300 100644
|
||||
--- a/ld/emultempl/elf32.em
|
||||
+++ b/ld/emultempl/elf32.em
|
||||
@@ -1242,6 +1242,8 @@ fragment <<EOF
|
||||
&& command_line.rpath == NULL)
|
||||
{
|
||||
lib_path = (const char *) getenv ("LD_RUN_PATH");
|
||||
+ if ((lib_path) && (strlen (lib_path) == 0))
|
||||
+ lib_path = NULL;
|
||||
if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
|
||||
force))
|
||||
break;
|
||||
@@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void)
|
||||
rpath = command_line.rpath;
|
||||
if (rpath == NULL)
|
||||
rpath = (const char *) getenv ("LD_RUN_PATH");
|
||||
+ if ((rpath) && (strlen (rpath) == 0))
|
||||
+ rpath = NULL;
|
||||
|
||||
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
|
||||
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 11:42:48 +0100
|
||||
Subject: [PATCH] add sysroot fix from bug #3049
|
||||
|
||||
Always try to prepend the sysroot prefix to absolute filenames first.
|
||||
|
||||
http://bugs.gentoo.org/275666
|
||||
http://sourceware.org/bugzilla/show_bug.cgi?id=10340
|
||||
|
||||
Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
|
||||
[Romain: rebase on top of 2.26]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
ld/ldfile.c | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ld/ldfile.c b/ld/ldfile.c
|
||||
index 96f9ecc..1439309 100644
|
||||
--- a/ld/ldfile.c
|
||||
+++ b/ld/ldfile.c
|
||||
@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch,
|
||||
directory first. */
|
||||
if (! entry->flags.maybe_archive)
|
||||
{
|
||||
- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
|
||||
+ /* For absolute pathnames, try to always open the file in the
|
||||
+ sysroot first. If this fails, try to open the file at the
|
||||
+ given location. */
|
||||
+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
|
||||
+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
|
||||
+ && ld_sysroot)
|
||||
{
|
||||
char *name = concat (ld_sysroot, entry->filename,
|
||||
(const char *) NULL);
|
||||
if (ldfile_try_open_bfd (name, entry))
|
||||
{
|
||||
entry->filename = name;
|
||||
+ entry->flags.sysrooted = TRUE;
|
||||
return TRUE;
|
||||
}
|
||||
free (name);
|
||||
}
|
||||
- else if (ldfile_try_open_bfd (entry->filename, entry))
|
||||
+
|
||||
+ if (ldfile_try_open_bfd (entry->filename, entry))
|
||||
return TRUE;
|
||||
|
||||
if (IS_ABSOLUTE_PATH (entry->filename))
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,306 +0,0 @@
|
||||
From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 25 Dec 2015 11:45:38 +0100
|
||||
Subject: [PATCH] poison-system-directories
|
||||
|
||||
Patch adapted to binutils 2.23.2 and extended to use
|
||||
BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
|
||||
|
||||
[Romain: rebase on top of 2.26]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
[Gustavo: adapt to binutils 2.25]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
Upstream-Status: Inappropriate [distribution: codesourcery]
|
||||
|
||||
Patch originally created by Mark Hatle, forward-ported to
|
||||
binutils 2.21 by Scott Garman.
|
||||
|
||||
purpose: warn for uses of system directories when cross linking
|
||||
|
||||
Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
|
||||
|
||||
2008-07-02 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
ld/
|
||||
* ld.h (args_type): Add error_poison_system_directories.
|
||||
* ld.texinfo (--error-poison-system-directories): Document.
|
||||
* ldfile.c (ldfile_add_library_path): Check
|
||||
command_line.error_poison_system_directories.
|
||||
* ldmain.c (main): Initialize
|
||||
command_line.error_poison_system_directories.
|
||||
* lexsup.c (enum option_values): Add
|
||||
OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
|
||||
(ld_options): Add --error-poison-system-directories.
|
||||
(parse_args): Handle new option.
|
||||
|
||||
2007-06-13 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
ld/
|
||||
* config.in: Regenerate.
|
||||
* ld.h (args_type): Add poison_system_directories.
|
||||
* ld.texinfo (--no-poison-system-directories): Document.
|
||||
* ldfile.c (ldfile_add_library_path): Check
|
||||
command_line.poison_system_directories.
|
||||
* ldmain.c (main): Initialize
|
||||
command_line.poison_system_directories.
|
||||
* lexsup.c (enum option_values): Add
|
||||
OPTION_NO_POISON_SYSTEM_DIRECTORIES.
|
||||
(ld_options): Add --no-poison-system-directories.
|
||||
(parse_args): Handle new option.
|
||||
|
||||
2007-04-20 Joseph Myers <joseph@codesourcery.com>
|
||||
|
||||
Merge from Sourcery G++ binutils 2.17:
|
||||
|
||||
2007-03-20 Joseph Myers <joseph@codesourcery.com>
|
||||
Based on patch by Mark Hatle <mark.hatle@windriver.com>.
|
||||
ld/
|
||||
* configure.ac (--enable-poison-system-directories): New option.
|
||||
* configure, config.in: Regenerate.
|
||||
* ldfile.c (ldfile_add_library_path): If
|
||||
ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
|
||||
/usr/lib, /usr/local/lib or /usr/X11R6/lib.
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
|
||||
---
|
||||
ld/config.in | 3 +++
|
||||
ld/configure | 14 ++++++++++++++
|
||||
ld/configure.ac | 10 ++++++++++
|
||||
ld/ld.h | 8 ++++++++
|
||||
ld/ld.texinfo | 12 ++++++++++++
|
||||
ld/ldfile.c | 17 +++++++++++++++++
|
||||
ld/ldlex.h | 2 ++
|
||||
ld/ldmain.c | 2 ++
|
||||
ld/lexsup.c | 21 +++++++++++++++++++++
|
||||
9 files changed, 89 insertions(+)
|
||||
|
||||
diff --git a/ld/config.in b/ld/config.in
|
||||
index 276fb77..35c58eb 100644
|
||||
--- a/ld/config.in
|
||||
+++ b/ld/config.in
|
||||
@@ -14,6 +14,9 @@
|
||||
language is requested. */
|
||||
#undef ENABLE_NLS
|
||||
|
||||
+/* Define to warn for use of native system library directories */
|
||||
+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
|
||||
+
|
||||
/* Additional extension a shared object might have. */
|
||||
#undef EXTRA_SHLIB_EXTENSION
|
||||
|
||||
diff --git a/ld/configure b/ld/configure
|
||||
index a446283..d1f9504 100755
|
||||
--- a/ld/configure
|
||||
+++ b/ld/configure
|
||||
@@ -786,6 +786,7 @@ with_lib_path
|
||||
enable_targets
|
||||
enable_64_bit_bfd
|
||||
with_sysroot
|
||||
+enable_poison_system_directories
|
||||
enable_gold
|
||||
enable_got
|
||||
enable_compressed_debug_sections
|
||||
@@ -1442,6 +1443,8 @@ Optional Features:
|
||||
--disable-largefile omit support for large files
|
||||
--enable-targets alternative target configurations
|
||||
--enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)
|
||||
+ --enable-poison-system-directories
|
||||
+ warn for use of native system library directories
|
||||
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
|
||||
--enable-got=<type> GOT handling scheme (target, single, negative,
|
||||
multigot)
|
||||
@@ -15491,7 +15494,18 @@ else
|
||||
fi
|
||||
|
||||
|
||||
+# Check whether --enable-poison-system-directories was given.
|
||||
+if test "${enable_poison_system_directories+set}" = set; then :
|
||||
+ enableval=$enable_poison_system_directories;
|
||||
+else
|
||||
+ enable_poison_system_directories=no
|
||||
+fi
|
||||
+
|
||||
+if test "x${enable_poison_system_directories}" = "xyes"; then
|
||||
|
||||
+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
|
||||
+
|
||||
+fi
|
||||
|
||||
# Check whether --enable-got was given.
|
||||
if test "${enable_got+set}" = set; then :
|
||||
diff --git a/ld/configure.ac b/ld/configure.ac
|
||||
index 188172d..2cd8443 100644
|
||||
--- a/ld/configure.ac
|
||||
+++ b/ld/configure.ac
|
||||
@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
|
||||
AC_SUBST(TARGET_SYSTEM_ROOT)
|
||||
AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
|
||||
|
||||
+AC_ARG_ENABLE([poison-system-directories],
|
||||
+ AS_HELP_STRING([--enable-poison-system-directories],
|
||||
+ [warn for use of native system library directories]),,
|
||||
+ [enable_poison_system_directories=no])
|
||||
+if test "x${enable_poison_system_directories}" = "xyes"; then
|
||||
+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
|
||||
+ [1],
|
||||
+ [Define to warn for use of native system library directories])
|
||||
+fi
|
||||
+
|
||||
dnl Use --enable-gold to decide if this linker should be the default.
|
||||
dnl "install_as_default" is set to false if gold is the default linker.
|
||||
dnl "installed_linker" is the installed BFD linker name.
|
||||
diff --git a/ld/ld.h b/ld/ld.h
|
||||
index d84ec4e..3476b26 100644
|
||||
--- a/ld/ld.h
|
||||
+++ b/ld/ld.h
|
||||
@@ -164,6 +164,14 @@ typedef struct {
|
||||
/* If set, display the target memory usage (per memory region). */
|
||||
bfd_boolean print_memory_usage;
|
||||
|
||||
+ /* If TRUE (the default) warn for uses of system directories when
|
||||
+ cross linking. */
|
||||
+ bfd_boolean poison_system_directories;
|
||||
+
|
||||
+ /* If TRUE (default FALSE) give an error for uses of system
|
||||
+ directories when cross linking instead of a warning. */
|
||||
+ bfd_boolean error_poison_system_directories;
|
||||
+
|
||||
/* Big or little endian as set on command line. */
|
||||
enum endian_enum endian;
|
||||
|
||||
diff --git a/ld/ld.texinfo b/ld/ld.texinfo
|
||||
index 1dd7492..fb1438e 100644
|
||||
--- a/ld/ld.texinfo
|
||||
+++ b/ld/ld.texinfo
|
||||
@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change.
|
||||
|
||||
Passing @code{none} for @var{style} disables the setting from any
|
||||
@code{--build-id} options earlier on the command line.
|
||||
+
|
||||
+@kindex --no-poison-system-directories
|
||||
+@item --no-poison-system-directories
|
||||
+Do not warn for @option{-L} options using system directories such as
|
||||
+@file{/usr/lib} when cross linking. This option is intended for use
|
||||
+in chroot environments when such directories contain the correct
|
||||
+libraries for the target system rather than the host.
|
||||
+
|
||||
+@kindex --error-poison-system-directories
|
||||
+@item --error-poison-system-directories
|
||||
+Give an error instead of a warning for @option{-L} options using
|
||||
+system directories when cross linking.
|
||||
@end table
|
||||
|
||||
@c man end
|
||||
diff --git a/ld/ldfile.c b/ld/ldfile.c
|
||||
index 1439309..086b354 100644
|
||||
--- a/ld/ldfile.c
|
||||
+++ b/ld/ldfile.c
|
||||
@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
|
||||
new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
|
||||
else
|
||||
new_dirs->name = xstrdup (name);
|
||||
+
|
||||
+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
|
||||
+ if (command_line.poison_system_directories
|
||||
+ && ((!strncmp (name, "/lib", 4))
|
||||
+ || (!strncmp (name, "/usr/lib", 8))
|
||||
+ || (!strncmp (name, "/usr/local/lib", 14))
|
||||
+ || (!strncmp (name, "/usr/X11R6/lib", 14))))
|
||||
+ {
|
||||
+ if (command_line.error_poison_system_directories)
|
||||
+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
|
||||
+ "cross-compilation\n"), name);
|
||||
+ else
|
||||
+ einfo (_("%P: warning: library search path \"%s\" is unsafe for "
|
||||
+ "cross-compilation\n"), name);
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
}
|
||||
|
||||
/* Try to open a BFD for a lang_input_statement. */
|
||||
diff --git a/ld/ldlex.h b/ld/ldlex.h
|
||||
index 6f11e7b..0ca3110 100644
|
||||
--- a/ld/ldlex.h
|
||||
+++ b/ld/ldlex.h
|
||||
@@ -144,6 +144,8 @@ enum option_values
|
||||
OPTION_PRINT_MEMORY_USAGE,
|
||||
OPTION_REQUIRE_DEFINED_SYMBOL,
|
||||
OPTION_ORPHAN_HANDLING,
|
||||
+ OPTION_NO_POISON_SYSTEM_DIRECTORIES,
|
||||
+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
|
||||
};
|
||||
|
||||
/* The initial parser states. */
|
||||
diff --git a/ld/ldmain.c b/ld/ldmain.c
|
||||
index bb0b9cc..a23c56c 100644
|
||||
--- a/ld/ldmain.c
|
||||
+++ b/ld/ldmain.c
|
||||
@@ -257,6 +257,8 @@ main (int argc, char **argv)
|
||||
command_line.warn_mismatch = TRUE;
|
||||
command_line.warn_search_mismatch = TRUE;
|
||||
command_line.check_section_addresses = -1;
|
||||
+ command_line.poison_system_directories = TRUE;
|
||||
+ command_line.error_poison_system_directories = FALSE;
|
||||
|
||||
/* We initialize DEMANGLING based on the environment variable
|
||||
COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the
|
||||
diff --git a/ld/lexsup.c b/ld/lexsup.c
|
||||
index 4cad209..be7d584 100644
|
||||
--- a/ld/lexsup.c
|
||||
+++ b/ld/lexsup.c
|
||||
@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
|
||||
{ {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
|
||||
'\0', N_("=MODE"), N_("Control how orphan sections are handled."),
|
||||
TWO_DASHES },
|
||||
+ { {"no-poison-system-directories", no_argument, NULL,
|
||||
+ OPTION_NO_POISON_SYSTEM_DIRECTORIES},
|
||||
+ '\0', NULL, N_("Do not warn for -L options using system directories"),
|
||||
+ TWO_DASHES },
|
||||
+ { {"error-poison-system-directories", no_argument, NULL,
|
||||
+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
|
||||
+ '\0', NULL, N_("Give an error for -L options using system directories"),
|
||||
+ TWO_DASHES },
|
||||
};
|
||||
|
||||
#define OPTION_COUNT ARRAY_SIZE (ld_options)
|
||||
@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
|
||||
int ingroup = 0;
|
||||
char *default_dirlist = NULL;
|
||||
char *shortopts;
|
||||
+ char *BR_paranoid_env;
|
||||
struct option *longopts;
|
||||
struct option *really_longopts;
|
||||
int last_optind;
|
||||
@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
|
||||
}
|
||||
break;
|
||||
|
||||
+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
|
||||
+ command_line.poison_system_directories = FALSE;
|
||||
+ break;
|
||||
+
|
||||
+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
|
||||
+ command_line.error_poison_system_directories = TRUE;
|
||||
+ break;
|
||||
+
|
||||
case OPTION_PUSH_STATE:
|
||||
input_flags.pushed = xmemdup (&input_flags,
|
||||
sizeof (input_flags),
|
||||
@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
|
||||
command_line.soname = NULL;
|
||||
}
|
||||
|
||||
+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
|
||||
+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
|
||||
+ command_line.error_poison_system_directories = TRUE;
|
||||
+
|
||||
while (ingroup)
|
||||
{
|
||||
lang_leave_group ();
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From c646b02fdcae5f37bd88f33a0c4683ef13ad5c82 Mon Sep 17 00:00:00 2001
|
||||
From: Alan Modra <amodra@gmail.com>
|
||||
Date: Mon, 31 Oct 2016 12:46:38 +1030
|
||||
Subject: [PATCH] Revert part "Set dynamic tag VMA and size from dynamic
|
||||
section when possible"
|
||||
|
||||
PR 20748
|
||||
* elf32-microblaze.c (microblaze_elf_finish_dynamic_sections): Revert
|
||||
2016-05-13 change.
|
||||
|
||||
Signed-off-by: Alan Modra <amodra@gmail.com>
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
|
||||
|
||||
diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
|
||||
index 477e7b3..5c66808 100644
|
||||
--- a/bfd/elf32-microblaze.c
|
||||
+++ b/bfd/elf32-microblaze.c
|
||||
@@ -3396,13 +3396,13 @@ microblaze_elf_finish_dynamic_sections (bfd *output_bfd,
|
||||
{
|
||||
asection *s;
|
||||
|
||||
- s = bfd_get_linker_section (dynobj, name);
|
||||
+ s = bfd_get_section_by_name (output_bfd, name);
|
||||
if (s == NULL)
|
||||
dyn.d_un.d_val = 0;
|
||||
else
|
||||
{
|
||||
if (! size)
|
||||
- dyn.d_un.d_ptr = s->output_section->vma + s->output_offset;
|
||||
+ dyn.d_un.d_ptr = s->vma;
|
||||
else
|
||||
dyn.d_un.d_val = s->size;
|
||||
}
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
Fix ld segfault for microblaze when --gc-sections is used
|
||||
Upstream: pending
|
||||
https://sourceware.org/bugzilla/show_bug.cgi?id=21180
|
||||
|
||||
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||
|
||||
diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c
|
||||
--- binutils-2.27.orig/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200
|
||||
+++ binutils-2.27/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100
|
||||
@@ -3297,13 +3297,20 @@
|
||||
|| h->dynindx == -1))
|
||||
{
|
||||
asection *sec = h->root.u.def.section;
|
||||
+ bfd_vma value;
|
||||
+
|
||||
+ value = h->root.u.def.value;
|
||||
+ if (sec->output_section != NULL)
|
||||
+ /* PR 21180: If the output section is NULL, then the symbol is no
|
||||
+ longer needed, and in theory the GOT entry is redundant. But
|
||||
+ it is too late to change our minds now... */
|
||||
+ value += sec->output_section->vma + sec->output_offset;
|
||||
+
|
||||
microblaze_elf_output_dynamic_relocation (output_bfd,
|
||||
srela, srela->reloc_count++,
|
||||
/* symindex= */ 0,
|
||||
R_MICROBLAZE_REL, offset,
|
||||
- h->root.u.def.value
|
||||
- + sec->output_section->vma
|
||||
- + sec->output_offset);
|
||||
+ value);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1,88 +0,0 @@
|
||||
From 29a4659015ca7044c2d425d32a0b828e0fbb5ac1 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Earnshaw <Richard.Earnshaw@arm.com>
|
||||
Date: Wed, 7 Sep 2016 17:14:54 +0100
|
||||
Subject: [PATCH] Automatically enable CRC instructions on supported ARMv8-A
|
||||
CPUs.
|
||||
|
||||
2016-09-07 Richard Earnshaw <rearnsha@arm.com>
|
||||
|
||||
* opcode/arm.h (ARM_ARCH_V8A_CRC): New architecture.
|
||||
|
||||
2016-09-07 Richard Earnshaw <rearnsha@arm.com>
|
||||
|
||||
* config/tc-arm.c ((arm_cpus): Use ARM_ARCH_V8A_CRC for all
|
||||
ARMv8-A CPUs except xgene1.
|
||||
|
||||
Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=patch;h=27e5a270962fb92c07e7d476966ba380fa3bb68e
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
gas/config/tc-arm.c | 18 +++++++++---------
|
||||
include/opcode/arm.h | 2 ++
|
||||
2 files changed, 11 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
|
||||
index 73d05316..7c86184d 100644
|
||||
--- a/gas/config/tc-arm.c
|
||||
+++ b/gas/config/tc-arm.c
|
||||
@@ -25332,17 +25332,17 @@ static const struct arm_cpu_option_table arm_cpus[] =
|
||||
"Cortex-A15"),
|
||||
ARM_CPU_OPT ("cortex-a17", ARM_ARCH_V7VE, FPU_ARCH_NEON_VFP_V4,
|
||||
"Cortex-A17"),
|
||||
- ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a32", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A32"),
|
||||
- ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a35", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A35"),
|
||||
- ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a53", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A53"),
|
||||
- ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a57", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A57"),
|
||||
- ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a72", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A72"),
|
||||
- ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("cortex-a73", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Cortex-A73"),
|
||||
ARM_CPU_OPT ("cortex-r4", ARM_ARCH_V7R, FPU_NONE, "Cortex-R4"),
|
||||
ARM_CPU_OPT ("cortex-r4f", ARM_ARCH_V7R, FPU_ARCH_VFP_V3D16,
|
||||
@@ -25361,10 +25361,10 @@ static const struct arm_cpu_option_table arm_cpus[] =
|
||||
ARM_CPU_OPT ("cortex-m1", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M1"),
|
||||
ARM_CPU_OPT ("cortex-m0", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0"),
|
||||
ARM_CPU_OPT ("cortex-m0plus", ARM_ARCH_V6SM, FPU_NONE, "Cortex-M0+"),
|
||||
- ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("exynos-m1", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Samsung " \
|
||||
"Exynos M1"),
|
||||
- ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("qdf24xx", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"Qualcomm "
|
||||
"QDF24XX"),
|
||||
|
||||
@@ -25389,7 +25389,7 @@ static const struct arm_cpu_option_table arm_cpus[] =
|
||||
/* APM X-Gene family. */
|
||||
ARM_CPU_OPT ("xgene1", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"APM X-Gene 1"),
|
||||
- ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
+ ARM_CPU_OPT ("xgene2", ARM_ARCH_V8A_CRC, FPU_ARCH_CRYPTO_NEON_VFP_ARMV8,
|
||||
"APM X-Gene 2"),
|
||||
|
||||
{ NULL, 0, ARM_ARCH_NONE, ARM_ARCH_NONE, NULL }
|
||||
diff --git a/include/opcode/arm.h b/include/opcode/arm.h
|
||||
index 60715cf8..feace5cd 100644
|
||||
--- a/include/opcode/arm.h
|
||||
+++ b/include/opcode/arm.h
|
||||
@@ -263,6 +263,8 @@
|
||||
#define ARM_ARCH_V7M ARM_FEATURE_CORE (ARM_AEXT_V7M, ARM_EXT2_V6T2_V8M)
|
||||
#define ARM_ARCH_V7EM ARM_FEATURE_CORE (ARM_AEXT_V7EM, ARM_EXT2_V6T2_V8M)
|
||||
#define ARM_ARCH_V8A ARM_FEATURE_CORE (ARM_AEXT_V8A, ARM_AEXT2_V8A)
|
||||
+#define ARM_ARCH_V8A_CRC ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8A, \
|
||||
+ CRC_EXT_ARMV8)
|
||||
#define ARM_ARCH_V8_1A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_1A, \
|
||||
CRC_EXT_ARMV8 | FPU_NEON_EXT_RDMA)
|
||||
#define ARM_ARCH_V8_2A ARM_FEATURE (ARM_AEXT_V8A, ARM_AEXT2_V8_2A, \
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
comment "Binutils Options"
|
||||
|
||||
config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
|
||||
bool
|
||||
default y
|
||||
depends on !BR2_microblaze
|
||||
depends on !(BR2_nios2 && (BR2_BINUTILS_VERSION_2_28_X || BR2_BINUTILS_VERSION_2_29_X))
|
||||
|
||||
choice
|
||||
prompt "Binutils Version"
|
||||
default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From b60b613e7c2c9bf7a142c3c486ac6e77ad93f5d1 Mon Sep 17 00:00:00 2001
|
||||
From 7289e5a378ba13801996a84d89d8fe95c3fc4c11 Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Mon, 26 Mar 2018 19:08:31 +0100
|
||||
Subject: [PATCH] CMake: Allow using BUILD_SHARED_LIBS to choose static/shared
|
||||
@@ -27,7 +27,7 @@ Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Upstream-Status: Submitted [https://github.com/google/brotli/pull/655]
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 99b9258..3867931 100644
|
||||
index fc45f80..3f87f13 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.8.6)
|
||||
@@ -120,25 +120,25 @@ index 99b9258..3867931 100644
|
||||
DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
|
||||
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
||||
diff --git a/c/fuzz/test_fuzzer.sh b/c/fuzz/test_fuzzer.sh
|
||||
index 5c754e1..e85e12f 100755
|
||||
index 9985194..4b99947 100755
|
||||
--- a/c/fuzz/test_fuzzer.sh
|
||||
+++ b/c/fuzz/test_fuzzer.sh
|
||||
@@ -14,12 +14,12 @@ mkdir bin
|
||||
@@ -13,12 +13,12 @@ mkdir bin
|
||||
cd bin
|
||||
|
||||
cmake $BROTLI -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
|
||||
cmake $BROTLI -DCMAKE_C_COMPILER="$CC" \
|
||||
- -DBUILD_TESTING=OFF -DENABLE_SANITIZER=address
|
||||
-make -j$(nproc) brotlidec-static
|
||||
+ -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_SANITIZER=address
|
||||
+make -j$(nproc) brotlidec
|
||||
|
||||
${CXX} -o run_decode_fuzzer -std=c++11 -fsanitize=address -I$SRC/include \
|
||||
$SRC/fuzz/decode_fuzzer.cc $SRC/fuzz/run_decode_fuzzer.cc \
|
||||
${CC} -o run_decode_fuzzer -std=c99 -fsanitize=address -I$SRC/include \
|
||||
$SRC/fuzz/decode_fuzzer.c $SRC/fuzz/run_decode_fuzzer.c \
|
||||
- ./libbrotlidec-static.a ./libbrotlicommon-static.a
|
||||
+ ./libbrotlidec.a ./libbrotlicommon.a
|
||||
|
||||
mkdir decode_corpora
|
||||
unzip $BROTLI/java/org/brotli/integration/fuzz_data.zip -d decode_corpora
|
||||
--
|
||||
2.16.3
|
||||
2.19.1
|
||||
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From fea0b1e46c486225d57e730cc0f94fa06b5b93fc Mon Sep 17 00:00:00 2001
|
||||
From: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Date: Mon, 26 Mar 2018 12:12:00 +0100
|
||||
Subject: [PATCH] Tell CMake to not check for a C++ compiler
|
||||
|
||||
By default CMake checks both for C and C++ compilers, while the latter
|
||||
is not needed. Setting the list of languages to just "C" in the call to
|
||||
project() removes the unneeded check.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
|
||||
Upstream-Status: Submitted [https://github.com/google/brotli/pull/653]
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2dc7232..3fbcbfb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,7 @@
|
||||
# support 2.8.7.
|
||||
cmake_minimum_required(VERSION 2.8.6)
|
||||
|
||||
-project(brotli)
|
||||
+project(brotli LANGUAGES C)
|
||||
|
||||
# If Brotli is being bundled in another project, we don't want to
|
||||
# install anything. However, we want to let people override this, so
|
||||
--
|
||||
2.16.3
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally generated:
|
||||
sha512 93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c v1.0.3.tar.gz
|
||||
sha512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a v1.0.7.tar.gz
|
||||
|
||||
# Hash for license files:
|
||||
sha512 bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BROTLI_VERSION = 1.0.3
|
||||
BROTLI_VERSION = 1.0.7
|
||||
BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz
|
||||
BROTLI_SITE = https://github.com/google/brotli/archive
|
||||
BROTLI_LICENSE = MIT
|
||||
|
||||
@@ -16,7 +16,7 @@ CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data)
|
||||
CA_CERTIFICATES_LICENSE_FILES = debian/copyright
|
||||
|
||||
define CA_CERTIFICATES_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean all
|
||||
endef
|
||||
|
||||
define CA_CERTIFICATES_INSTALL_TARGET_CMDS
|
||||
@@ -31,13 +31,17 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS
|
||||
# Create symlinks to certificates under /etc/ssl/certs
|
||||
# and generate the bundle
|
||||
cd $(TARGET_DIR) ;\
|
||||
for i in `find usr/share/ca-certificates -name "*.crt"` ; do \
|
||||
for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \
|
||||
ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\
|
||||
cat $$i >>etc/ssl/certs/ca-certificates.crt ;\
|
||||
done
|
||||
cat $$i ;\
|
||||
done >$(@D)/ca-certificates.crt
|
||||
|
||||
# Create symlinks to the certificates by their hash values
|
||||
$(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs
|
||||
|
||||
# Install the certificates bundle
|
||||
$(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \
|
||||
$(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -8,7 +8,8 @@ CUPS_FILTERS_VERSION = 1.20.3
|
||||
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
|
||||
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
|
||||
CUPS_FILTERS_LICENSE_FILES = COPYING
|
||||
|
||||
# 0001-Replace-relative-linking-with-absolute-linking.patch
|
||||
CUPS_FILTERS_AUTORECONF = YES
|
||||
CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
|
||||
|
||||
CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From a4bd47f593fbe55bd3ab17532e64be74aff5b29d Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 17 Nov 2018 11:38:05 +0100
|
||||
Subject: [PATCH] easydbus is a C project file
|
||||
|
||||
Specify that easydbus is a C project file otherwise build will fail if
|
||||
no C++ compiler is found by cmake
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/486c3cd98124e7415dee2fd1463bd5e0fcc9ba91
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/mniestroj/easydbus/pull/2]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58ccb2d..575eb24 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -5,7 +5,7 @@
|
||||
#
|
||||
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
-project(easydbus)
|
||||
+project(easydbus C)
|
||||
|
||||
add_definitions("-Wall -Wextra -Wno-unused-parameter")
|
||||
set(CMAKE_C_FLAGS_RELEASE "-O2")
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 1d8f27d73df6369b19ddd6732960df0d4fdec338 Mon Sep 17 00:00:00 2001
|
||||
From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001
|
||||
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
Date: Mon, 29 May 2017 23:24:42 +0300
|
||||
Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR
|
||||
@@ -20,17 +20,17 @@ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/config/eu.am b/config/eu.am
|
||||
index 8fe1e259f9e2..c5a6209a4e04 100644
|
||||
index c2cc349ce876..99b368e09060 100644
|
||||
--- a/config/eu.am
|
||||
+++ b/config/eu.am
|
||||
@@ -71,7 +71,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
|
||||
@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
|
||||
-Wold-style-definition -Wstrict-prototypes \
|
||||
$(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
|
||||
$(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
|
||||
- $(if $($(*F)_no_Werror),,-Werror) \
|
||||
$(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
|
||||
$(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
|
||||
$($(*F)_CFLAGS)
|
||||
$(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \
|
||||
--
|
||||
2.11.0
|
||||
2.17.1
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
Disable the build of the po/ directory
|
||||
|
||||
Building the po/ directory complains that the scripts in there have
|
||||
been generated with gettext 0.17, while we use gettext 0.18 in
|
||||
Buildroot. Since we don't care that much about po files anyway, just
|
||||
disable the build of this directory.
|
||||
|
||||
Based on the former patch by Thomas Petazzoni.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
|
||||
diff -rup a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am 2014-11-07 15:14:39.018060884 +0000
|
||||
+++ b/Makefile.am 2014-11-07 15:30:02.864918229 +0000
|
||||
@@ -28,7 +28,7 @@ endif
|
||||
|
||||
# Add doc back when we have some real content.
|
||||
SUBDIRS = config m4 lib libelf libebl libdwelf libdwfl libdw libcpu libasm \
|
||||
- backends $(PROGS_SUBDIR) po tests
|
||||
+ backends $(PROGS_SUBDIR) tests
|
||||
|
||||
EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
|
||||
COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
@@ -1,26 +0,0 @@
|
||||
Provide a compatibility alias __memcpy
|
||||
|
||||
For some reason, libelf uses the internal glibc alias __memcpy, which
|
||||
doesn't exist in uClibc. Add a manual alias so that the build can
|
||||
proceed with uClibc.
|
||||
|
||||
Based on the former patch by Thomas Petazzoni.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
|
||||
diff -rup a/libelf/libelf.h b/libelf/libelf.h
|
||||
--- a/libelf/libelf.h 2014-08-27 10:25:17.000000000 +0100
|
||||
+++ b/libelf/libelf.h 2014-11-07 15:13:08.743508221 +0000
|
||||
@@ -34,6 +34,11 @@
|
||||
/* Get the ELF types. */
|
||||
#include <elf.h>
|
||||
|
||||
+#ifndef _LIBC
|
||||
+#ifndef __mempcpy
|
||||
+#define __mempcpy mempcpy
|
||||
+#endif
|
||||
+#endif
|
||||
|
||||
/* Known translation types. */
|
||||
typedef enum
|
||||
@@ -1,2 +1,6 @@
|
||||
# From https://sourceware.org/elfutils/ftp/0.169/sha512.sum
|
||||
sha512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 elfutils-0.169.tar.bz2
|
||||
# From https://sourceware.org/elfutils/ftp/0.174/sha512.sum
|
||||
sha512 696708309c2a9a076099748809ecdc0490f4a8a842b2efc1aae0d746e7c5a8b203743f5626739eff837216b0c052696516b2821f5d3cc3f2eef86597c96d42df elfutils-0.174.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2
|
||||
sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING-LGPLV3
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ELFUTILS_VERSION = 0.169
|
||||
ELFUTILS_VERSION = 0.174
|
||||
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
|
||||
ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
|
||||
ELFUTILS_INSTALL_STAGING = YES
|
||||
ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library)
|
||||
ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3
|
||||
ELFUTILS_LICENSE_FILES = COPYING COPYING-GPLV2 COPYING-LGPLV3
|
||||
ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
|
||||
HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@ config BR2_PACKAGE_ERLANG
|
||||
depends on BR2_USE_MMU # fork()
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Erlang is a programming language used to build massively
|
||||
scalable soft real-time systems with requirements on high
|
||||
|
||||
3
bsp/buildroot/package/erlang/erlang.mk
vendored
3
bsp/buildroot/package/erlang/erlang.mk
vendored
@@ -69,10 +69,9 @@ else
|
||||
ERLANG_CONF_OPTS += --without-odbc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
# Always use Buildroot's zlib
|
||||
ERLANG_CONF_OPTS += --enable-shared-zlib
|
||||
ERLANG_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
# Remove source, example, gs and wx files from staging and target.
|
||||
ERLANG_REMOVE_PACKAGES = gs wx
|
||||
|
||||
@@ -12,6 +12,7 @@ FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
|
||||
FILE_INSTALL_STAGING = YES
|
||||
FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
|
||||
FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
|
||||
HOST_FILE_CONF_OPTS = --disable-libseccomp
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
FILE_CONF_OPTS += --enable-libseccomp
|
||||
|
||||
@@ -17,19 +17,6 @@ FREETYPE_CONFIG_SCRIPTS = freetype-config
|
||||
HOST_FREETYPE_DEPENDENCIES = host-pkgconf
|
||||
HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png
|
||||
|
||||
# Regen required because the tarball ships with an experimental ltmain.sh
|
||||
# that can't be patched by our infra.
|
||||
# autogen.sh is because autotools stuff lives in other directories and
|
||||
# even AUTORECONF with _OPTS doesn't do it properly.
|
||||
# POST_PATCH is because we still need to patch libtool after the regen.
|
||||
define FREETYPE_RUN_AUTOGEN
|
||||
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||
endef
|
||||
FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN
|
||||
HOST_FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN
|
||||
FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool
|
||||
HOST_FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
FREETYPE_DEPENDENCIES += zlib
|
||||
FREETYPE_CONF_OPTS += --with-zlib
|
||||
@@ -72,8 +59,3 @@ FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
# freetype-patch and host-freetype-patch use autogen.sh so add
|
||||
# host-automake as a order-only-prerequisite because it is a phony
|
||||
# target.
|
||||
$(FREETYPE_TARGET_PATCH) $(HOST_FREETYPE_TARGET_PATCH): | host-automake
|
||||
|
||||
35
bsp/buildroot/package/gauche/0004-rfc-needs-srfi.patch
Normal file
35
bsp/buildroot/package/gauche/0004-rfc-needs-srfi.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
From 33ba5e73ec09f1308f897128334e955debd9ea43 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Wed, 21 Nov 2018 08:58:25 +0100
|
||||
Subject: [PATCH] rfc: needs srfi
|
||||
|
||||
ext/rfc needs srfi-19 since version 0.9.5 and
|
||||
https://github.com/shirok/Gauche/commit/bd22bc82361c5eeb5d3b58c3836236566746bb96
|
||||
|
||||
So add a dependency on srfi for rfc target in Makefile.in
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/f4935e29ce6aaebdaa47d46c56120b7e97145d1b
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/shirok/Gauche/pull/397]
|
||||
---
|
||||
ext/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ext/Makefile.in b/ext/Makefile.in
|
||||
index 57ddf457e..de8d59a4d 100644
|
||||
--- a/ext/Makefile.in
|
||||
+++ b/ext/Makefile.in
|
||||
@@ -54,7 +54,7 @@ bcrypt: mt-random
|
||||
|
||||
dbm : threads
|
||||
|
||||
-rfc: gauche util
|
||||
+rfc: gauche srfi util
|
||||
|
||||
test : check
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Sun, 4 Nov 2018 23:55:59 -0800
|
||||
Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
|
||||
|
||||
xtensa-uclinux uses bFLT executable file format that cannot relocate
|
||||
fields representing offsets from data to code. C++ objects built as PIC
|
||||
use offsets to encode FDE structures. As a result C++ exception handling
|
||||
doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
|
||||
xtensa-uclinux.
|
||||
|
||||
gcc/
|
||||
2018-11-05 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r265823
|
||||
|
||||
gcc/config/xtensa/uclinux.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
|
||||
index ba26187c8f7a..c7743df9d97c 100644
|
||||
--- a/gcc/config/xtensa/uclinux.h
|
||||
+++ b/gcc/config/xtensa/uclinux.h
|
||||
@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
#undef LOCAL_LABEL_PREFIX
|
||||
#define LOCAL_LABEL_PREFIX "."
|
||||
|
||||
-/* Always enable "-fpic" for Xtensa Linux. */
|
||||
-#define XTENSA_ALWAYS_PIC 1
|
||||
+/* Don't enable "-fpic" for Xtensa uclinux. */
|
||||
+#define XTENSA_ALWAYS_PIC 0
|
||||
|
||||
#undef TARGET_LIBC_HAS_FUNCTION
|
||||
#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Sun, 4 Nov 2018 23:55:59 -0800
|
||||
Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
|
||||
|
||||
xtensa-uclinux uses bFLT executable file format that cannot relocate
|
||||
fields representing offsets from data to code. C++ objects built as PIC
|
||||
use offsets to encode FDE structures. As a result C++ exception handling
|
||||
doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
|
||||
xtensa-uclinux.
|
||||
|
||||
gcc/
|
||||
2018-11-05 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r265823
|
||||
|
||||
gcc/config/xtensa/uclinux.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
|
||||
index ba26187c8f7a..c7743df9d97c 100644
|
||||
--- a/gcc/config/xtensa/uclinux.h
|
||||
+++ b/gcc/config/xtensa/uclinux.h
|
||||
@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
#undef LOCAL_LABEL_PREFIX
|
||||
#define LOCAL_LABEL_PREFIX "."
|
||||
|
||||
-/* Always enable "-fpic" for Xtensa Linux. */
|
||||
-#define XTENSA_ALWAYS_PIC 1
|
||||
+/* Don't enable "-fpic" for Xtensa uclinux. */
|
||||
+#define XTENSA_ALWAYS_PIC 0
|
||||
|
||||
#undef TARGET_LIBC_HAS_FUNCTION
|
||||
#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -83,6 +83,11 @@ ifeq ($(BR2_sparc),y)
|
||||
HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts
|
||||
endif
|
||||
|
||||
# Pthreads are required to build libcilkrts
|
||||
ifeq ($(BR2_PTHREADS_NONE),y)
|
||||
HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts
|
||||
endif
|
||||
|
||||
# Disable shared libs like libstdc++ if we do static since it confuses linking
|
||||
# In that case also disable libcilkrts as there is no static version
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
|
||||
@@ -18,6 +18,8 @@ GIFLIB_BINS = \
|
||||
gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \
|
||||
text2gif
|
||||
|
||||
GIFLIB_CONF_ENV = ac_cv_prog_have_xmlto=no
|
||||
|
||||
define GIFLIB_BINS_CLEANUP
|
||||
rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GIFLIB_BINS))
|
||||
endef
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
|
||||
sha256 6e69b0e9c487e5da52a14d4829f0b6a28b2c18a0bb6fb67c0dc8b5b5658bd532 git-2.16.4.tar.xz
|
||||
sha256 dfb71b053cbc38a9c5b08c2fe8b5eae210b4e3b63892426923e10cfd6ba63862 git-2.16.5.tar.xz
|
||||
sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING
|
||||
sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GIT_VERSION = 2.16.4
|
||||
GIT_VERSION = 2.16.5
|
||||
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
||||
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
|
||||
GIT_LICENSE = GPL-2.0, LGPL-2.1+
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_GLIBC
|
||||
bool
|
||||
default y
|
||||
select BR2_PACKAGE_LINUX_HEADERS
|
||||
select BR2_TOOLCHAIN_HAS_SSP
|
||||
|
||||
select BR2_TOOLCHAIN_HAS_SSP if BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
|
||||
help
|
||||
https://www.gnu.org/software/libc/
|
||||
endif
|
||||
|
||||
@@ -19,6 +19,7 @@ GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
GPSD_SCONS_OPTS = \
|
||||
arch=$(ARCH)\
|
||||
manbuild=no \
|
||||
prefix=/usr\
|
||||
sysroot=$(STAGING_DIR)\
|
||||
strip=no\
|
||||
|
||||
@@ -95,8 +95,8 @@ else
|
||||
GVFS_CONF_OPTS += --disable-nfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSOUP),y)
|
||||
GVFS_DEPENDENCIES += libsoup
|
||||
ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy)
|
||||
GVFS_DEPENDENCIES += libsoup libxml2
|
||||
GVFS_CONF_OPTS += --enable-http
|
||||
else
|
||||
GVFS_CONF_OPTS += --disable-http
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24 jasper-version-2.0.13.tar.gz
|
||||
sha256 4ad1bb42aff888c4403d792e6e2c5f1716d6c279fea70b296333c9d577d30b81 LICENSE
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
JASPER_VERSION = version-2.0.13
|
||||
JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION))
|
||||
JASPER_INSTALL_STAGING = YES
|
||||
JASPER_LICENSE = JasPer License Version 2.0
|
||||
JASPER_LICENSE = JasPer-2.0
|
||||
JASPER_LICENSE_FILES = LICENSE
|
||||
JASPER_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
JASPER_CONF_OPTS = \
|
||||
|
||||
@@ -18,7 +18,9 @@ endif
|
||||
|
||||
LCDPROC_DEPENDENCIES = freetype ncurses zlib
|
||||
|
||||
LCDPROC_CONF_ENV += ac_cv_path_FT2_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
|
||||
LCDPROC_CONF_ENV += \
|
||||
ac_cv_mtab_file=/etc/mtab \
|
||||
ac_cv_path_FT2_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
LCDPROC_DEPENDENCIES += libpng
|
||||
|
||||
36
bsp/buildroot/package/leveldb/0003-fix-parallel-build.patch
Normal file
36
bsp/buildroot/package/leveldb/0003-fix-parallel-build.patch
Normal file
@@ -0,0 +1,36 @@
|
||||
From 293e1b08317567b2e479d24530986676ae4d2221 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 8 Oct 2018 23:08:19 +0200
|
||||
Subject: [PATCH] fix parallel build
|
||||
|
||||
Build of leveldb sometimes fails on:
|
||||
Fatal error: can't create out-shared/db/db_bench.o: No such file or directory
|
||||
|
||||
Fix this, by creating $(SHARED_OUTDIR) before building
|
||||
(SHARED_OUTDIR)/db/db_bench.o
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.net/results/945bb8096c1f98f307161a6def5a9f7f25b2454a
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: not upstreamable as upstream switched to cmake]
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index f7cc7d7..edb56a5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $(
|
||||
$(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS)
|
||||
$(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS)
|
||||
|
||||
-$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
|
||||
+$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR) $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
|
||||
$(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS)
|
||||
|
||||
.PHONY: run-shared
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From fa7438a0ff4033e4741c807394a9af6207940d71 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Tue, 5 Sep 2017 18:12:19 +0200
|
||||
Subject: [PATCH] Do something sensible for empty strings to make fuzzers
|
||||
happy.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit fa7438a0ff
|
||||
|
||||
libarchive/archive_read_support_format_xar.c | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
|
||||
index 7a22beb9d8e4..93eeacc5e6eb 100644
|
||||
--- a/libarchive/archive_read_support_format_xar.c
|
||||
+++ b/libarchive/archive_read_support_format_xar.c
|
||||
@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt)
|
||||
uint64_t l;
|
||||
int digit;
|
||||
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
digit = *p - '0';
|
||||
while (digit >= 0 && digit < 10 && char_cnt-- > 0) {
|
||||
@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt)
|
||||
{
|
||||
int64_t l;
|
||||
int digit;
|
||||
-
|
||||
+
|
||||
+ if (char_cnt == 0)
|
||||
+ return (0);
|
||||
+
|
||||
l = 0;
|
||||
while (char_cnt-- > 0) {
|
||||
if (*p >= '0' && *p <= '7')
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001
|
||||
From: John Starks <jostarks@microsoft.com>
|
||||
Date: Wed, 25 Jul 2018 12:16:34 -0700
|
||||
Subject: [PATCH] iso9660: validate directory record length
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit f9569c086ff
|
||||
|
||||
.../archive_read_support_format_iso9660.c | 17 +++++++++++------
|
||||
1 file changed, 11 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
|
||||
index f01d37bf682e..089bb7236cd1 100644
|
||||
--- a/libarchive/archive_read_support_format_iso9660.c
|
||||
+++ b/libarchive/archive_read_support_format_iso9660.c
|
||||
@@ -409,7 +409,8 @@ static int next_entry_seek(struct archive_read *, struct iso9660 *,
|
||||
struct file_info **);
|
||||
static struct file_info *
|
||||
parse_file_info(struct archive_read *a,
|
||||
- struct file_info *parent, const unsigned char *isodirrec);
|
||||
+ struct file_info *parent, const unsigned char *isodirrec,
|
||||
+ size_t reclen);
|
||||
static int parse_rockridge(struct archive_read *a,
|
||||
struct file_info *file, const unsigned char *start,
|
||||
const unsigned char *end);
|
||||
@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent)
|
||||
if (*(p + DR_name_len_offset) == 1
|
||||
&& *(p + DR_name_offset) == '\001')
|
||||
continue;
|
||||
- child = parse_file_info(a, parent, p);
|
||||
+ child = parse_file_info(a, parent, p, b - p);
|
||||
if (child == NULL) {
|
||||
__archive_read_consume(a, skip_size);
|
||||
return (ARCHIVE_FATAL);
|
||||
@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
|
||||
*/
|
||||
seenJoliet = iso9660->seenJoliet;/* Save flag. */
|
||||
iso9660->seenJoliet = 0;
|
||||
- file = parse_file_info(a, NULL, block);
|
||||
+ file = parse_file_info(a, NULL, block, vd->size);
|
||||
if (file == NULL)
|
||||
return (ARCHIVE_FATAL);
|
||||
iso9660->seenJoliet = seenJoliet;
|
||||
@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
|
||||
return (ARCHIVE_FATAL);
|
||||
}
|
||||
iso9660->seenJoliet = 0;
|
||||
- file = parse_file_info(a, NULL, block);
|
||||
+ file = parse_file_info(a, NULL, block, vd->size);
|
||||
if (file == NULL)
|
||||
return (ARCHIVE_FATAL);
|
||||
iso9660->seenJoliet = seenJoliet;
|
||||
@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a)
|
||||
*/
|
||||
static struct file_info *
|
||||
parse_file_info(struct archive_read *a, struct file_info *parent,
|
||||
- const unsigned char *isodirrec)
|
||||
+ const unsigned char *isodirrec, size_t reclen)
|
||||
{
|
||||
struct iso9660 *iso9660;
|
||||
struct file_info *file, *filep;
|
||||
@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
|
||||
|
||||
iso9660 = (struct iso9660 *)(a->format->data);
|
||||
|
||||
- dr_len = (size_t)isodirrec[DR_length_offset];
|
||||
+ if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) {
|
||||
+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
|
||||
+ "Invalid directory record length");
|
||||
+ return (NULL);
|
||||
+ }
|
||||
name_len = (size_t)isodirrec[DR_name_len_offset];
|
||||
location = archive_le32dec(isodirrec + DR_extent_offset);
|
||||
fsize = toi(isodirrec + DR_size_offset, DR_size_size);
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Sat, 9 Sep 2017 17:47:32 +0200
|
||||
Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
|
||||
archives.
|
||||
|
||||
Reported-By: OSS-Fuzz issue 573
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 5562545b5562
|
||||
|
||||
libarchive/archive_read_support_format_rar.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
|
||||
index cbb14c32dc3b..751de6979ba5 100644
|
||||
--- a/libarchive/archive_read_support_format_rar.c
|
||||
+++ b/libarchive/archive_read_support_format_rar.c
|
||||
@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
|
||||
return (ARCHIVE_FATAL);
|
||||
}
|
||||
filename[filename_size++] = '\0';
|
||||
- filename[filename_size++] = '\0';
|
||||
+ /*
|
||||
+ * Do not increment filename_size here as the computations below
|
||||
+ * add the space for the terminating NUL explicitly.
|
||||
+ */
|
||||
+ filename[filename_size] = '\0';
|
||||
|
||||
/* Decoded unicode form is UTF-16BE, so we have to update a string
|
||||
* conversion object for it. */
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
From 2c8c83b9731ff822fad6cc8c670ea5519c366a14 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Sonnenberger <joerg@bec.de>
|
||||
Date: Thu, 19 Jul 2018 21:14:53 +0200
|
||||
Subject: [PATCH] Reject LHA archive entries with negative size.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 2c8c83b9731
|
||||
|
||||
libarchive/archive_read_support_format_lha.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
|
||||
index b8ef4ae10ece..95c99bb1f31e 100644
|
||||
--- a/libarchive/archive_read_support_format_lha.c
|
||||
+++ b/libarchive/archive_read_support_format_lha.c
|
||||
@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_read *a,
|
||||
* Prepare variables used to read a file content.
|
||||
*/
|
||||
lha->entry_bytes_remaining = lha->compsize;
|
||||
+ if (lha->entry_bytes_remaining < 0) {
|
||||
+ archive_set_error(&a->archive,
|
||||
+ ARCHIVE_ERRNO_FILE_FORMAT,
|
||||
+ "Invalid LHa entry size");
|
||||
+ return (ARCHIVE_FATAL);
|
||||
+ }
|
||||
lha->entry_offset = 0;
|
||||
lha->entry_crc_calculated = 0;
|
||||
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# From http://www.libarchive.org/downloads/libarchive-3.3.3.sha512.txt
|
||||
sha512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 libarchive-3.3.3.tar.gz
|
||||
# Locally computed:
|
||||
sha256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce libarchive-3.3.2.tar.gz
|
||||
sha256 ae6f35cc1979beb316e4d6431fc34c6fc59f0dd126b425c8552bb41c86e4825d COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBARCHIVE_VERSION = 3.3.2
|
||||
LIBARCHIVE_VERSION = 3.3.3
|
||||
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
|
||||
LIBARCHIVE_INSTALL_STAGING = YES
|
||||
LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://curl.haxx.se/download/curl-7.61.1.tar.xz.asc
|
||||
# https://curl.haxx.se/download/curl-7.62.0.tar.xz.asc
|
||||
# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
|
||||
sha256 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891 curl-7.61.1.tar.xz
|
||||
sha256 dab5643a5fe775ae92570b9f3df6b0ef4bc2a827a959361fb130c73b721275c1 curl-7.62.0.tar.xz
|
||||
sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCURL_VERSION = 7.61.1
|
||||
LIBCURL_VERSION = 7.62.0
|
||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
|
||||
LIBCURL_SITE = https://curl.haxx.se/download
|
||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||
@@ -75,6 +75,13 @@ else
|
||||
LIBCURL_CONF_OPTS += --without-libssh2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BROTLI),y)
|
||||
LIBCURL_DEPENDENCIES += brotli
|
||||
LIBCURL_CONF_OPTS += --with-brotli
|
||||
else
|
||||
LIBCURL_CONF_OPTS += --without-brotli
|
||||
endif
|
||||
|
||||
define LIBCURL_FIX_DOT_PC
|
||||
printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in
|
||||
endef
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From bffafc1c3003c2ee05d28eaa345e5854bc36014d Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 1 Oct 2018 14:16:14 +0200
|
||||
Subject: [PATCH] avoid truncation when logging message that includes target
|
||||
name
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/sahlberg/libiscsi/commit/bffafc1c3003c2ee05d28eaa345e5854bc36014d]
|
||||
---
|
||||
lib/logging.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/logging.c b/lib/logging.c
|
||||
index be518fc5..61c74407 100644
|
||||
--- a/lib/logging.c
|
||||
+++ b/lib/logging.c
|
||||
@@ -73,9 +73,9 @@ iscsi_log_message(struct iscsi_context *iscsi, int level, const char *format, ..
|
||||
}
|
||||
|
||||
if (iscsi->target_name[0]) {
|
||||
- static char message2[1024];
|
||||
+ static char message2[1282];
|
||||
|
||||
- snprintf(message2, 1024, "%s [%s]", message, iscsi->target_name);
|
||||
+ snprintf(message2, 1282, "%s [%s]", message, iscsi->target_name);
|
||||
iscsi->log_fn(level, message2);
|
||||
}
|
||||
else
|
||||
24
bsp/buildroot/package/libiscsi/0003-avoid-fallthrough.patch
Normal file
24
bsp/buildroot/package/libiscsi/0003-avoid-fallthrough.patch
Normal file
@@ -0,0 +1,24 @@
|
||||
From 679d0abe7c142df178a907397551c4d9695cc667 Mon Sep 17 00:00:00 2001
|
||||
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||
Date: Mon, 1 Oct 2018 14:14:24 +0200
|
||||
Subject: [PATCH] avoid fallthrough
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/sahlberg/libiscsi/commit/679d0abe7c142df178a907397551c4d9695cc667]
|
||||
---
|
||||
lib/scsi-lowlevel.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
|
||||
index 5ddd709c..747ce0c4 100644
|
||||
--- a/lib/scsi-lowlevel.c
|
||||
+++ b/lib/scsi-lowlevel.c
|
||||
@@ -1086,6 +1086,7 @@ scsi_maintenancein_datain_getfullsize(struct scsi_task *task)
|
||||
(task_get_uint8(task, 1) & 0x80) ? 12 : 0 +
|
||||
task_get_uint16(task, 2);
|
||||
}
|
||||
+ return -1;
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
@@ -1,2 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 464d104e12533dc11f0dd7662cbc2f01c132f94aa4f5bd519e3413ef485830e8 libiscsi-1.18.0.tar.gz
|
||||
sha256 88e3eccc48722b2a0eaff456dda94b8e8e123848d01f631969bec8e3c6c6eb85 COPYING
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENCE-GPL-2.txt
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt
|
||||
|
||||
@@ -11,6 +11,10 @@ LIBKCAPI_AUTORECONF = YES
|
||||
LIBKCAPI_INSTALL_STAGING = YES
|
||||
LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs)
|
||||
LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd
|
||||
LIBKCAPI_CONF_ENV = \
|
||||
ac_cv_path_DB2PDF="" \
|
||||
ac_cv_path_DB2PS="" \
|
||||
ac_cv_path_XMLTO=""
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y)
|
||||
LIBKCAPI_CONF_OPTS += \
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 9df082012cba1dc32d83e5e8b0bdc0892f250058 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Mon, 5 Nov 2018 00:43:07 +0100
|
||||
Subject: [PATCH] Fix include sys/time.h
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
POSIX says `struct timeval` is defined if <sys/time.h> is included.
|
||||
|
||||
Instead of the mess that is currently done based on the system on which
|
||||
the stuff is being compiled, include it unconditionally.
|
||||
|
||||
Reported upstream:
|
||||
https://github.com/sahlberg/libnfs/issues/272
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
include/nfsc/libnfs.h | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/include/nfsc/libnfs.h b/include/nfsc/libnfs.h
|
||||
index 09dcf1c..b6db58c 100755
|
||||
--- a/include/nfsc/libnfs.h
|
||||
+++ b/include/nfsc/libnfs.h
|
||||
@@ -24,12 +24,7 @@
|
||||
#define _LIBNFS_H_
|
||||
|
||||
#include <stdint.h>
|
||||
-#if defined(__ANDROID__) || defined(AROS) \
|
||||
- || ( defined(__APPLE__) && defined(__MACH__) )
|
||||
#include <sys/time.h>
|
||||
-#else
|
||||
-#include <time.h>
|
||||
-#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -2,14 +2,16 @@ Add Nios-II support
|
||||
|
||||
[Gustavo: update for nspr 4.10.9]
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
|
||||
[Fabrice: update for nspr 4.20]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.cfg
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.cfg
|
||||
+++ b/nspr/pr/include/md/_linux.cfg
|
||||
@@ -1017,6 +1017,51 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 2
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
@@ -1112,6 +1112,51 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 3
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
+#elif defined(__nios2__)
|
||||
+
|
||||
@@ -64,9 +66,9 @@ Index: b/nspr/pr/include/md/_linux.h
|
||||
--- a/nspr/pr/include/md/_linux.h
|
||||
+++ b/nspr/pr/include/md/_linux.h
|
||||
@@ -57,6 +57,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "m32r"
|
||||
#elif defined(__or1k__)
|
||||
#define _PR_SI_ARCHITECTURE "or1k"
|
||||
#define _PR_SI_ARCHITECTURE "riscv32"
|
||||
#elif defined(__riscv) && (__riscv_xlen == 64)
|
||||
#define _PR_SI_ARCHITECTURE "riscv64"
|
||||
+#elif defined(__nios2__)
|
||||
+#define _PR_SI_ARCHITECTURE "nios2"
|
||||
#else
|
||||
|
||||
@@ -2,12 +2,14 @@ Add Microblaze support
|
||||
|
||||
[Gustavo: update for nspr 4.10.9]
|
||||
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
|
||||
[Fabrice: update for nspr 4.20]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
Index: b/nspr/pr/include/md/_linux.cfg
|
||||
===================================================================
|
||||
--- a/nspr/pr/include/md/_linux.cfg
|
||||
+++ b/nspr/pr/include/md/_linux.cfg
|
||||
@@ -1062,6 +1062,56 @@
|
||||
@@ -1157,6 +1157,56 @@
|
||||
#define PR_BYTES_PER_WORD_LOG2 2
|
||||
#define PR_BYTES_PER_DWORD_LOG2 3
|
||||
|
||||
@@ -69,9 +71,9 @@ Index: b/nspr/pr/include/md/_linux.h
|
||||
--- a/nspr/pr/include/md/_linux.h
|
||||
+++ b/nspr/pr/include/md/_linux.h
|
||||
@@ -57,6 +57,8 @@
|
||||
#define _PR_SI_ARCHITECTURE "m32r"
|
||||
#elif defined(__or1k__)
|
||||
#define _PR_SI_ARCHITECTURE "or1k"
|
||||
#define _PR_SI_ARCHITECTURE "riscv32"
|
||||
#elif defined(__riscv) && (__riscv_xlen == 64)
|
||||
#define _PR_SI_ARCHITECTURE "riscv64"
|
||||
+#elif defined(__microblaze__)
|
||||
+#define _PR_SI_ARCHITECTURE "microblaze"
|
||||
#elif defined(__nios2__)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.mozilla.org/pub/nspr/releases/v4.17/src/SHA256SUMS
|
||||
sha256 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095 nspr-4.17.tar.gz
|
||||
# From https://ftp.mozilla.org/pub/nspr/releases/v4.20/src/SHA256SUMS
|
||||
sha256 2c8964913da89ffbaf464d49ce44d79e8804e1794ef9a8c52a7bff7224d1556e nspr-4.20.tar.gz
|
||||
# Locally calculated
|
||||
sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 nspr/LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNSPR_VERSION = 4.17
|
||||
LIBNSPR_VERSION = 4.20
|
||||
LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz
|
||||
LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src
|
||||
LIBNSPR_SUBDIR = nspr
|
||||
|
||||
22
bsp/buildroot/package/libnss/0001-fix-uclibc-build.patch
Normal file
22
bsp/buildroot/package/libnss/0001-fix-uclibc-build.patch
Normal file
@@ -0,0 +1,22 @@
|
||||
Fix build with uClibc-ng
|
||||
|
||||
The elf.h header in uClibc-ng is missing the AT_HWCAP2 definition. Add it in
|
||||
the code.
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: Not upstreamable; uClibc needs to update elf.h
|
||||
|
||||
diff -Nuar nss-3.38.orig/nss/lib/freebl/blinit.c nss-3.38/nss/lib/freebl/blinit.c
|
||||
--- nss-3.38.orig/nss/lib/freebl/blinit.c 2018-06-21 12:24:45.000000000 +0300
|
||||
+++ nss-3.38/nss/lib/freebl/blinit.c 2018-06-26 13:13:55.636434720 +0300
|
||||
@@ -100,6 +100,9 @@
|
||||
defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
|
||||
#include <sys/auxv.h>
|
||||
extern unsigned long getauxval(unsigned long type) __attribute__((weak));
|
||||
+#ifndef AT_HWCAP2
|
||||
+#define AT_HWCAP2 26
|
||||
+#endif
|
||||
#else
|
||||
static unsigned long (*getauxval)(unsigned long) = NULL;
|
||||
#define AT_HWCAP2 0
|
||||
@@ -1,20 +0,0 @@
|
||||
uCLibc does not define RTLD_NOLOAD.
|
||||
|
||||
[Gustavo: update for nss 3.16.1]
|
||||
Signed-off-by: Will Newton <will.newton@imgtec.com>
|
||||
|
||||
diff -Nura nss-3.16.1.orig/nss/lib/freebl/stubs.c nss-3.16.1/nss/lib/freebl/stubs.c
|
||||
--- nss-3.16.1.orig/nss/lib/freebl/stubs.c 2014-06-18 10:34:30.529997002 -0300
|
||||
+++ nss-3.16.1/nss/lib/freebl/stubs.c 2014-06-18 10:36:25.508882650 -0300
|
||||
@@ -594,6 +594,11 @@
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
+/* uClibc does not define RTLD_NOLOAD. */
|
||||
+#ifndef RTLD_NOLOAD
|
||||
+#define RTLD_NOLOAD 0
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* fetch the library if it's loaded. For NSS it should already be loaded
|
||||
*/
|
||||
@@ -1,33 +0,0 @@
|
||||
From f0ce70989526fc9a0223398c99ea0d09777ea5df Mon Sep 17 00:00:00 2001
|
||||
From: Martin Thomson <martin.thomson@gmail.com>
|
||||
Date: Thu, 15 Feb 2018 16:34:02 +1100
|
||||
Subject: [PATCH] Bug 1438426 - Avoid stringop-truncation warning, r=franziskus
|
||||
|
||||
--HG--
|
||||
extra : rebase_source : 4ea1630d0da0ce3523309e3da33ee50961682242
|
||||
|
||||
Upstream-commit: https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df
|
||||
[Thomas: edited after git format-patch to add the nss/ prefix needed
|
||||
for the patch to apply properly on the source code extracted by the
|
||||
tarball.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
nss/coreconf/nsinstall/pathsub.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nss/coreconf/nsinstall/pathsub.c b/nss/coreconf/nsinstall/pathsub.c
|
||||
index a42a9f30a..c31a946f0 100644
|
||||
--- a/nss/coreconf/nsinstall/pathsub.c
|
||||
+++ b/nss/coreconf/nsinstall/pathsub.c
|
||||
@@ -212,7 +212,7 @@ reversepath(char *inpath, char *name, int len, char *outpath)
|
||||
xchdir("..");
|
||||
} else {
|
||||
cp -= 3;
|
||||
- strncpy(cp, "../", 3);
|
||||
+ memcpy(cp, "../", 3);
|
||||
xchdir(buf);
|
||||
}
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_33_RTM/src/SHA256SUMS
|
||||
sha256 98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4 nss-3.33.tar.gz
|
||||
# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_39_RTM/src/SHA256SUMS
|
||||
sha256 6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b nss-3.39.tar.gz
|
||||
# Locally calculated
|
||||
sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBNSS_VERSION = 3.33
|
||||
LIBNSS_VERSION = 3.39
|
||||
LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
|
||||
LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
|
||||
LIBNSS_DISTDIR = dist
|
||||
@@ -23,6 +23,12 @@ endef
|
||||
LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_DROP_GC_SECTIONS
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_aarch64_be),y)
|
||||
LIBNSS_ARCH = aarch64
|
||||
else
|
||||
LIBNSS_ARCH = $(ARCH)
|
||||
endif
|
||||
|
||||
LIBNSS_BUILD_VARS = \
|
||||
MOZILLA_CLIENT=1 \
|
||||
NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
|
||||
@@ -35,7 +41,7 @@ LIBNSS_BUILD_VARS = \
|
||||
NATIVE_CC="$(HOSTCC)" \
|
||||
OS_ARCH="Linux" \
|
||||
OS_RELEASE="2.6" \
|
||||
OS_TEST="$(ARCH)"
|
||||
OS_TEST="$(LIBNSS_ARCH)"
|
||||
|
||||
# #pragma usage needs gcc >= 4.8
|
||||
# See https://bugzilla.mozilla.org/show_bug.cgi?id=1226179
|
||||
|
||||
@@ -31,7 +31,8 @@ HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libseli
|
||||
HOST_LIBSEMANAGE_MAKE_OPTS += \
|
||||
$(HOST_CONFIGURE_OPTS) \
|
||||
PREFIX=$(HOST_DIR) \
|
||||
SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/"
|
||||
SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/" \
|
||||
DEFAULT_SEMANAGE_CONF_LOCATION=$(HOST_DIR)/etc/selinux/semanage.conf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PYTHON3),y)
|
||||
HOST_LIBSEMANAGE_DEPENDENCIES += host-python3
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# from https://red.libssh.org/projects/libssh/files/
|
||||
md5 d3fc864208bf607ad87cdee836894feb libssh-0.7.5.tar.xz
|
||||
# Locally calculated after checking signature on uncompressed libssh-0.7.5.tar
|
||||
# https://red.libssh.org/attachments/download/217/libssh-0.7.5.tar.asc
|
||||
sha256 54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095 libssh-0.7.5.tar.xz
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://www.libssh.org/files/0.8/libssh-0.8.4.tar.xz.asc
|
||||
# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
|
||||
sha256 6bb07713021a8586ba2120b2c36c468dc9ac8096d043f9b1726639aa4275b81b libssh-0.8.4.tar.xz
|
||||
sha256 468cf08f784ef6fd3b3705b60dd8111e2b70fbb8f6549cd503665a6bbb3bc625 COPYING
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH_VERSION_MAJOR = 0.7
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5
|
||||
LIBSSH_VERSION_MAJOR = 0.8
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
|
||||
LIBSSH_LICENSE = LGPL-2.1
|
||||
@@ -17,6 +17,9 @@ LIBSSH_CONF_OPTS = \
|
||||
-DWITH_SERVER=OFF \
|
||||
-DWITH_EXAMPLES=OFF
|
||||
|
||||
# cmake older than 3.10 require this to avoid try_run() in FindThreads
|
||||
LIBSSH_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON
|
||||
LIBSSH_DEPENDENCIES += zlib
|
||||
|
||||
@@ -4,4 +4,4 @@ config BR2_PACKAGE_LIBURIPARSER
|
||||
uriparser is a strictly RFC 3986 compliant URI parsing and
|
||||
handling library written in C.
|
||||
|
||||
http://uriparser.sourceforge.net
|
||||
https://uriparser.github.io
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.4/
|
||||
md5 9aabdc3611546f553f4af372167de6d6 uriparser-0.8.4.tar.bz2
|
||||
sha1 7a1948c20bed54b04dad0e1d7d2fa8f80fc7b2b3 uriparser-0.8.4.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 c6ef125800c2ef13a41a22126bfc77e8b8c08993a6b96196117695988ea76249 COPYING
|
||||
sha256 ec67eb34feda8eac166f281799f03ed48387694fca44f6f5852f61f8fb535e2c uriparser-0.9.0.tar.bz2
|
||||
sha256 ee90029e62d11f48faa59360d15c3ad8e7c094c74cc25b055716d92340da561f COPYING
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBURIPARSER_VERSION = 0.8.4
|
||||
LIBURIPARSER_VERSION = 0.9.0
|
||||
LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
|
||||
LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION)
|
||||
LIBURIPARSER_SITE = https://github.com/uriparser/uriparser/releases/download/uriparser-$(LIBURIPARSER_VERSION)
|
||||
LIBURIPARSER_LICENSE = BSD-3-Clause
|
||||
LIBURIPARSER_LICENSE_FILES = COPYING
|
||||
LIBURIPARSER_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://www.lighttpd.net/
|
||||
sha256 0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36 lighttpd-1.4.48.tar.xz
|
||||
# From https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.51.sha256sum
|
||||
sha256 2af9fdb265d1f025bfa634e13770239712ecbd585e4975b8226edf1df74e9c82 lighttpd-1.4.51.tar.xz
|
||||
# Locally calculated
|
||||
sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13 COPYING
|
||||
|
||||
@@ -5,13 +5,15 @@
|
||||
################################################################################
|
||||
|
||||
LIGHTTPD_VERSION_MAJOR = 1.4
|
||||
LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).48
|
||||
LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).51
|
||||
LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
|
||||
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
|
||||
LIGHTTPD_LICENSE = BSD-3-Clause
|
||||
LIGHTTPD_LICENSE_FILES = COPYING
|
||||
LIGHTTPD_DEPENDENCIES = host-pkgconf
|
||||
LIGHTTPD_CONF_OPTS = \
|
||||
--without-pam \
|
||||
--without-wolfssl \
|
||||
--libdir=/usr/lib/lighttpd \
|
||||
--libexecdir=/usr/lib
|
||||
|
||||
|
||||
@@ -250,12 +250,12 @@ config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.102" if BR2_KERNEL_HEADERS_3_2
|
||||
default "4.1.52" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.4.158" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.129" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.4.164" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.140" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.10.17" if BR2_KERNEL_HEADERS_4_10
|
||||
default "4.11.12" if BR2_KERNEL_HEADERS_4_11
|
||||
default "4.12.14" if BR2_KERNEL_HEADERS_4_12
|
||||
default "4.13.16" if BR2_KERNEL_HEADERS_4_13
|
||||
default "4.14.72" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.14.83" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.15.18" if BR2_KERNEL_HEADERS_4_15
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
From: Benjamin Drung <bdrung@debian.org>
|
||||
Date: Sat, 16 Sep 2017 11:22:03 +0200
|
||||
Subject: Add a pkg-config file for the shared libraries
|
||||
|
||||
This patch was downloaded from Debian
|
||||
https://sources.debian.org/src/liblivemedia/2018.08.05-1/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch/
|
||||
|
||||
The local/ part of PREXIX and LIBDIR was removed to fit into buildroot.
|
||||
|
||||
A similar version of this patch is part of the vlc source repo:
|
||||
http://git.videolan.org/?p=vlc.git;a=blob;f=contrib/src/live555/add-pkgconfig-file.patch;hb=HEAD
|
||||
|
||||
Upstream status: Rejected
|
||||
http://lists.live555.com/pipermail/live-devel/2013-January/016374.html
|
||||
http://lists.live555.com/pipermail/live-devel/2013-January/016375.html
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
Makefile.head | 3 +++
|
||||
Makefile.tail | 7 ++++++-
|
||||
live555.pc.in | 9 +++++++++
|
||||
3 files changed, 18 insertions(+), 1 deletion(-)
|
||||
create mode 100644 live555.pc.in
|
||||
|
||||
diff --git a/Makefile.head b/Makefile.head
|
||||
index 458c54c..1571037 100644
|
||||
--- a/Makefile.head
|
||||
+++ b/Makefile.head
|
||||
@@ -1 +1,4 @@
|
||||
+PREFIX = /usr
|
||||
+LIBDIR = /usr/lib
|
||||
+VERSION = $(shell grep LIVEMEDIA_LIBRARY_VERSION_STRING liveMedia/include/liveMedia_version.hh | sed 's/.*"\([^"]*\)".*/\1/')
|
||||
##### Change the following for your environment:
|
||||
diff --git a/Makefile.tail b/Makefile.tail
|
||||
index fc594ea..a20a527 100644
|
||||
--- a/Makefile.tail
|
||||
+++ b/Makefile.tail
|
||||
@@ -22,7 +22,12 @@ all:
|
||||
@echo
|
||||
@echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
|
||||
|
||||
-install:
|
||||
+install_shared_libraries:
|
||||
+ install -d $(DESTDIR)$(LIBDIR)/pkgconfig
|
||||
+ sed "s#@PREFIX@#$(PREFIX)#;s#@LIBDIR@#$(LIBDIR)#;s#@VERSION@#$(VERSION)#" live555.pc.in > $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
|
||||
+ chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
|
||||
+
|
||||
+install: $(INSTALL2)
|
||||
cd $(LIVEMEDIA_DIR) ; $(MAKE) install
|
||||
cd $(GROUPSOCK_DIR) ; $(MAKE) install
|
||||
cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
|
||||
diff --git a/live555.pc.in b/live555.pc.in
|
||||
new file mode 100644
|
||||
index 0000000..3736944
|
||||
--- /dev/null
|
||||
+++ b/live555.pc.in
|
||||
@@ -0,0 +1,9 @@
|
||||
+prefix=@PREFIX@
|
||||
+libdir=@LIBDIR@
|
||||
+includedir=${prefix}/include
|
||||
+
|
||||
+Name: live555
|
||||
+Description: multimedia RTSP streaming library
|
||||
+Version: @VERSION@
|
||||
+Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment
|
||||
+Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://live555.com/liveMedia/public/live555-latest-md5.txt
|
||||
md5 a5acd14c4fa7b50f7270304d3b4a70ae live.2017.10.28.tar.gz
|
||||
md5 3383dea853735b7a73eda6ddb52b6372 live.2018.10.17.tar.gz
|
||||
# Locally generated
|
||||
sha256 d8eaec9ded34321aa655d3c9007217dd447218c54cb48c97827e58ecd5edb338 live.2017.10.28.tar.gz
|
||||
sha256 7c68d9c95b39acd309a2b6a4fc14c3837544a9be3f64062ed38d1ad6f68dc9e8 live.2018.10.17.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIVE555_VERSION = 2017.10.28
|
||||
LIVE555_VERSION = 2018.10.17
|
||||
LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
|
||||
LIVE555_SITE = http://www.live555.com/liveMedia/public
|
||||
LIVE555_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LJLINENOISE
|
||||
ljlinenoise is a pure LuaJIT port of linenoise,
|
||||
a small alternative to readline and libedit.
|
||||
|
||||
http://fperrad.github.io/ljlinenoise/
|
||||
https://fperrad.frama.io/ljlinenoise/
|
||||
|
||||
comment "ljlinenoise needs LuaJIT"
|
||||
depends on !BR2_PACKAGE_LUAJIT
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
From 4e3764ecf2b2c3f62475579fee6af4a753729f07 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Thu, 1 Nov 2018 19:12:20 +0200
|
||||
Subject: [PATCH] Fix build with curl 7.62.0
|
||||
|
||||
Fixes #134.
|
||||
|
||||
curl 7.62.0 deprecates the CURLE_SSL_CACERT error code, and unifies it
|
||||
with CURLE_PEER_FAILED_VERIFICATION. Adjust the errors list to match.
|
||||
|
||||
This fixes the following build failure:
|
||||
|
||||
src/lcerr_easy.h: In function 'lcurl_err_easy_mnemo':
|
||||
src/lcerror.c:32:22: error: duplicate case value
|
||||
#define ERR_ENTRY(E) case CURLE_##E: return #E;
|
||||
^
|
||||
src/lcerr_easy.h:74:1: note: in expansion of macro 'ERR_ENTRY'
|
||||
ERR_ENTRY ( SSL_CACERT )
|
||||
^~~~~~~~~
|
||||
src/lcerror.c:32:22: note: previously used here
|
||||
#define ERR_ENTRY(E) case CURLE_##E: return #E;
|
||||
^
|
||||
src/lcerr_easy.h:65:1: note: in expansion of macro 'ERR_ENTRY'
|
||||
ERR_ENTRY ( PEER_FAILED_VERIFICATION )
|
||||
^~~~~~~~~
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: https://github.com/Lua-cURL/Lua-cURLv3/pull/136
|
||||
|
||||
diff --git a/src/lcerr_easy.h b/src/lcerr_easy.h
|
||||
index 94ad143c3bfe..895c6d87d72f 100644
|
||||
--- a/Lua-cURLv3-0.3.7/src/lcerr_easy.h
|
||||
+++ b/Lua-cURLv3-0.3.7/src/lcerr_easy.h
|
||||
@@ -62,7 +62,11 @@ ERR_ENTRY ( UNKNOWN_TELNET_OPTION ) /* User specified an unknown option */
|
||||
#endif
|
||||
ERR_ENTRY ( TELNET_OPTION_SYNTAX )
|
||||
ERR_ENTRY ( OBSOLETE50 )
|
||||
+#if LCURL_CURL_VER_GE(7,62,0)
|
||||
+ERR_ENTRY ( OBSOLETE51 )
|
||||
+#else
|
||||
ERR_ENTRY ( PEER_FAILED_VERIFICATION )
|
||||
+#endif
|
||||
ERR_ENTRY ( GOT_NOTHING )
|
||||
ERR_ENTRY ( SSL_ENGINE_NOTFOUND )
|
||||
ERR_ENTRY ( SSL_ENGINE_SETFAILED )
|
||||
@@ -71,7 +75,11 @@ ERR_ENTRY ( RECV_ERROR )
|
||||
ERR_ENTRY ( OBSOLETE57 )
|
||||
ERR_ENTRY ( SSL_CERTPROBLEM )
|
||||
ERR_ENTRY ( SSL_CIPHER )
|
||||
+#if LCURL_CURL_VER_GE(7,62,0)
|
||||
+ERR_ENTRY ( PEER_FAILED_VERIFICATION )
|
||||
+#else
|
||||
ERR_ENTRY ( SSL_CACERT )
|
||||
+#endif
|
||||
ERR_ENTRY ( BAD_CONTENT_ENCODING )
|
||||
ERR_ENTRY ( LDAP_INVALID_URL )
|
||||
ERR_ENTRY ( FILESIZE_EXCEEDED )
|
||||
@@ -1,9 +1,9 @@
|
||||
# From https://downloads.mariadb.org/mariadb/10.1.35/
|
||||
md5 935f401314ff08a4177beb70fed6055c mariadb-10.1.35.tar.gz
|
||||
sha1 d322f0da17f4de475832dd534657eba5a936f77b mariadb-10.1.35.tar.gz
|
||||
sha256 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d mariadb-10.1.35.tar.gz
|
||||
sha512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa mariadb-10.1.35.tar.gz
|
||||
# From https://downloads.mariadb.org/mariadb/10.1.37/
|
||||
md5 123b37bec63ddca19260e45f0f2276bb mariadb-10.1.37.tar.gz
|
||||
sha1 35e9c15b5532c2e7c746b1e7452952053d7d5b5a mariadb-10.1.37.tar.gz
|
||||
sha256 8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46 mariadb-10.1.37.tar.gz
|
||||
sha512 b7c35cd67ad265ce2e3a4db20a2ae2b78745db96dc70a211f027a39b6dbb3dc900991c2ee1021ee6a97d12489c3e2a70252e2adf348a458af38b99c3de5a4f25 mariadb-10.1.37.tar.gz
|
||||
|
||||
# Hash for license files
|
||||
sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README
|
||||
sha256 d89f09a82da1666d389916bba8c21278d3ef5ac43c2139587234576a128428d4 README
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MARIADB_VERSION = 10.1.35
|
||||
MARIADB_VERSION = 10.1.37
|
||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
|
||||
# Tarball no longer contains LGPL license text
|
||||
@@ -48,8 +48,12 @@ MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1
|
||||
MARIADB_CONF_OPTS += -DENABLE_DTRACE=0
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y)
|
||||
ifeq ($(BR2_PACKAGE_MARIADB_SERVER_EMBEDDED),y)
|
||||
MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON
|
||||
else
|
||||
MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=OFF
|
||||
endif
|
||||
else
|
||||
MARIADB_CONF_OPTS += -DWITHOUT_SERVER=ON
|
||||
endif
|
||||
|
||||
@@ -108,8 +112,6 @@ endif
|
||||
# We also don't need the test suite on the target
|
||||
define MARIADB_POST_INSTALL
|
||||
mkdir -p $(TARGET_DIR)/var/lib/mysql
|
||||
$(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \
|
||||
$(TARGET_DIR)/etc/mysql/my.cnf
|
||||
$(RM) $(TARGET_DIR)/usr/bin/mysql_config
|
||||
$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
|
||||
endef
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
From 1c90a7534658056b884d71ef82dc7ca8bad4271b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
|
||||
Date: Wed, 24 Oct 2018 13:00:47 +0200
|
||||
Subject: [PATCH 1/1] mmc-utils: fix overlapping with strncpy
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC 8.2 warns about an overlapping using strncpy.
|
||||
|
||||
Replace strncpy with a memmove to avoid this issue.
|
||||
|
||||
In file included from /usr/include/string.h:494,
|
||||
from lsmmc.c:46:
|
||||
In function ‘strncpy’,
|
||||
inlined from ‘read_file’ at lsmmc.c:356:3:
|
||||
/usr/include/x86_64-linux-gnu/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ accessing 4096 bytes at offsets 0 and 1 overlaps 4095 bytes at offset 1 [-Werror=restrict]
|
||||
return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
|
||||
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
cc1: all warnings being treated as errors
|
||||
make: *** [Makefile:36: lsmmc.o] Error 1
|
||||
|
||||
Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
||||
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
|
||||
---
|
||||
lsmmc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lsmmc.c b/lsmmc.c
|
||||
index c4faa00..bcb854d 100644
|
||||
--- a/lsmmc.c
|
||||
+++ b/lsmmc.c
|
||||
@@ -353,7 +353,7 @@ char *read_file(char *name)
|
||||
line[strlen(line) - 1] = '\0';
|
||||
|
||||
while (isspace(line[0]))
|
||||
- strncpy(&line[0], &line[1], sizeof(line));
|
||||
+ memmove(&line[0], &line[1], sizeof(line)-1);
|
||||
|
||||
return strdup(line);
|
||||
}
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 9e93f71556f8d5ba62fccec46ee5689e385d6d37 Mon Sep 17 00:00:00 2001
|
||||
From: Deomid Ryabkov <rojer@cesanta.com>
|
||||
Date: Mon, 13 Aug 2018 15:50:01 +0300
|
||||
Subject: [PATCH] Fix body length calculation in mg_handle_cgi
|
||||
|
||||
Fixes https://nvd.nist.gov/vuln/detail/CVE-2018-10945
|
||||
|
||||
CL: mg: Fix body length calculation in mg_handle_cgi
|
||||
|
||||
PUBLISHED_FROM=0c30cf36fdb67c75f6148468701e23d6ee72d953
|
||||
|
||||
[Thomas: backported from upstream commit
|
||||
f33d3a4e0225d6e009b90193402141025e9ea74d, dropping the changes in
|
||||
src/mg_http_cgi.c, because back in 6.7, the initial mongoose sources
|
||||
were not in the tree, only the amalgamated version.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
mongoose.c | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/mongoose.c b/mongoose.c
|
||||
index 7e55896..f5b0177 100644
|
||||
--- a/mongoose.c
|
||||
+++ b/mongoose.c
|
||||
@@ -8308,7 +8308,6 @@ MG_INTERNAL void mg_handle_cgi(struct mg_connection *nc, const char *prog,
|
||||
|
||||
if (mg_start_process(opts->cgi_interpreter, prog, blk.buf, blk.vars, dir,
|
||||
fds[1]) != 0) {
|
||||
- size_t n = nc->recv_mbuf.len - (hm->message.len - hm->body.len);
|
||||
struct mg_connection *cgi_nc =
|
||||
mg_add_sock(nc->mgr, fds[0], mg_cgi_ev_handler);
|
||||
struct mg_http_proto_data *cgi_pd = mg_http_get_proto_data(cgi_nc);
|
||||
@@ -8316,8 +8315,8 @@ MG_INTERNAL void mg_handle_cgi(struct mg_connection *nc, const char *prog,
|
||||
cgi_pd->cgi.cgi_nc->user_data = nc;
|
||||
nc->flags |= MG_F_USER_1;
|
||||
/* Push POST data to the CGI */
|
||||
- if (n > 0 && n < nc->recv_mbuf.len) {
|
||||
- mg_send(cgi_pd->cgi.cgi_nc, hm->body.p, n);
|
||||
+ if (hm->body.len > 0) {
|
||||
+ mg_send(cgi_pd->cgi.cgi_nc, hm->body.p, hm->body.len);
|
||||
}
|
||||
mbuf_remove(&nc->recv_mbuf, nc->recv_mbuf.len);
|
||||
} else {
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From 4822aa97da80a86033ec6e4a8b2f4ad0911235cf Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Sat, 3 Mar 2018 11:04:47 +0100
|
||||
Subject: [PATCH] websockets.c: unbreak build without TLS
|
||||
|
||||
Commit 7943072b1f3b (Fix use_identity_as_username not working on websockets
|
||||
clients) added code which unconditionally accesses mosq-ssl, breaking the
|
||||
build when TLS support is disabled.
|
||||
|
||||
Fix it by guarding this logic inside #ifdef WITH_TLS.
|
||||
|
||||
[Upstream: https://dev.eclipse.org/mhonarc/lists/mosquitto-dev/msg01813.html]
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/websockets.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/websockets.c b/src/websockets.c
|
||||
index d4d7961..a796f0a 100644
|
||||
--- a/src/websockets.c
|
||||
+++ b/src/websockets.c
|
||||
@@ -201,12 +201,14 @@ static int callback_mqtt(struct libwebsocket_context *context,
|
||||
mosq->ws_context = context;
|
||||
#endif
|
||||
mosq->wsi = wsi;
|
||||
+#ifdef WITH_TLS
|
||||
if(in){
|
||||
mosq->ssl = (SSL *)in;
|
||||
if(!mosq->listener->ssl_ctx){
|
||||
mosq->listener->ssl_ctx = SSL_get_SSL_CTX(mosq->ssl);
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
u->mosq = mosq;
|
||||
}else{
|
||||
return -1;
|
||||
@@ -240,7 +242,9 @@ static int callback_mqtt(struct libwebsocket_context *context,
|
||||
mosq->pollfd_index = -1;
|
||||
}
|
||||
mosq->wsi = NULL;
|
||||
+#ifdef WITH_TLS
|
||||
mosq->ssl = NULL;
|
||||
+#endif
|
||||
do_disconnect(db, mosq);
|
||||
}
|
||||
break;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking gpg signature
|
||||
sha256 7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83 mosquitto-1.4.15.tar.gz
|
||||
sha256 5fd7f3454fd6d286645d032bc07f44a1c8583cec02ef2422c9eb32e0a89a9b2f mosquitto-1.5.4.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MOSQUITTO_VERSION = 1.4.15
|
||||
MOSQUITTO_VERSION = 1.5.4
|
||||
MOSQUITTO_SITE = https://mosquitto.org/files/source
|
||||
MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
|
||||
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
|
||||
@@ -17,6 +17,13 @@ MOSQUITTO_MAKE_OPTS = \
|
||||
WITH_WRAP=no \
|
||||
WITH_DOCS=no
|
||||
|
||||
# uses malloc_usable_size which was only added in uClibc-ng 1.0.29
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
MOSQUITTO_MAKE_OPTS += WITH_MEMORY_TRACKING=no
|
||||
else
|
||||
MOSQUITTO_MAKE_OPTS += WITH_MEMORY_TRACKING=yes
|
||||
endif
|
||||
|
||||
# adns uses getaddrinfo_a
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
|
||||
MOSQUITTO_MAKE_OPTS += WITH_ADNS=yes
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_MUSL
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL
|
||||
select BR2_PACKAGE_LINUX_HEADERS
|
||||
# SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2
|
||||
select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc)
|
||||
select BR2_TOOLCHAIN_HAS_SSP if BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI \
|
||||
&& !(BR2_i386 || BR2_powerpc)
|
||||
# Compatibility headers: cdefs.h, queue.h
|
||||
select BR2_PACKAGE_MUSL_COMPAT_HEADERS
|
||||
|
||||
@@ -54,6 +54,12 @@ config BR2_PACKAGE_MARIADB_SERVER
|
||||
help
|
||||
Install the mariadb server on the target.
|
||||
|
||||
config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED
|
||||
bool "mariadb embedded server"
|
||||
depends on BR2_PACKAGE_MARIADB_SERVER
|
||||
help
|
||||
Install the mariadb embedded server on the target.
|
||||
|
||||
endif
|
||||
|
||||
if BR2_PACKAGE_ORACLE_MYSQL
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 62ae1bf0206960d0ba5ff8f90238030e67f1a5cd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 28 Oct 2018 20:58:55 +0100
|
||||
Subject: [PATCH] fix static linking with libedit or readline
|
||||
|
||||
Use PKG_CHECK_MODULES to find libedit or readline and continue to use
|
||||
AC_SEARCH_LIBS as a fallback
|
||||
|
||||
By using PKG_CHECK_MODULES, static link will work as -lncurses or -lbsd
|
||||
will be automatically added
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/connectivity/neardal/pull/7]
|
||||
---
|
||||
configure.ac | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f0cebed..211b896 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -68,10 +68,16 @@ PKG_CHECK_MODULES(gio, gio-unix-2.0 >= 2.30,
|
||||
AC_SUBST([gio_LIBS]),
|
||||
AC_MSG_ERROR(gio-unix-2.0 >= 2.30 is required))
|
||||
|
||||
-AC_SEARCH_LIBS([rl_initialize], [edit readline],
|
||||
- [AS_IF([echo $LIBS | grep -q "-ledit"],
|
||||
- [CPPFLAGS="-DHAVE_LIBEDIT $CPPFLAGS"])],
|
||||
- [AC_MSG_ERROR(editline or readline is required)])
|
||||
+PKG_CHECK_MODULES(libedit, libedit,
|
||||
+ [CPPFLAGS="-DHAVE_LIBEDIT $libedit_CFLAGS $CPPFLAGS"
|
||||
+ LIBS="$libedit_LIBS $LIBS"],
|
||||
+ [PKG_CHECK_MODULES(readline, readline,
|
||||
+ [CPPFLAGS="$readline_CFLAGS $CPPFLAGS"
|
||||
+ LIBS="$readline_LIBS $LIBS"],
|
||||
+ AC_SEARCH_LIBS([rl_initialize], [edit readline],
|
||||
+ [AS_IF([echo $LIBS | grep -q "-ledit"],
|
||||
+ [CPPFLAGS="-DHAVE_LIBEDIT $CPPFLAGS"])],
|
||||
+ [AC_MSG_ERROR(editline or readline is required)]))])
|
||||
|
||||
AC_PATH_TOOL([DOXYGEN], [doxygen])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test ! -z "$DOXYGEN"])
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -21,13 +21,6 @@ else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
|
||||
NEARDAL_DEPENDENCIES += libedit
|
||||
endif
|
||||
|
||||
# Both readline and libedit link with ncurses but the configure script
|
||||
# forgets to take that into account, causing the detection to fail
|
||||
# when linking statically
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
NEARDAL_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs ncurses`"
|
||||
endif
|
||||
|
||||
define NEARDAL_INSTALL_NCL
|
||||
$(INSTALL) -m 0755 -D $(@D)/ncl/ncl $(TARGET_DIR)/usr/bin/ncl
|
||||
endef
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user