Update Buildroot from 17.02.5 -> 17.02.6
This commit is contained in:
@@ -1,3 +1,32 @@
|
|||||||
|
2017.02.6, Released September 24th, 2017
|
||||||
|
|
||||||
|
Important / security related fixes.
|
||||||
|
|
||||||
|
Cmake: Ensure correct pkg-config is used when building host
|
||||||
|
packages
|
||||||
|
|
||||||
|
fs/iso9660: Ensure files from earlier builds are not included.
|
||||||
|
|
||||||
|
Updated/fixed packages: apache, bcusdk, bind, binutils,
|
||||||
|
bluez5_utils, botan, cmake, connman, dbus, dialog, e2fsprogs,
|
||||||
|
faad2, fakeroot, ffmpeg, file, flashrom, gcc, gd, gdb,
|
||||||
|
gdk-pixbuf, git, gnupg, gpsd, grub2, gst1-plugins-bad,
|
||||||
|
imagemagick, iostat, iucode-tool, jack2, libarchive, libcurl,
|
||||||
|
libgcrypt, libidn, libphidget, librsync, librsvg, libsoup,
|
||||||
|
libxml2, linux-tools, lua, mariadb, mbedtls, mediastreamer,
|
||||||
|
minidlna, netplug, nss-pam-ldapd, nvidia-driver, openjpeg,
|
||||||
|
postgresql, proxychains-ng, python-libconfig,
|
||||||
|
python-service-identity, qt, rpcbind, ruby, samba4, squashfs,
|
||||||
|
squid, strongswan, subversion, supervisor, sysvinit, tcpdump,
|
||||||
|
tor, transmission, unrar, valgrind, vim, webkitgtk, whois,
|
||||||
|
xen, zmqpp
|
||||||
|
|
||||||
|
Issues resolved (http://bugs.buildroot.org):
|
||||||
|
|
||||||
|
#10141: Squashfs extended attribute failures
|
||||||
|
#10261: Grub2 fails to build for x86_64
|
||||||
|
#10276: BR2_PACKAGE_LINUX_TOOLS_GPIO fails for MIPS with...
|
||||||
|
|
||||||
2017.02.5, Released July 27th, 2017
|
2017.02.5, Released July 27th, 2017
|
||||||
|
|
||||||
Important / security related fixes.
|
Important / security related fixes.
|
||||||
|
|||||||
@@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
|
|||||||
all:
|
all:
|
||||||
|
|
||||||
# Set and export the version string
|
# Set and export the version string
|
||||||
export BR2_VERSION := 2017.02.5
|
export BR2_VERSION := 2017.02.6
|
||||||
# Actual time the release is cut (for reproducible builds)
|
# Actual time the release is cut (for reproducible builds)
|
||||||
BR2_VERSION_EPOCH = 1501100000
|
BR2_VERSION_EPOCH = 1506285000
|
||||||
|
|
||||||
# Save running make version since it's clobbered by the make package
|
# Save running make version since it's clobbered by the make package
|
||||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
buildroot 2017_02_5
|
buildroot 2017_02_6
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ GRUB2_CONF_ENV = \
|
|||||||
$(HOST_CONFIGURE_OPTS) \
|
$(HOST_CONFIGURE_OPTS) \
|
||||||
CPP="$(HOSTCC) -E" \
|
CPP="$(HOSTCC) -E" \
|
||||||
TARGET_CC="$(TARGET_CC)" \
|
TARGET_CC="$(TARGET_CC)" \
|
||||||
TARGET_CFLAGS="$(TARGET_CFLAGS)" \
|
TARGET_CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" \
|
||||||
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
|
||||||
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||||
NM="$(TARGET_NM)" \
|
NM="$(TARGET_NM)" \
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -155,8 +155,8 @@ List of Examples
|
|||||||
|
|
||||||
---------------------------------------------------------------------
|
---------------------------------------------------------------------
|
||||||
|
|
||||||
Buildroot 2017.02.5 manual generated on 2017-07-26 21:36:58 UTC from
|
Buildroot 2017.02.6 manual generated on 2017-09-24 20:42:00 UTC from
|
||||||
git revision a2818c7cfa
|
git revision 8ee6c1d60e
|
||||||
|
|
||||||
The Buildroot manual is written by the Buildroot developers. It is
|
The Buildroot manual is written by the Buildroot developers. It is
|
||||||
licensed under the GNU General Public License, version 2. Refer to
|
licensed under the GNU General Public License, version 2. Refer to
|
||||||
@@ -1729,7 +1729,7 @@ BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/
|
|||||||
When Buildroot finds that for a given package, an <pkg>
|
When Buildroot finds that for a given package, an <pkg>
|
||||||
_OVERRIDE_SRCDIR has been defined, it will no longer attempt to
|
_OVERRIDE_SRCDIR has been defined, it will no longer attempt to
|
||||||
download, extract and patch the package. Instead, it will directly
|
download, extract and patch the package. Instead, it will directly
|
||||||
use the source code available in in the specified directory and make
|
use the source code available in the specified directory and make
|
||||||
clean will not touch this directory. This allows to point Buildroot
|
clean will not touch this directory. This allows to point Buildroot
|
||||||
to your own directories, that can be managed by Git, Subversion, or
|
to your own directories, that can be managed by Git, Subversion, or
|
||||||
any other version control system. To achieve this, Buildroot will use
|
any other version control system. To achieve this, Buildroot will use
|
||||||
|
|||||||
@@ -50,11 +50,11 @@ BUSYBOX_OVERRIDE_SRCDIR = /home/bob/busybox/
|
|||||||
When Buildroot finds that for a given package, an
|
When Buildroot finds that for a given package, an
|
||||||
+<pkg>_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to
|
+<pkg>_OVERRIDE_SRCDIR+ has been defined, it will no longer attempt to
|
||||||
download, extract and patch the package. Instead, it will directly use
|
download, extract and patch the package. Instead, it will directly use
|
||||||
the source code available in in the specified directory and +make
|
the source code available in the specified directory and +make clean+
|
||||||
clean+ will not touch this directory. This allows to point Buildroot
|
will not touch this directory. This allows to point Buildroot to your
|
||||||
to your own directories, that can be managed by Git, Subversion, or
|
own directories, that can be managed by Git, Subversion, or any other
|
||||||
any other version control system. To achieve this, Buildroot will use
|
version control system. To achieve this, Buildroot will use _rsync_ to
|
||||||
_rsync_ to copy the source code of the component from the specified
|
copy the source code of the component from the specified
|
||||||
+<pkg>_OVERRIDE_SRCDIR+ to +output/build/<package>-custom/+.
|
+<pkg>_OVERRIDE_SRCDIR+ to +output/build/<package>-custom/+.
|
||||||
|
|
||||||
This mechanism is best used in conjunction with the +make
|
This mechanism is best used in conjunction with the +make
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ define ROOTFS_ISO9660_CREATE_TEMPDIR
|
|||||||
$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
|
$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
|
||||||
mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
|
mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
|
||||||
endef
|
endef
|
||||||
|
ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR
|
||||||
else
|
else
|
||||||
ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
|
ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
|
||||||
endif
|
endif
|
||||||
|
|||||||
30
bsp/buildroot/package/apache/0003-CVS-2017-9798.patch
Normal file
30
bsp/buildroot/package/apache/0003-CVS-2017-9798.patch
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
core: Disallow Methods' registration at run time (.htaccess), they may
|
||||||
|
be used only if registered at init time (httpd.conf).
|
||||||
|
|
||||||
|
Calling ap_method_register() in children processes is not the right scope
|
||||||
|
since it won't be shared for all requests.
|
||||||
|
|
||||||
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1807655 13f79535-47bb-0310-9956-ffa450edef68
|
||||||
|
|
||||||
|
Fixes CVE-2017-9798: https://nvd.nist.gov/vuln/detail/CVE-2017-9798
|
||||||
|
|
||||||
|
Downloaded from upstream repo:
|
||||||
|
https://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/core.c?r1=1805223&r2=1807754&pathrev=1807754&view=patch
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
|
||||||
|
--- a/server/core.c 2017/08/16 16:50:29 1805223
|
||||||
|
+++ b/server/core.c 2017/09/08 13:13:11 1807754
|
||||||
|
@@ -2266,6 +2266,12 @@
|
||||||
|
/* method has not been registered yet, but resource restriction
|
||||||
|
* is always checked before method handling, so register it.
|
||||||
|
*/
|
||||||
|
+ if (cmd->pool == cmd->temp_pool) {
|
||||||
|
+ /* In .htaccess, we can't globally register new methods. */
|
||||||
|
+ return apr_psprintf(cmd->pool, "Could not register method '%s' "
|
||||||
|
+ "for %s from .htaccess configuration",
|
||||||
|
+ method, cmd->cmd->name);
|
||||||
|
+ }
|
||||||
|
methnum = ap_method_register(cmd->pool,
|
||||||
|
apr_pstrdup(cmd->pool, method));
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
From 6bd1b4958e949d83468e053c34bf6c89d14d687a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
|
||||||
|
Date: Fri, 25 Aug 2017 23:01:14 +0200
|
||||||
|
Subject: [PATCH] eibd: drop local clock_gettime in USB backends
|
||||||
|
|
||||||
|
clock_gettime is defined locally, and calls pth_int_time, which
|
||||||
|
in turn calls clock_gettime.
|
||||||
|
The USB backend shouldn't overrule clock_gettime in the first place.
|
||||||
|
This patch fixes this endless recursion by removing the local defition.
|
||||||
|
|
||||||
|
Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
|
||||||
|
---
|
||||||
|
eibd/usb/linux_usbfs.c | 6 ------
|
||||||
|
1 file changed, 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/eibd/usb/linux_usbfs.c b/eibd/usb/linux_usbfs.c
|
||||||
|
index c3ec410..957b908 100644
|
||||||
|
--- a/eibd/usb/linux_usbfs.c
|
||||||
|
+++ b/eibd/usb/linux_usbfs.c
|
||||||
|
@@ -52,12 +52,6 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex)
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-int clock_gettime(clockid_t clk_id, struct timespec *tp)
|
||||||
|
-{
|
||||||
|
- pth_int_time (tp);
|
||||||
|
- return 0;
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
/* sysfs vs usbfs:
|
||||||
|
* opening a usbfs node causes the device to be resumed, so we attempt to
|
||||||
|
* avoid this during enumeration.
|
||||||
|
--
|
||||||
|
1.8.5.rc3
|
||||||
|
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
# Verified from http://ftp.isc.org/isc/bind9/9.11.1-P3/bind-9.11.1-P3.tar.gz.sha256.asc
|
# Verified from http://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz.sha256.asc
|
||||||
sha256 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4 bind-9.11.1-P3.tar.gz
|
sha256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a bind-9.11.2.tar.gz
|
||||||
sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT
|
sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
BIND_VERSION = 9.11.1-P3
|
BIND_VERSION = 9.11.2
|
||||||
BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||||
# bind does not support parallel builds.
|
# bind does not support parallel builds.
|
||||||
BIND_MAKE = $(MAKE1)
|
BIND_MAKE = $(MAKE1)
|
||||||
BIND_INSTALL_STAGING = YES
|
BIND_INSTALL_STAGING = YES
|
||||||
@@ -24,6 +24,7 @@ BIND_CONF_ENV = \
|
|||||||
BUILD_CC="$(TARGET_CC)" \
|
BUILD_CC="$(TARGET_CC)" \
|
||||||
BUILD_CFLAGS="$(TARGET_CFLAGS)"
|
BUILD_CFLAGS="$(TARGET_CFLAGS)"
|
||||||
BIND_CONF_OPTS = \
|
BIND_CONF_OPTS = \
|
||||||
|
--without-lmdb \
|
||||||
--with-libjson=no \
|
--with-libjson=no \
|
||||||
--with-randomdev=/dev/urandom \
|
--with-randomdev=/dev/urandom \
|
||||||
--enable-epoll \
|
--enable-epoll \
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
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
|
||||||
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||||
|
Date: Wed, 13 Sep 2017 10:01:40 +0300
|
||||||
|
Subject: [PATCH] sdp: Fix Out-of-bounds heap read in service_search_attr_req
|
||||||
|
function
|
||||||
|
|
||||||
|
Check if there is enough data to continue otherwise return an error.
|
||||||
|
|
||||||
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||||
|
---
|
||||||
|
src/sdpd-request.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/sdpd-request.c b/src/sdpd-request.c
|
||||||
|
index 1eefdce1a..318d04467 100644
|
||||||
|
--- a/src/sdpd-request.c
|
||||||
|
+++ b/src/sdpd-request.c
|
||||||
|
@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf)
|
||||||
|
} else {
|
||||||
|
/* continuation State exists -> get from cache */
|
||||||
|
sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
|
||||||
|
- if (pCache) {
|
||||||
|
+ if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) {
|
||||||
|
uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
|
||||||
|
pResponse = pCache->data;
|
||||||
|
memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
# Locally calculated after checking pgp signature
|
# Locally calculated after checking pgp signature
|
||||||
sha256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 Botan-1.10.13.tgz
|
sha256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 Botan-1.10.16.tgz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
BOTAN_VERSION = 1.10.13
|
BOTAN_VERSION = 1.10.16
|
||||||
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
|
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
|
||||||
BOTAN_SITE = http://botan.randombit.net/releases
|
BOTAN_SITE = http://botan.randombit.net/releases
|
||||||
BOTAN_LICENSE = BSD-2c
|
BOTAN_LICENSE = BSD-2c
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
|
|||||||
-DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
|
-DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
|
||||||
-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \
|
-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \
|
||||||
-DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
|
-DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \
|
||||||
|
-DCMAKE_USE_OPENSSL:BOOL=OFF \
|
||||||
-DBUILD_CursesDialog=OFF \
|
-DBUILD_CursesDialog=OFF \
|
||||||
)
|
)
|
||||||
endef
|
endef
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
|
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
|
||||||
sha256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 connman-1.33.tar.xz
|
sha256 66d7deb98371545c6e417239a9b3b3e3201c1529d08eedf40afbc859842cf2aa connman-1.35.tar.xz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
CONNMAN_VERSION = 1.33
|
CONNMAN_VERSION = 1.35
|
||||||
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
|
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
|
||||||
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
|
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
|
||||||
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
|
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Simon McVittie <smcv@debian.org>
|
||||||
|
Date: Fri, 21 Jul 2017 10:46:39 +0100
|
||||||
|
Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against
|
||||||
|
hash collisions
|
||||||
|
|
||||||
|
By default, Expat uses cryptographic-quality random numbers as a salt for
|
||||||
|
its hash algorithm, and since 2.2.1 it gets them from the getrandom
|
||||||
|
syscall on Linux. That syscall refuses to return any entropy until the
|
||||||
|
kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
|
||||||
|
can take as long as 40 seconds on embedded devices with few entropy
|
||||||
|
sources, which is too long: if the system dbus-daemon blocks for that
|
||||||
|
length of time, important D-Bus clients like systemd and systemd-logind
|
||||||
|
time out and fail to connect to it.
|
||||||
|
|
||||||
|
We're parsing small configuration files here, and we trust them
|
||||||
|
completely, so we don't need to defend against hash collisions: nobody
|
||||||
|
is going to be crafting them to cause pathological performance.
|
||||||
|
|
||||||
|
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
|
||||||
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
||||||
|
Tested-by: Christopher Hewitt <hewitt@ieee.org>
|
||||||
|
Reviewed-by: Philip Withnall <withnall@endlessm.com>
|
||||||
|
|
||||||
|
Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
|
||||||
|
Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
|
||||||
|
---
|
||||||
|
bus/config-loader-expat.c | 14 ++++++++++++++
|
||||||
|
configure.ac | 8 ++++++++
|
||||||
|
2 files changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
|
||||||
|
index b571fda3..27cbe2d0 100644
|
||||||
|
--- a/bus/config-loader-expat.c
|
||||||
|
+++ b/bus/config-loader-expat.c
|
||||||
|
@@ -203,6 +203,20 @@ bus_config_load (const DBusString *file,
|
||||||
|
goto failed;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* We do not need protection against hash collisions (CVE-2012-0876)
|
||||||
|
+ * because we are only parsing trusted XML; and if we let Expat block
|
||||||
|
+ * waiting for the CSPRNG to be initialized, as it does by default to
|
||||||
|
+ * defeat CVE-2012-0876, it can cause timeouts during early boot on
|
||||||
|
+ * entropy-starved embedded devices.
|
||||||
|
+ *
|
||||||
|
+ * TODO: When Expat gets a more explicit API for this than
|
||||||
|
+ * XML_SetHashSalt, check for that too, and use it preferentially.
|
||||||
|
+ * https://github.com/libexpat/libexpat/issues/91 */
|
||||||
|
+#if defined(HAVE_XML_SETHASHSALT)
|
||||||
|
+ /* Any nonzero number will do. https://xkcd.com/221/ */
|
||||||
|
+ XML_SetHashSalt (expat, 4);
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (!_dbus_string_get_dirname (file, &dirname))
|
||||||
|
{
|
||||||
|
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 52da11fb..c4022ed7 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -938,6 +938,14 @@ XML_CFLAGS=
|
||||||
|
AC_SUBST([XML_CFLAGS])
|
||||||
|
AC_SUBST([XML_LIBS])
|
||||||
|
|
||||||
|
+save_cflags="$CFLAGS"
|
||||||
|
+save_libs="$LIBS"
|
||||||
|
+CFLAGS="$CFLAGS $XML_CFLAGS"
|
||||||
|
+LIBS="$LIBS $XML_LIBS"
|
||||||
|
+AC_CHECK_FUNCS([XML_SetHashSalt])
|
||||||
|
+CFLAGS="$save_cflags"
|
||||||
|
+LIBS="$save_libs"
|
||||||
|
+
|
||||||
|
# Thread lib detection
|
||||||
|
AC_ARG_VAR([THREAD_LIBS])
|
||||||
|
save_libs="$LIBS"
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@@ -7,6 +7,8 @@
|
|||||||
DBUS_VERSION = 1.10.16
|
DBUS_VERSION = 1.10.16
|
||||||
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
|
DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
|
||||||
DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
|
DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
|
||||||
|
# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
|
||||||
|
DBUS_AUTORECONF = YES
|
||||||
DBUS_LICENSE_FILES = COPYING
|
DBUS_LICENSE_FILES = COPYING
|
||||||
DBUS_INSTALL_STAGING = YES
|
DBUS_INSTALL_STAGING = YES
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
DIALOG_VERSION = 1.2-20150125
|
DIALOG_VERSION = 1.2-20150125
|
||||||
DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
|
DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
|
||||||
DIALOG_SITE = ftp://invisible-island.net/dialog
|
DIALOG_SITE = ftp://ftp.invisible-island.net/dialog
|
||||||
DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
|
DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
|
||||||
--disable-rpath-hack
|
--disable-rpath-hack
|
||||||
DIALOG_DEPENDENCIES = host-pkgconf ncurses
|
DIALOG_DEPENDENCIES = host-pkgconf ncurses
|
||||||
|
|||||||
@@ -0,0 +1,129 @@
|
|||||||
|
From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Date: Fri, 19 May 2017 13:25:59 -0400
|
||||||
|
Subject: [PATCH] include sys/sysmacros.h as needed
|
||||||
|
|
||||||
|
The minor/major/makedev macros are not entirely standard. glibc has had
|
||||||
|
the definitions in sys/sysmacros.h since the start, and wants to move away
|
||||||
|
from always defining them implicitly via sys/types.h (as this pollutes the
|
||||||
|
namespace in violation of POSIX). Other C libraries have already dropped
|
||||||
|
them. Since the configure script already checks for this header, use that
|
||||||
|
to pull in the header in files that use these macros.
|
||||||
|
|
||||||
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||||
|
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
|
||||||
|
|
||||||
|
Upstream commit 3fb715b55426875902dfef3056b2cf7335953178
|
||||||
|
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
||||||
|
---
|
||||||
|
debugfs/debugfs.c | 3 +++
|
||||||
|
lib/blkid/devname.c | 3 +++
|
||||||
|
lib/blkid/devno.c | 3 +++
|
||||||
|
lib/ext2fs/finddev.c | 3 +++
|
||||||
|
lib/ext2fs/ismounted.c | 3 +++
|
||||||
|
misc/create_inode.c | 4 ++++
|
||||||
|
misc/mk_hugefiles.c | 3 +++
|
||||||
|
7 files changed, 22 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
|
||||||
|
index 059ddc39..453f5b52 100644
|
||||||
|
--- a/debugfs/debugfs.c
|
||||||
|
+++ b/debugfs/debugfs.c
|
||||||
|
@@ -26,6 +26,9 @@ extern char *optarg;
|
||||||
|
#include <errno.h>
|
||||||
|
#endif
|
||||||
|
#include <fcntl.h>
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "debugfs.h"
|
||||||
|
#include "uuid/uuid.h"
|
||||||
|
diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
|
||||||
|
index 3e2efa9d..671e781f 100644
|
||||||
|
--- a/lib/blkid/devname.c
|
||||||
|
+++ b/lib/blkid/devname.c
|
||||||
|
@@ -36,6 +36,9 @@
|
||||||
|
#if HAVE_SYS_MKDEV_H
|
||||||
|
#include <sys/mkdev.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "blkidP.h"
|
||||||
|
diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
|
||||||
|
index aa6eb907..480030f2 100644
|
||||||
|
--- a/lib/blkid/devno.c
|
||||||
|
+++ b/lib/blkid/devno.c
|
||||||
|
@@ -31,6 +31,9 @@
|
||||||
|
#if HAVE_SYS_MKDEV_H
|
||||||
|
#include <sys/mkdev.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "blkidP.h"
|
||||||
|
|
||||||
|
diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
|
||||||
|
index 311608de..62fa0dbe 100644
|
||||||
|
--- a/lib/ext2fs/finddev.c
|
||||||
|
+++ b/lib/ext2fs/finddev.c
|
||||||
|
@@ -31,6 +31,9 @@
|
||||||
|
#if HAVE_SYS_MKDEV_H
|
||||||
|
#include <sys/mkdev.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "ext2_fs.h"
|
||||||
|
#include "ext2fs.h"
|
||||||
|
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
|
||||||
|
index bcac0f15..7d524715 100644
|
||||||
|
--- a/lib/ext2fs/ismounted.c
|
||||||
|
+++ b/lib/ext2fs/ismounted.c
|
||||||
|
@@ -49,6 +49,9 @@
|
||||||
|
#if HAVE_SYS_TYPES_H
|
||||||
|
#include <sys/types.h>
|
||||||
|
#endif
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "ext2_fs.h"
|
||||||
|
#include "ext2fs.h"
|
||||||
|
diff --git a/misc/create_inode.c b/misc/create_inode.c
|
||||||
|
index ae22ff6f..8ce3fafa 100644
|
||||||
|
--- a/misc/create_inode.c
|
||||||
|
+++ b/misc/create_inode.c
|
||||||
|
@@ -22,6 +22,10 @@
|
||||||
|
#include <attr/xattr.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include <ext2fs/ext2fs.h>
|
||||||
|
#include <ext2fs/ext2_types.h>
|
||||||
|
#include <ext2fs/fiemap.h>
|
||||||
|
diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
|
||||||
|
index 049c6f41..5882394d 100644
|
||||||
|
--- a/misc/mk_hugefiles.c
|
||||||
|
+++ b/misc/mk_hugefiles.c
|
||||||
|
@@ -35,6 +35,9 @@ extern int optind;
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||||
|
+#include <sys/sysmacros.h>
|
||||||
|
+#endif
|
||||||
|
#include <libgen.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include <blkid/blkid.h>
|
||||||
|
--
|
||||||
|
2.13.3
|
||||||
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
From 6787914efad562e4097a153988109c5c7158abf7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Baruch Siach <baruch@tkos.co.il>
|
||||||
|
Date: Wed, 16 Aug 2017 13:35:57 +0300
|
||||||
|
Subject: [PATCH] getopt: fix strncmp() declaration
|
||||||
|
|
||||||
|
The strncmp() declaration does not conform with the standard as to the
|
||||||
|
type of the 'n' parameter. Fix this to avoid the following build failure
|
||||||
|
with musl libc:
|
||||||
|
|
||||||
|
n file included from main.c:61:0:
|
||||||
|
getopt.c:175:13: error: conflicting types for 'strncmp'
|
||||||
|
extern int strncmp(const char *s1, const char *s2, unsigned int n);
|
||||||
|
^~~~~~~
|
||||||
|
In file included from main.c:49:0:
|
||||||
|
.../host/x86_64-buildroot-linux-musl/sysroot/usr/include/string.h:38:5: note: previous declaration of 'strncmp' was here
|
||||||
|
int strncmp (const char *, const char *, size_t);
|
||||||
|
^~~~~~~
|
||||||
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||||
|
---
|
||||||
|
Upstream status: https://sourceforge.net/p/faac/bugs/217/
|
||||||
|
|
||||||
|
frontend/getopt.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/frontend/getopt.c b/frontend/getopt.c
|
||||||
|
index 185d49b804dd..40c7a2242551 100644
|
||||||
|
--- a/frontend/getopt.c
|
||||||
|
+++ b/frontend/getopt.c
|
||||||
|
@@ -172,7 +172,7 @@ static enum
|
||||||
|
#if __STDC__ || defined(PROTO)
|
||||||
|
extern char *getenv(const char *name);
|
||||||
|
extern int strcmp (const char *s1, const char *s2);
|
||||||
|
-extern int strncmp(const char *s1, const char *s2, unsigned int n);
|
||||||
|
+extern int strncmp(const char *s1, const char *s2, size_t n);
|
||||||
|
|
||||||
|
static int my_strlen(const char *s);
|
||||||
|
static char *my_index (const char *str, int chr);
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.7/ (used by upstream):
|
# From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/ (used by upstream):
|
||||||
sha1 80eaaa5cc576c35dd28863767b795c50cbcc0511 faad2-2.7.tar.gz
|
sha1 a5caa71cd915acd502d96cba56f38296277f2350 faad2-2.8.1.tar.bz2
|
||||||
# Locally computed
|
# Locally computed
|
||||||
sha256 ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 faad2-2.7.tar.gz
|
sha256 f4042496f6b0a60f5ded6acd11093230044ef8a2fd965360c1bbd5b58780933d faad2-2.8.1.tar.bz2
|
||||||
|
|||||||
@@ -4,10 +4,14 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FAAD2_VERSION = 2.7
|
FAAD2_VERSION_MAJOR = 2.8
|
||||||
FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION)
|
FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).1
|
||||||
|
FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION_MAJOR).0
|
||||||
|
FAAD2_SOURCE = faad2-$(FAAD2_VERSION).tar.bz2
|
||||||
FAAD2_LICENSE = GPLv2
|
FAAD2_LICENSE = GPLv2
|
||||||
FAAD2_LICENSE_FILES = COPYING
|
FAAD2_LICENSE_FILES = COPYING
|
||||||
|
# No configure script in upstream tarball
|
||||||
|
FAAD2_AUTORECONF = YES
|
||||||
# frontend/faad calls frexp()
|
# frontend/faad calls frexp()
|
||||||
FAAD2_CONF_ENV = LIBS=-lm
|
FAAD2_CONF_ENV = LIBS=-lm
|
||||||
FAAD2_INSTALL_STAGING = YES
|
FAAD2_INSTALL_STAGING = YES
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
From a853f21633693f9eefc4949660253a5328d2d2f3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
Date: Sun, 13 Aug 2017 23:21:54 +0200
|
||||||
|
Subject: [PATCH 1/1] communicate: check return status of msgrcv()
|
||||||
|
|
||||||
|
msgrcv can return with -1 to indicate an error condition.
|
||||||
|
One such error is to have been interrupted by a signal.
|
||||||
|
|
||||||
|
Being interrupted by a signal is very rare in this code, except in a
|
||||||
|
very special condition: a highly-parallel (1000 jobs!) mksquashfs on
|
||||||
|
a filesystem with extended attributes, where we see errors like (those
|
||||||
|
are mksquashfs errors):
|
||||||
|
llistxattr for titi/603/883 failed in read_attrs, because Unknown
|
||||||
|
error 1716527536
|
||||||
|
|
||||||
|
See: https://bugs.busybox.net/show_bug.cgi?id=10141
|
||||||
|
|
||||||
|
In this case, we just have to retry the call to msgrcv().
|
||||||
|
|
||||||
|
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
|
---
|
||||||
|
communicate.c | 5 ++++-
|
||||||
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/communicate.c b/communicate.c
|
||||||
|
index 293f404..787bb63 100644
|
||||||
|
--- a/communicate.c
|
||||||
|
+++ b/communicate.c
|
||||||
|
@@ -553,10 +553,13 @@ void send_get_fakem(struct fake_msg *buf)
|
||||||
|
l=msgrcv(msg_get,
|
||||||
|
(struct my_msgbuf*)buf,
|
||||||
|
sizeof(*buf)-sizeof(buf->mtype),0,0);
|
||||||
|
- while((buf->serial!=serial)||buf->pid!=pid);
|
||||||
|
+ while(((l==-1)&&(errno==EINTR))||(buf->serial!=serial)||buf->pid!=pid);
|
||||||
|
|
||||||
|
semaphore_down();
|
||||||
|
|
||||||
|
+ if(l==-1)
|
||||||
|
+ buf->xattr.flags_rc=errno;
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
(nah, may be wrong, due to allignment)
|
||||||
|
|
||||||
|
--
|
||||||
|
2.11.0
|
||||||
|
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 54ce502aca10b7e6059f19220ea2f68fa0c9c4c4d255ae13e615f08f0c94dcc5 ffmpeg-3.2.3.tar.xz
|
sha256 42e7362692318afc666f14378dd445effa9a1b09787504a6ab5811fe442674cd ffmpeg-3.2.8.tar.xz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FFMPEG_VERSION = 3.2.3
|
FFMPEG_VERSION = 3.2.8
|
||||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
FFMPEG_SITE = http://ffmpeg.org/releases
|
||||||
FFMPEG_INSTALL_STAGING = YES
|
FFMPEG_INSTALL_STAGING = YES
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz
|
sha256 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50 file-5.32.tar.gz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FILE_VERSION = 5.29
|
FILE_VERSION = 5.32
|
||||||
FILE_SITE = ftp://ftp.astron.com/pub/file
|
FILE_SITE = ftp://ftp.astron.com/pub/file
|
||||||
FILE_DEPENDENCIES = host-file zlib
|
FILE_DEPENDENCIES = host-file zlib
|
||||||
HOST_FILE_DEPENDENCIES = host-zlib
|
HOST_FILE_DEPENDENCIES = host-zlib
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ FLASHROM_LICENSE = GPLv2+
|
|||||||
FLASHROM_LICENSE_FILES = COPYING
|
FLASHROM_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
define FLASHROM_BUILD_CMDS
|
define FLASHROM_BUILD_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
|
$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
|
||||||
|
CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" -C $(@D)
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define FLASHROM_INSTALL_TARGET_CMDS
|
define FLASHROM_INSTALL_TARGET_CMDS
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From 65a3028024a5963d9b988d70fe7ebe116c731310 Mon Sep 17 00:00:00 2001
|
||||||
|
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||||
|
Date: Mon, 11 Sep 2017 21:53:38 +0000
|
||||||
|
Subject: [PATCH] xtensa: fix PR target/82181
|
||||||
|
|
||||||
|
2017-09-11 Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
gcc/
|
||||||
|
Backport from mainline
|
||||||
|
* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
|
||||||
|
words of DImode object are reachable by xtensa_uimm8x4 access.
|
||||||
|
|
||||||
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
---
|
||||||
|
gcc/config/xtensa/xtensa.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||||
|
index f08854729f50..4b94179636e0 100644
|
||||||
|
--- a/gcc/config/xtensa/xtensa.c
|
||||||
|
+++ b/gcc/config/xtensa/xtensa.c
|
||||||
|
@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
|
||||||
|
case HImode:
|
||||||
|
return xtensa_uimm8x2 (v);
|
||||||
|
|
||||||
|
+ case DImode:
|
||||||
|
case DFmode:
|
||||||
|
return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From 672910e3d1215b781cf0e4757e473f6a25ebf756 Mon Sep 17 00:00:00 2001
|
||||||
|
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||||
|
Date: Mon, 11 Sep 2017 21:53:38 +0000
|
||||||
|
Subject: [PATCH] xtensa: fix PR target/82181
|
||||||
|
|
||||||
|
2017-09-11 Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
gcc/
|
||||||
|
Backport from mainline
|
||||||
|
* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
|
||||||
|
words of DImode object are reachable by xtensa_uimm8x4 access.
|
||||||
|
|
||||||
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
---
|
||||||
|
gcc/config/xtensa/xtensa.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||||
|
index 67b369f015ad..3d1d981f885d 100644
|
||||||
|
--- a/gcc/config/xtensa/xtensa.c
|
||||||
|
+++ b/gcc/config/xtensa/xtensa.c
|
||||||
|
@@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
|
||||||
|
case HImode:
|
||||||
|
return xtensa_uimm8x2 (v);
|
||||||
|
|
||||||
|
+ case DImode:
|
||||||
|
case DFmode:
|
||||||
|
return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From 329c471661493e48e0fc65fa6c17ef86517483ed Mon Sep 17 00:00:00 2001
|
||||||
|
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||||
|
Date: Mon, 11 Sep 2017 21:53:38 +0000
|
||||||
|
Subject: [PATCH] xtensa: fix PR target/82181
|
||||||
|
|
||||||
|
2017-09-11 Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
gcc/
|
||||||
|
Backport from mainline
|
||||||
|
* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
|
||||||
|
words of DImode object are reachable by xtensa_uimm8x4 access.
|
||||||
|
|
||||||
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
---
|
||||||
|
gcc/config/xtensa/xtensa.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||||
|
index 36ab1e370853..bf02fceb416e 100644
|
||||||
|
--- a/gcc/config/xtensa/xtensa.c
|
||||||
|
+++ b/gcc/config/xtensa/xtensa.c
|
||||||
|
@@ -637,6 +637,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
|
||||||
|
case HImode:
|
||||||
|
return xtensa_uimm8x2 (v);
|
||||||
|
|
||||||
|
+ case DImode:
|
||||||
|
case DFmode:
|
||||||
|
return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
From dc90c186f755e726a097c9bb8bf6c4e7a45d8a07 Mon Sep 17 00:00:00 2001
|
||||||
|
From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
|
||||||
|
Date: Mon, 11 Sep 2017 21:53:38 +0000
|
||||||
|
Subject: [PATCH] xtensa: fix PR target/82181
|
||||||
|
|
||||||
|
2017-09-11 Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
gcc/
|
||||||
|
Backport from mainline
|
||||||
|
* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
|
||||||
|
words of DImode object are reachable by xtensa_uimm8x4 access.
|
||||||
|
|
||||||
|
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||||
|
---
|
||||||
|
gcc/config/xtensa/xtensa.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||||
|
index 70f698aba0ae..750b685b23e7 100644
|
||||||
|
--- a/gcc/config/xtensa/xtensa.c
|
||||||
|
+++ b/gcc/config/xtensa/xtensa.c
|
||||||
|
@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
|
||||||
|
case HImode:
|
||||||
|
return xtensa_uimm8x2 (v);
|
||||||
|
|
||||||
|
+ case DImode:
|
||||||
|
case DFmode:
|
||||||
|
return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
|
||||||
|
|
||||||
|
--
|
||||||
|
2.1.4
|
||||||
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
Fix gdlib-config
|
|
||||||
|
|
||||||
Since the @LIBICONV@ macro doesn't get replaced at compile time, we
|
|
||||||
end up installing an invalid gdlib-config: the gdlib-config --libs
|
|
||||||
says that one should link against @LIBICONV@ which obviously doesn't
|
|
||||||
work.
|
|
||||||
|
|
||||||
Use the OpenWRT patch from
|
|
||||||
https://dev.openwrt.org/browser/packages/libs/gd/patches/101-gdlib-config.patch
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
||||||
|
|
||||||
--- a/config/gdlib-config.in
|
|
||||||
+++ b/config/gdlib-config.in
|
|
||||||
@@ -71,7 +71,7 @@ while test $# -gt 0; do
|
|
||||||
echo @LDFLAGS@
|
|
||||||
;;
|
|
||||||
--libs)
|
|
||||||
- echo -lgd @LIBS@ @LIBICONV@
|
|
||||||
+ echo -lgd @LIBS@
|
|
||||||
;;
|
|
||||||
--cflags|--includes)
|
|
||||||
echo -I@includedir@
|
|
||||||
@@ -84,7 +84,7 @@ while test $# -gt 0; do
|
|
||||||
echo "includedir: $includedir"
|
|
||||||
echo "cflags: -I@includedir@"
|
|
||||||
echo "ldflags: @LDFLAGS@"
|
|
||||||
- echo "libs: @LIBS@ @LIBICONV@"
|
|
||||||
+ echo "libs: @LIBS@"
|
|
||||||
echo "libdir: $libdir"
|
|
||||||
echo "features: @FEATURES@"
|
|
||||||
;;
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
From ea2a03e983acf34a1320b460dcad43b7e0b0b14f Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <ea2a03e983acf34a1320b460dcad43b7e0b0b14f.1397134306.git.baruch@tkos.co.il>
|
|
||||||
From: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
Date: Thu, 10 Apr 2014 15:49:13 +0300
|
|
||||||
Subject: [PATCH] gd_bmp: fix build with uClibc
|
|
||||||
|
|
||||||
Some architectures (like ARM) don't have the long double variants of math
|
|
||||||
functions under uClibc. Add a local ceill definition in this case.
|
|
||||||
|
|
||||||
Patch status: reported upstream,
|
|
||||||
https://bitbucket.org/libgd/gd-libgd/issue/123/build-failure-agains-uclibc-arm
|
|
||||||
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
---
|
|
||||||
src/gd_bmp.c | 12 ++++++++++++
|
|
||||||
1 file changed, 12 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/gd_bmp.c b/src/gd_bmp.c
|
|
||||||
index 0fc021909f1b..11b3ec1baa01 100644
|
|
||||||
--- a/src/gd_bmp.c
|
|
||||||
+++ b/src/gd_bmp.c
|
|
||||||
@@ -25,6 +25,11 @@
|
|
||||||
#include "gdhelpers.h"
|
|
||||||
#include "bmp.h"
|
|
||||||
|
|
||||||
+#include <features.h>
|
|
||||||
+#if defined (__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__)
|
|
||||||
+#define NO_LONG_DOUBLE
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static int compress_row(unsigned char *uncompressed_row, int length);
|
|
||||||
static int build_rle_packet(unsigned char *row, int packet_type, int length, unsigned char *data);
|
|
||||||
|
|
||||||
@@ -42,6 +47,13 @@ static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info);
|
|
||||||
|
|
||||||
#define BMP_DEBUG(s)
|
|
||||||
|
|
||||||
+#ifdef NO_LONG_DOUBLE
|
|
||||||
+long double ceill(long double x)
|
|
||||||
+{
|
|
||||||
+ return (long double) ceil((double) x);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static int gdBMPPutWord(gdIOCtx *out, int w)
|
|
||||||
{
|
|
||||||
/* Byte order is little-endian */
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 libgd-2.2.4.tar.xz
|
sha256 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51 libgd-2.2.5.tar.xz
|
||||||
|
sha256 d02dae2141d49b8a6b09b2b73e68a8f17d7bbeaaf02b3b841ee11fea2d9e328d COPYING
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
GD_VERSION = 2.2.4
|
GD_VERSION = 2.2.5
|
||||||
GD_SOURCE = libgd-$(GD_VERSION).tar.xz
|
GD_SOURCE = libgd-$(GD_VERSION).tar.xz
|
||||||
GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
|
GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION)
|
||||||
GD_INSTALL_STAGING = YES
|
GD_INSTALL_STAGING = YES
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
From 09a2c3e0164545324a1ddee70f5c9fdee71e2079 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
Date: Sun, 18 Jun 2017 23:09:43 +0200
|
||||||
|
Subject: [PATCH] nat/linux-ptrace.c: add missing gdb_byte* cast
|
||||||
|
|
||||||
|
On noMMU platforms, the following code gets compiled:
|
||||||
|
|
||||||
|
child_stack = xmalloc (STACK_SIZE * 4);
|
||||||
|
|
||||||
|
Where child_stack is a gdb_byte*, and xmalloc() returns a void*. While
|
||||||
|
the lack of cast is valid in C, it is not in C++, causing the
|
||||||
|
following build failure:
|
||||||
|
|
||||||
|
../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))':
|
||||||
|
../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive]
|
||||||
|
child_stack = xmalloc (STACK_SIZE * 4);
|
||||||
|
|
||||||
|
Therefore, this commit adds the appropriate cast.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
[Upstream commit: ffce45d2243e5f52f411e314fc4e1a69f431a81f]
|
||||||
|
---
|
||||||
|
gdb/nat/linux-ptrace.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
|
||||||
|
index 3447e07..33833e2 100644
|
||||||
|
--- a/gdb/nat/linux-ptrace.c
|
||||||
|
+++ b/gdb/nat/linux-ptrace.c
|
||||||
|
@@ -270,7 +270,7 @@ linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *))
|
||||||
|
#define STACK_SIZE 4096
|
||||||
|
|
||||||
|
if (child_stack == NULL)
|
||||||
|
- child_stack = xmalloc (STACK_SIZE * 4);
|
||||||
|
+ child_stack = (gdb_byte*) xmalloc (STACK_SIZE * 4);
|
||||||
|
|
||||||
|
/* Use CLONE_VM instead of fork, to support uClinux (no MMU). */
|
||||||
|
#ifdef __ia64__
|
||||||
|
--
|
||||||
|
2.9.4
|
||||||
|
|
||||||
@@ -189,6 +189,7 @@ HOST_GDB_CONF_OPTS = \
|
|||||||
--enable-threads \
|
--enable-threads \
|
||||||
--disable-werror \
|
--disable-werror \
|
||||||
--without-included-gettext \
|
--without-included-gettext \
|
||||||
|
--with-curses \
|
||||||
$(GDB_DISABLE_BINUTILS_CONF_OPTS)
|
$(GDB_DISABLE_BINUTILS_CONF_OPTS)
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
|
ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.4.sha256sum
|
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.10.sha256sum
|
||||||
sha256 0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463 gdk-pixbuf-2.36.4.tar.xz
|
sha256 f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace gdk-pixbuf-2.36.10.tar.xz
|
||||||
|
# Locally calculated
|
||||||
|
sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
GDK_PIXBUF_VERSION_MAJOR = 2.36
|
GDK_PIXBUF_VERSION_MAJOR = 2.36
|
||||||
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4
|
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10
|
||||||
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
|
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
|
||||||
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
|
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
|
||||||
GDK_PIXBUF_LICENSE = LGPLv2+
|
GDK_PIXBUF_LICENSE = LGPLv2+
|
||||||
@@ -20,6 +20,9 @@ GDK_PIXBUF_CONF_ENV = \
|
|||||||
ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
|
ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
|
||||||
gio_can_sniff=no
|
gio_can_sniff=no
|
||||||
|
|
||||||
|
HOST_GDK_PIXBUF_CONF_ENV = \
|
||||||
|
gio_can_sniff=no
|
||||||
|
|
||||||
GDK_PIXBUF_CONF_OPTS = --disable-glibtest
|
GDK_PIXBUF_CONF_OPTS = --disable-glibtest
|
||||||
|
|
||||||
ifneq ($(BR2_PACKAGE_LIBPNG),y)
|
ifneq ($(BR2_PACKAGE_LIBPNG),y)
|
||||||
@@ -73,5 +76,14 @@ define GDK_PIXBUF_DISABLE_TESTS
|
|||||||
endef
|
endef
|
||||||
GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
|
GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
|
||||||
|
|
||||||
|
# Target gdk-pixbuf needs loaders.cache populated to build for the
|
||||||
|
# thumbnailer. Use the host-built since it matches the target options
|
||||||
|
# regarding mime types (which is the used information).
|
||||||
|
define GDK_PIXBUF_COPY_LOADERS_CACHE
|
||||||
|
cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
|
||||||
|
$(@D)/gdk-pixbuf
|
||||||
|
endef
|
||||||
|
GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
$(eval $(autotools-package))
|
||||||
$(eval $(host-autotools-package))
|
$(eval $(host-autotools-package))
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
|
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
|
||||||
sha256 016124c54ce2db7a4c2bd26b0de21fbf8f6bcaee04842aa221c7243141df4e42 git-2.12.3.tar.xz
|
sha256 f8b8ac499034e9f6e44e67dd54351bc5654e228e4cd3b55f6f1c8e736c977ce6 git-2.12.4.tar.xz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
GIT_VERSION = 2.12.3
|
GIT_VERSION = 2.12.4
|
||||||
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
|
||||||
GIT_SITE = https://www.kernel.org/pub/software/scm/git
|
GIT_SITE = https://www.kernel.org/pub/software/scm/git
|
||||||
GIT_LICENSE = GPLv2, LGPLv2.1+
|
GIT_LICENSE = GPLv2, LGPLv2.1+
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
# From https://lists.gnu.org/archive/html/info-gnu/2016-08/msg00008.html
|
# Locally computed based on signature
|
||||||
sha1 e3bdb585026f752ae91360f45c28e76e4a15d338 gnupg-1.4.21.tar.bz2
|
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.22.tar.bz2.sig
|
||||||
# Locally computed
|
sha256 9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4 gnupg-1.4.22.tar.bz2
|
||||||
sha256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 gnupg-1.4.21.tar.bz2
|
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
GNUPG_VERSION = 1.4.21
|
GNUPG_VERSION = 1.4.22
|
||||||
GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
|
GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
|
||||||
GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
|
GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg
|
||||||
GNUPG_LICENSE = GPLv3+
|
GNUPG_LICENSE = GPLv3+
|
||||||
GNUPG_LICENSE_FILES = COPYING
|
GNUPG_LICENSE_FILES = COPYING
|
||||||
GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
From eb7cce5dbb53a64cf55ac0d9a7fa4dcbebd4b173 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Waldemar Brodkorb <wbx@openadk.org>
|
||||||
|
Date: Mon, 14 Aug 2017 23:24:38 +0200
|
||||||
|
Subject: [PATCH] SConstruct: do not force -O2 by default
|
||||||
|
|
||||||
|
-O2 can cause problems on some architectures, so do not force it by
|
||||||
|
default.
|
||||||
|
|
||||||
|
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
|
||||||
|
---
|
||||||
|
SConstruct | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/SConstruct b/SConstruct
|
||||||
|
index fe444a2..93d91a4 100644
|
||||||
|
--- a/SConstruct
|
||||||
|
+++ b/SConstruct
|
||||||
|
@@ -330,8 +330,6 @@ if not 'CCFLAGS' in os.environ:
|
||||||
|
# Should we build with optimisation?
|
||||||
|
if env['debug'] or env['coveraging']:
|
||||||
|
env.Append(CCFLAGS=['-O0'])
|
||||||
|
- else:
|
||||||
|
- env.Append(CCFLAGS=['-O2'])
|
||||||
|
|
||||||
|
# Get a slight speedup by not doing automatic RCS and SCCS fetches.
|
||||||
|
env.SourceCode('.', None)
|
||||||
|
--
|
||||||
|
2.9.4
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ endif
|
|||||||
# A bug was reported to the gcc bug tracker:
|
# A bug was reported to the gcc bug tracker:
|
||||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485
|
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485
|
||||||
ifeq ($(BR2_microblaze),y)
|
ifeq ($(BR2_microblaze),y)
|
||||||
GPSD_CFLAGS += -fno-expensive-optimizations -fno-schedule-insns
|
GPSD_CFLAGS += -O0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Enable or disable Qt binding
|
# Enable or disable Qt binding
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
From daaf649bda7231fd0d760802232a36ba62a4ea2d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Clemens Lang <cal@macports.org>
|
||||||
|
Date: Sun, 13 Aug 2017 21:17:18 +0200
|
||||||
|
Subject: [PATCH] openjpeg: Fix build against openjpeg 2.2
|
||||||
|
|
||||||
|
OpenJPEG 2.2 has some API changes and thus ships its headers in a new
|
||||||
|
include path. Add a configure check (to both meson and autoconf) to
|
||||||
|
detect the newer version of OpenJPEG and add conditional includes.
|
||||||
|
|
||||||
|
Fix the autoconf test for OpenJPEG 2.1, which checked for HAVE_OPENJPEG,
|
||||||
|
which was always set even for 2.0.
|
||||||
|
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=786250
|
||||||
|
|
||||||
|
[Peter: drop meson changes for 2017.02.x]
|
||||||
|
Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/patch/?id=15f24fef53a955c7c76fc966302cb0453732e657
|
||||||
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||||
|
---
|
||||||
|
configure.ac | 7 ++++++-
|
||||||
|
ext/openjpeg/gstopenjpeg.h | 4 +++-
|
||||||
|
2 files changed, 22 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 30e26b8..c4f08c7 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -2813,8 +2813,13 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [
|
||||||
|
if test x"$HAVE_OPENJPEG" = x"yes"; then
|
||||||
|
dnl minor API changes in v2.1
|
||||||
|
AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1)
|
||||||
|
- if test x"$HAVE_OPENJPEG" = x"yes"; then
|
||||||
|
+ if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then
|
||||||
|
AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used])
|
||||||
|
+ dnl include paths changed for v2.2
|
||||||
|
+ AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2)
|
||||||
|
+ if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then
|
||||||
|
+ AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used])
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# Fallback to v1.5
|
||||||
|
diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h
|
||||||
|
index 03ce52e..52410a4 100644
|
||||||
|
--- a/ext/openjpeg/gstopenjpeg.h
|
||||||
|
+++ b/ext/openjpeg/gstopenjpeg.h
|
||||||
|
@@ -38,7 +38,9 @@
|
||||||
|
#define OPJ_CPRL CPRL
|
||||||
|
#else
|
||||||
|
#include <stdio.h>
|
||||||
|
-# ifdef HAVE_OPENJPEG_2_1
|
||||||
|
+# if defined(HAVE_OPENJPEG_2_2)
|
||||||
|
+# include <openjpeg-2.2/openjpeg.h>
|
||||||
|
+# elif defined(HAVE_OPENJPEG_2_1)
|
||||||
|
# include <openjpeg-2.1/openjpeg.h>
|
||||||
|
# else
|
||||||
|
# include <openjpeg-2.0/openjpeg.h>
|
||||||
|
|
||||||
|
--
|
||||||
|
2.12.3
|
||||||
|
|
||||||
@@ -13,6 +13,10 @@ GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
|
|||||||
# enabled.
|
# enabled.
|
||||||
GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+
|
GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+
|
||||||
|
|
||||||
|
# patch 0001-openjpeg-Fix-build-against-openjpeg-2.2.patch touches configure.ac
|
||||||
|
GST1_PLUGINS_BAD_AUTORECONF = YES
|
||||||
|
GST1_PLUGINS_BAD_GETTEXTIZE = YES
|
||||||
|
|
||||||
GST1_PLUGINS_BAD_CONF_OPTS = \
|
GST1_PLUGINS_BAD_CONF_OPTS = \
|
||||||
--disable-examples \
|
--disable-examples \
|
||||||
--disable-valgrind \
|
--disable-valgrind \
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# From http://www.imagemagick.org/download/releases/digest.rdf
|
# Locally computed
|
||||||
sha256 0058fcde533986334458a5c99600b1b9633182dd9562cbad4ba618c5ccf2a28f ImageMagick-7.0.5-10.tar.xz
|
sha256 5a45e29509dbb23793a9c8db5c47ef1114c1ee82c9ca60053eaf06b3fc243e2c 7.0.7-1.tar.gz
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
IMAGEMAGICK_VERSION = 7.0.5-10
|
IMAGEMAGICK_VERSION = 7.0.7-1
|
||||||
IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
|
IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz
|
||||||
IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
|
IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive
|
||||||
IMAGEMAGICK_LICENSE = Apache-2.0
|
IMAGEMAGICK_LICENSE = Apache-2.0
|
||||||
IMAGEMAGICK_LICENSE_FILES = LICENSE
|
IMAGEMAGICK_LICENSE_FILES = LICENSE
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
IOSTAT_VERSION = 2.2
|
IOSTAT_VERSION = 2.2
|
||||||
IOSTAT_SITE = http://www.linuxinsight.com/files
|
IOSTAT_SITE = http://linuxinsight.com/sites/default/files
|
||||||
IOSTAT_LICENSE = GPL
|
IOSTAT_LICENSE = GPL
|
||||||
IOSTAT_LICENSE_FILES = LICENSE
|
IOSTAT_LICENSE_FILES = LICENSE
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
IUCODE_TOOL_VERSION = 1.5
|
IUCODE_TOOL_VERSION = 1.5
|
||||||
IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz
|
IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz
|
||||||
IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/latest
|
IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master
|
||||||
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
|
ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
|
||||||
IUCODE_TOOL_CONF_ENV = LIBS="-largp"
|
IUCODE_TOOL_CONF_ENV = LIBS="-largp"
|
||||||
IUCODE_TOOL_DEPENDENCIES = argp-standalone
|
IUCODE_TOOL_DEPENDENCIES = argp-standalone
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
|
||||||
|
Date: Sat, 11 Jun 2016 05:35:07 +0200
|
||||||
|
Subject: [PATCH] Fix initialization in test/iodelay.cpp
|
||||||
|
|
||||||
|
jack_latency_range_t is
|
||||||
|
|
||||||
|
struct _jack_latency_range {
|
||||||
|
jack_nframes_t min;
|
||||||
|
jack_nframes_t max;
|
||||||
|
};
|
||||||
|
|
||||||
|
and jack_nframes_t is
|
||||||
|
|
||||||
|
typedef uint32_t jack_nframes_t;
|
||||||
|
|
||||||
|
so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has
|
||||||
|
|
||||||
|
jack_latency_range_t range;
|
||||||
|
range.min = range.max = 0;
|
||||||
|
if ((range.min != capture_latency.min) || (range.max !=
|
||||||
|
capture_latency.max)) {
|
||||||
|
capture_latency = range;
|
||||||
|
}
|
||||||
|
|
||||||
|
so we must not have {0, 0}, otherwise the condition would never be true.
|
||||||
|
|
||||||
|
Using UINT32_MAX should be equivalent to the previous -1.
|
||||||
|
|
||||||
|
[Upstream commit https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645]
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
tests/iodelay.cpp | 7 ++++---
|
||||||
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp
|
||||||
|
index e1ba63fa..1ef470fd 100644
|
||||||
|
--- a/tests/iodelay.cpp
|
||||||
|
+++ b/tests/iodelay.cpp
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
+#include <stdint.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <jack/jack.h>
|
||||||
|
@@ -167,8 +168,8 @@ static jack_client_t *jack_handle;
|
||||||
|
static jack_port_t *jack_capt;
|
||||||
|
static jack_port_t *jack_play;
|
||||||
|
|
||||||
|
-jack_latency_range_t capture_latency = {-1, -1};
|
||||||
|
-jack_latency_range_t playback_latency = {-1, -1};
|
||||||
|
+jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX};
|
||||||
|
+jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX};
|
||||||
|
|
||||||
|
void
|
||||||
|
latency_cb (jack_latency_callback_mode_t mode, void *arg)
|
||||||
|
@@ -266,4 +267,4 @@ int main (int ac, char *av [])
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-// --------------------------------------------------------------------------------
|
||||||
|
\ No newline at end of file
|
||||||
|
+// --------------------------------------------------------------------------------
|
||||||
31
bsp/buildroot/package/jack2/0005-gcc7.patch
Normal file
31
bsp/buildroot/package/jack2/0005-gcc7.patch
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kjetil Matheussen <k.s.matheussen@notam02.no>
|
||||||
|
Date: Sat, 15 Jul 2017 13:21:59 +0200
|
||||||
|
Subject: [PATCH] Tests: Fix compilation with gcc7
|
||||||
|
|
||||||
|
Fixes
|
||||||
|
../tests/test.cpp: In function ‘int process4(jack_nframes_t, void*)’:
|
||||||
|
../tests/test.cpp:483:73: error: call of overloaded ‘abs(jack_nframes_t)’ is ambiguous
|
||||||
|
if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
|
||||||
|
|
||||||
|
Downloaded from upstream commit
|
||||||
|
https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
---
|
||||||
|
tests/test.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/test.cpp b/tests/test.cpp
|
||||||
|
index 8a8a8117..d2ef9a05 100644
|
||||||
|
--- a/tests/test.cpp
|
||||||
|
+++ b/tests/test.cpp
|
||||||
|
@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
|
||||||
|
jack_nframes_t delta_time = cur_time - last_time;
|
||||||
|
|
||||||
|
Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
|
||||||
|
- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
|
||||||
|
+ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
|
||||||
|
printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
|
||||||
|
}
|
||||||
|
|
||||||
28
bsp/buildroot/package/jack2/0006-fix-ftbfs-with-clang.patch
Normal file
28
bsp/buildroot/package/jack2/0006-fix-ftbfs-with-clang.patch
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
|
||||||
|
Date: Thu, 18 Sep 2014 18:29:23 +0200
|
||||||
|
Subject: [PATCH] Fix FTBFS with clang++
|
||||||
|
|
||||||
|
Forwarded from http://bugs.debian.org/757820
|
||||||
|
|
||||||
|
Downloaded from upstream commit
|
||||||
|
https://github.com/jackaudio/jack2/commit/d3c8e2d8d78899fba40a3e677ed4dbe388d82269
|
||||||
|
|
||||||
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||||
|
---
|
||||||
|
common/memops.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/common/memops.c b/common/memops.c
|
||||||
|
index 27f6194a..2d416b64 100644
|
||||||
|
--- a/common/memops.c
|
||||||
|
+++ b/common/memops.c
|
||||||
|
@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
|
||||||
|
*/
|
||||||
|
static unsigned int seed = 22222;
|
||||||
|
|
||||||
|
-inline unsigned int fast_rand() {
|
||||||
|
+static inline unsigned int fast_rand() {
|
||||||
|
seed = (seed * 96314165) + 907633515;
|
||||||
|
return seed;
|
||||||
|
}
|
||||||
@@ -1,3 +1,2 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz
|
sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz
|
||||||
sha256 f372c4300e3fb2c1ce053e47829df44f3f8b933feb820759392187723ae8e640 ff1ed2c4524095055140370c1008a2d9cccc5645.patch
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
|
|||||||
JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
|
JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
|
||||||
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
|
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
|
||||||
JACK2_INSTALL_STAGING = YES
|
JACK2_INSTALL_STAGING = YES
|
||||||
JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch
|
|
||||||
|
|
||||||
JACK2_CONF_OPTS = --alsa
|
JACK2_CONF_OPTS = --alsa
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,42 @@
|
|||||||
|
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,2 +1,2 @@
|
|||||||
# Locally computed:
|
# Locally computed:
|
||||||
sha256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 libarchive-3.2.1.tar.gz
|
sha256 ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce libarchive-3.3.2.tar.gz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBARCHIVE_VERSION = 3.2.1
|
LIBARCHIVE_VERSION = 3.3.2
|
||||||
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
|
LIBARCHIVE_SITE = http://www.libarchive.org/downloads
|
||||||
LIBARCHIVE_INSTALL_STAGING = YES
|
LIBARCHIVE_INSTALL_STAGING = YES
|
||||||
LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
|
LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
From 7d84bd820ef412d251b643a4faced105668f4ebd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
Date: Fri, 11 Aug 2017 18:52:37 +0200
|
||||||
|
Subject: [PATCH] curl/system.h: support more architectures
|
||||||
|
|
||||||
|
The long list of architectures in include/curl/system.h is annoying to
|
||||||
|
maintain, and needs to be extended for each and every architecture to
|
||||||
|
support.
|
||||||
|
|
||||||
|
Instead, let's rely on the __SIZEOF_LONG__ define of the gcc compiler
|
||||||
|
(we are in the GNUC condition anyway), which tells us if long is 4
|
||||||
|
bytes or 8 bytes.
|
||||||
|
|
||||||
|
This fixes the build of libcurl 7.55.0 on architectures such as
|
||||||
|
OpenRISC or ARC.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
include/curl/system.h | 5 +++--
|
||||||
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/curl/system.h b/include/curl/system.h
|
||||||
|
index 79abf8f..0e13075 100644
|
||||||
|
--- a/include/curl/system.h
|
||||||
|
+++ b/include/curl/system.h
|
||||||
|
@@ -403,7 +403,7 @@
|
||||||
|
# if !defined(__LP64__) && (defined(__ILP32__) || \
|
||||||
|
defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
|
||||||
|
defined(__sparc__) || defined(__mips__) || defined(__sh__) || \
|
||||||
|
- defined(__XTENSA__))
|
||||||
|
+ defined(__XTENSA__) || (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4))
|
||||||
|
# define CURL_SIZEOF_LONG 4
|
||||||
|
# define CURL_TYPEOF_CURL_OFF_T long long
|
||||||
|
# define CURL_FORMAT_CURL_OFF_T "lld"
|
||||||
|
@@ -412,7 +412,8 @@
|
||||||
|
# define CURL_SUFFIX_CURL_OFF_T LL
|
||||||
|
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
||||||
|
# elif defined(__LP64__) || \
|
||||||
|
- defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__)
|
||||||
|
+ defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \
|
||||||
|
+ (defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 8)
|
||||||
|
# define CURL_SIZEOF_LONG 8
|
||||||
|
# define CURL_TYPEOF_CURL_OFF_T long
|
||||||
|
# define CURL_FORMAT_CURL_OFF_T "ld"
|
||||||
|
--
|
||||||
|
2.9.4
|
||||||
|
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
# Locally calculated after checking pgp signature
|
# Locally calculated after checking pgp signature
|
||||||
sha256 f50ebaf43c507fa7cc32be4b8108fa8bbd0f5022e90794388f3c7694a302ff06 curl-7.54.0.tar.bz2
|
# https://curl.haxx.se/download/curl-7.55.0.tar.xz.asc
|
||||||
|
sha256 cdd58522f8607fd4e871df79d73acb3155075e2134641e5adab12a0962df059d curl-7.55.0.tar.xz
|
||||||
|
|||||||
@@ -4,14 +4,14 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBCURL_VERSION = 7.54.0
|
LIBCURL_VERSION = 7.55.0
|
||||||
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
|
||||||
LIBCURL_SITE = https://curl.haxx.se/download
|
LIBCURL_SITE = https://curl.haxx.se/download
|
||||||
LIBCURL_DEPENDENCIES = host-pkgconf \
|
LIBCURL_DEPENDENCIES = host-pkgconf \
|
||||||
$(if $(BR2_PACKAGE_ZLIB),zlib) \
|
$(if $(BR2_PACKAGE_ZLIB),zlib) \
|
||||||
$(if $(BR2_PACKAGE_LIBIDN),libidn) \
|
$(if $(BR2_PACKAGE_LIBIDN),libidn) \
|
||||||
$(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump)
|
$(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump)
|
||||||
LIBCURL_LICENSE = ISC
|
LIBCURL_LICENSE = curl
|
||||||
LIBCURL_LICENSE_FILES = COPYING
|
LIBCURL_LICENSE_FILES = COPYING
|
||||||
LIBCURL_INSTALL_STAGING = YES
|
LIBCURL_INSTALL_STAGING = YES
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q2/000408.html
|
|
||||||
sha1 65a4a495aa858483e66868199eaa8238572ca6cd libgcrypt-1.7.8.tar.bz2
|
|
||||||
# Locally calculated after checking signature
|
# Locally calculated after checking signature
|
||||||
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.8.tar.bz2.sig
|
# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.9.tar.bz2.sig
|
||||||
sha256 948276ea47e6ba0244f36a17b51dcdd52cfd1e664b0a1ac3bc82134fb6cec199 libgcrypt-1.7.8.tar.bz2
|
sha256 bfe9bb703c1126c3647da2810fd23039c2f09d46969f71612c2065dc3fa9373b libgcrypt-1.7.9.tar.bz2
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBGCRYPT_VERSION = 1.7.8
|
LIBGCRYPT_VERSION = 1.7.9
|
||||||
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
|
LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
|
||||||
LIBGCRYPT_LICENSE = LGPLv2.1+
|
LIBGCRYPT_LICENSE = LGPLv2.1+
|
||||||
LIBGCRYPT_LICENSE_FILES = COPYING.LIB
|
LIBGCRYPT_LICENSE_FILES = COPYING.LIB
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
From e9e81b8063b095b02cf104bb992fa9bf9515b9d8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
|
||||||
|
Date: Fri, 1 Sep 2017 10:04:48 +0200
|
||||||
|
Subject: [PATCH] lib/punycode.c (decode_digit): Fix integer overflow
|
||||||
|
|
||||||
|
This fix is a backport from libidn2 and addresses
|
||||||
|
CVE-2017-14062.
|
||||||
|
|
||||||
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||||
|
---
|
||||||
|
Upstream status: commit e9e81b8063b095
|
||||||
|
|
||||||
|
lib/punycode.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lib/punycode.c b/lib/punycode.c
|
||||||
|
index 86819a7deb85..49250a13e2cc 100644
|
||||||
|
--- a/lib/punycode.c
|
||||||
|
+++ b/lib/punycode.c
|
||||||
|
@@ -88,10 +88,10 @@ enum
|
||||||
|
/* point (for use in representing integers) in the range 0 to */
|
||||||
|
/* base-1, or base if cp does not represent a value. */
|
||||||
|
|
||||||
|
-static punycode_uint
|
||||||
|
-decode_digit (punycode_uint cp)
|
||||||
|
+static unsigned
|
||||||
|
+decode_digit (int cp)
|
||||||
|
{
|
||||||
|
- return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
|
||||||
|
+ return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
|
||||||
|
cp - 97 < 26 ? cp - 97 : base;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.14.1
|
||||||
|
|
||||||
@@ -7,11 +7,13 @@
|
|||||||
LIBIDN_VERSION = 1.33
|
LIBIDN_VERSION = 1.33
|
||||||
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
|
||||||
LIBIDN_INSTALL_STAGING = YES
|
LIBIDN_INSTALL_STAGING = YES
|
||||||
LIBIDN_CONF_ENV = EMACS="no"
|
LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true
|
||||||
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
|
LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
|
||||||
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||||
LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+
|
LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+
|
||||||
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
|
LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
|
||||||
|
# lib/punycode.c patch triggers reconf in doc/
|
||||||
|
LIBIDN_AUTORECONF = YES
|
||||||
|
|
||||||
define LIBIDN_REMOVE_BINARY
|
define LIBIDN_REMOVE_BINARY
|
||||||
rm -f $(TARGET_DIR)/usr/bin/idn
|
rm -f $(TARGET_DIR)/usr/bin/idn
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
LIBPHIDGET_VERSION = 2.1.8.20140319
|
LIBPHIDGET_VERSION = 2.1.8.20140319
|
||||||
LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz
|
LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz
|
||||||
LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries
|
LIBPHIDGET_SITE = https://www.phidgets.com/downloads/phidget21/libraries/linux/libphidget
|
||||||
LIBPHIDGET_DEPENDENCIES = libusb
|
LIBPHIDGET_DEPENDENCIES = libusb
|
||||||
LIBPHIDGET_CONF_OPTS = --disable-ldconfig
|
LIBPHIDGET_CONF_OPTS = --disable-ldconfig
|
||||||
LIBPHIDGET_INSTALL_STAGING = YES
|
LIBPHIDGET_INSTALL_STAGING = YES
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ config BR2_PACKAGE_LIBRSVG
|
|||||||
The rsvg library is an efficient renderer for Scalable
|
The rsvg library is an efficient renderer for Scalable
|
||||||
Vector Graphics (SVG) pictures.
|
Vector Graphics (SVG) pictures.
|
||||||
|
|
||||||
http://librsvg.sourceforge.net/
|
https://wiki.gnome.org/Projects/LibRsvg
|
||||||
|
|
||||||
comment "librsvg needs a toolchain w/ wchar, threads, C++"
|
comment "librsvg needs a toolchain w/ wchar, threads, C++"
|
||||||
depends on BR2_USE_MMU
|
depends on BR2_USE_MMU
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# From http://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.40/librsvg-2.40.16.sha256sum
|
# From http://ftp.gnome.org/pub/gnome/sources/librsvg/2.40/librsvg-2.40.18.sha256sum
|
||||||
sha256 d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e librsvg-2.40.16.tar.xz
|
sha256 bfc8c488c89c1e7212c478beb95c41b44701636125a3e6dab41187f1485b564c librsvg-2.40.18.tar.xz
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBRSVG_VERSION_MAJOR = 2.40
|
LIBRSVG_VERSION_MAJOR = 2.40
|
||||||
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).16
|
LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).18
|
||||||
LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
|
LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR)
|
||||||
LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
|
LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz
|
||||||
LIBRSVG_INSTALL_STAGING = YES
|
LIBRSVG_INSTALL_STAGING = YES
|
||||||
|
|||||||
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBRSYNC
|
|||||||
remote file synchronization that was popularized by the
|
remote file synchronization that was popularized by the
|
||||||
rsync utility and is used in rproxy.
|
rsync utility and is used in rproxy.
|
||||||
|
|
||||||
http://sourceforge.net/projects/librsync/
|
https://github.com/librsync/librsync
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
# Locally computed:
|
# Locally computed:
|
||||||
sha256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 librsync-0.9.7.tar.gz
|
sha256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 librsync-v2.0.0.tar.gz
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBRSYNC_VERSION = 0.9.7
|
LIBRSYNC_VERSION = v2.0.0
|
||||||
LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION)
|
LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION))
|
||||||
LIBRSYNC_LICENSE = LGPLv2.1+
|
LIBRSYNC_LICENSE = LGPLv2.1+
|
||||||
LIBRSYNC_LICENSE_FILES = COPYING
|
LIBRSYNC_LICENSE_FILES = COPYING
|
||||||
LIBRSYNC_INSTALL_STAGING = YES
|
LIBRSYNC_INSTALL_STAGING = YES
|
||||||
LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
|
LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
$(eval $(cmake-package))
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.0.sha256sum
|
# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.1.sha256sum
|
||||||
sha256 d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5 libsoup-2.56.0.tar.xz
|
sha256 c32a46d77b4da433b51d8fd09a57a44b198e03bdc93e5219afcc687c7948eac3 libsoup-2.56.1.tar.xz
|
||||||
|
# Locally calculated
|
||||||
|
sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBSOUP_VERSION_MAJOR = 2.56
|
LIBSOUP_VERSION_MAJOR = 2.56
|
||||||
LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).0
|
LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1
|
||||||
LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
|
LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
|
||||||
LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
|
LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
|
||||||
LIBSOUP_LICENSE = LGPLv2+
|
LIBSOUP_LICENSE = LGPLv2+
|
||||||
|
|||||||
@@ -1,178 +0,0 @@
|
|||||||
From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
||||||
Date: Tue, 28 Jun 2016 14:22:23 +0200
|
|
||||||
Subject: [PATCH] Fix XPointer paths beginning with range-to
|
|
||||||
|
|
||||||
The old code would invoke the broken xmlXPtrRangeToFunction. range-to
|
|
||||||
isn't really a function but a special kind of location step. Remove
|
|
||||||
this function and always handle range-to in the XPath code.
|
|
||||||
|
|
||||||
The old xmlXPtrRangeToFunction could also be abused to trigger a
|
|
||||||
use-after-free error with the potential for remote code execution.
|
|
||||||
|
|
||||||
Found with afl-fuzz.
|
|
||||||
|
|
||||||
Fixes CVE-2016-5131.
|
|
||||||
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
---
|
|
||||||
Patch status: upstream commit 9ab01a277d7
|
|
||||||
|
|
||||||
result/XPath/xptr/vidbase | 13 ++++++++
|
|
||||||
test/XPath/xptr/vidbase | 1 +
|
|
||||||
xpath.c | 7 ++++-
|
|
||||||
xpointer.c | 76 ++++-------------------------------------------
|
|
||||||
4 files changed, 26 insertions(+), 71 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase
|
|
||||||
index 8b9e92d66d97..f19193e70edb 100644
|
|
||||||
--- a/result/XPath/xptr/vidbase
|
|
||||||
+++ b/result/XPath/xptr/vidbase
|
|
||||||
@@ -17,3 +17,16 @@ Object is a Location Set:
|
|
||||||
To node
|
|
||||||
ELEMENT p
|
|
||||||
|
|
||||||
+
|
|
||||||
+========================
|
|
||||||
+Expression: xpointer(range-to(id('chapter2')))
|
|
||||||
+Object is a Location Set:
|
|
||||||
+1 : Object is a range :
|
|
||||||
+ From node
|
|
||||||
+ /
|
|
||||||
+ To node
|
|
||||||
+ ELEMENT chapter
|
|
||||||
+ ATTRIBUTE id
|
|
||||||
+ TEXT
|
|
||||||
+ content=chapter2
|
|
||||||
+
|
|
||||||
diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase
|
|
||||||
index b1463830570a..884b1065d7fd 100644
|
|
||||||
--- a/test/XPath/xptr/vidbase
|
|
||||||
+++ b/test/XPath/xptr/vidbase
|
|
||||||
@@ -1,2 +1,3 @@
|
|
||||||
xpointer(id('chapter1')/p)
|
|
||||||
xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2]))
|
|
||||||
+xpointer(range-to(id('chapter2')))
|
|
||||||
diff --git a/xpath.c b/xpath.c
|
|
||||||
index d992841ef0c2..5a01b1b399a2 100644
|
|
||||||
--- a/xpath.c
|
|
||||||
+++ b/xpath.c
|
|
||||||
@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) {
|
|
||||||
lc = 1;
|
|
||||||
break;
|
|
||||||
} else if ((NXT(len) == '(')) {
|
|
||||||
- /* Note Type or Function */
|
|
||||||
+ /* Node Type or Function */
|
|
||||||
if (xmlXPathIsNodeType(name)) {
|
|
||||||
#ifdef DEBUG_STEP
|
|
||||||
xmlGenericError(xmlGenericErrorContext,
|
|
||||||
"PathExpr: Type search\n");
|
|
||||||
#endif
|
|
||||||
lc = 1;
|
|
||||||
+#ifdef LIBXML_XPTR_ENABLED
|
|
||||||
+ } else if (ctxt->xptr &&
|
|
||||||
+ xmlStrEqual(name, BAD_CAST "range-to")) {
|
|
||||||
+ lc = 1;
|
|
||||||
+#endif
|
|
||||||
} else {
|
|
||||||
#ifdef DEBUG_STEP
|
|
||||||
xmlGenericError(xmlGenericErrorContext,
|
|
||||||
diff --git a/xpointer.c b/xpointer.c
|
|
||||||
index 676c5105837a..d74174a318f1 100644
|
|
||||||
--- a/xpointer.c
|
|
||||||
+++ b/xpointer.c
|
|
||||||
@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) {
|
|
||||||
ret->here = here;
|
|
||||||
ret->origin = origin;
|
|
||||||
|
|
||||||
- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to",
|
|
||||||
- xmlXPtrRangeToFunction);
|
|
||||||
xmlXPathRegisterFunc(ret, (xmlChar *)"range",
|
|
||||||
xmlXPtrRangeFunction);
|
|
||||||
xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside",
|
|
||||||
@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) {
|
|
||||||
* @nargs: the number of args
|
|
||||||
*
|
|
||||||
* Implement the range-to() XPointer function
|
|
||||||
+ *
|
|
||||||
+ * Obsolete. range-to is not a real function but a special type of location
|
|
||||||
+ * step which is handled in xpath.c.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
-xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) {
|
|
||||||
- xmlXPathObjectPtr range;
|
|
||||||
- const xmlChar *cur;
|
|
||||||
- xmlXPathObjectPtr res, obj;
|
|
||||||
- xmlXPathObjectPtr tmp;
|
|
||||||
- xmlLocationSetPtr newset = NULL;
|
|
||||||
- xmlNodeSetPtr oldset;
|
|
||||||
- int i;
|
|
||||||
-
|
|
||||||
- if (ctxt == NULL) return;
|
|
||||||
- CHECK_ARITY(1);
|
|
||||||
- /*
|
|
||||||
- * Save the expression pointer since we will have to evaluate
|
|
||||||
- * it multiple times. Initialize the new set.
|
|
||||||
- */
|
|
||||||
- CHECK_TYPE(XPATH_NODESET);
|
|
||||||
- obj = valuePop(ctxt);
|
|
||||||
- oldset = obj->nodesetval;
|
|
||||||
- ctxt->context->node = NULL;
|
|
||||||
-
|
|
||||||
- cur = ctxt->cur;
|
|
||||||
- newset = xmlXPtrLocationSetCreate(NULL);
|
|
||||||
-
|
|
||||||
- for (i = 0; i < oldset->nodeNr; i++) {
|
|
||||||
- ctxt->cur = cur;
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Run the evaluation with a node list made of a single item
|
|
||||||
- * in the nodeset.
|
|
||||||
- */
|
|
||||||
- ctxt->context->node = oldset->nodeTab[i];
|
|
||||||
- tmp = xmlXPathNewNodeSet(ctxt->context->node);
|
|
||||||
- valuePush(ctxt, tmp);
|
|
||||||
-
|
|
||||||
- xmlXPathEvalExpr(ctxt);
|
|
||||||
- CHECK_ERROR;
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * The result of the evaluation need to be tested to
|
|
||||||
- * decided whether the filter succeeded or not
|
|
||||||
- */
|
|
||||||
- res = valuePop(ctxt);
|
|
||||||
- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res);
|
|
||||||
- if (range != NULL) {
|
|
||||||
- xmlXPtrLocationSetAdd(newset, range);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Cleanup
|
|
||||||
- */
|
|
||||||
- if (res != NULL)
|
|
||||||
- xmlXPathFreeObject(res);
|
|
||||||
- if (ctxt->value == tmp) {
|
|
||||||
- res = valuePop(ctxt);
|
|
||||||
- xmlXPathFreeObject(res);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- ctxt->context->node = NULL;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * The result is used as the new evaluation set.
|
|
||||||
- */
|
|
||||||
- xmlXPathFreeObject(obj);
|
|
||||||
- ctxt->context->node = NULL;
|
|
||||||
- ctxt->context->contextSize = -1;
|
|
||||||
- ctxt->context->proximityPosition = -1;
|
|
||||||
- valuePush(ctxt, xmlXPtrWrapLocationSet(newset));
|
|
||||||
+xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt,
|
|
||||||
+ int nargs ATTRIBUTE_UNUSED) {
|
|
||||||
+ XP_ERROR(XPATH_EXPR_ERROR);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
||||||
@@ -1,253 +0,0 @@
|
|||||||
From c1d1f7121194036608bf555f08d3062a36fd344b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Nick Wellnhofer <wellnhofer@aevum.de>
|
|
||||||
Date: Tue, 28 Jun 2016 18:34:52 +0200
|
|
||||||
Subject: [PATCH] Disallow namespace nodes in XPointer ranges
|
|
||||||
|
|
||||||
Namespace nodes must be copied to avoid use-after-free errors.
|
|
||||||
But they don't necessarily have a physical representation in a
|
|
||||||
document, so simply disallow them in XPointer ranges.
|
|
||||||
|
|
||||||
Found with afl-fuzz.
|
|
||||||
|
|
||||||
Fixes CVE-2016-4658.
|
|
||||||
|
|
||||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
||||||
---
|
|
||||||
Patch status: upstream commit c1d1f712119403
|
|
||||||
|
|
||||||
xpointer.c | 149 +++++++++++++++++++++++--------------------------------------
|
|
||||||
1 file changed, 56 insertions(+), 93 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xpointer.c b/xpointer.c
|
|
||||||
index a7b03fbdae16..694d120e2e0b 100644
|
|
||||||
--- a/xpointer.c
|
|
||||||
+++ b/xpointer.c
|
|
||||||
@@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
+ * xmlXPtrNewRangeInternal:
|
|
||||||
+ * @start: the starting node
|
|
||||||
+ * @startindex: the start index
|
|
||||||
+ * @end: the ending point
|
|
||||||
+ * @endindex: the ending index
|
|
||||||
+ *
|
|
||||||
+ * Internal function to create a new xmlXPathObjectPtr of type range
|
|
||||||
+ *
|
|
||||||
+ * Returns the newly created object.
|
|
||||||
+ */
|
|
||||||
+static xmlXPathObjectPtr
|
|
||||||
+xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex,
|
|
||||||
+ xmlNodePtr end, int endindex) {
|
|
||||||
+ xmlXPathObjectPtr ret;
|
|
||||||
+
|
|
||||||
+ /*
|
|
||||||
+ * Namespace nodes must be copied (see xmlXPathNodeSetDupNs).
|
|
||||||
+ * Disallow them for now.
|
|
||||||
+ */
|
|
||||||
+ if ((start != NULL) && (start->type == XML_NAMESPACE_DECL))
|
|
||||||
+ return(NULL);
|
|
||||||
+ if ((end != NULL) && (end->type == XML_NAMESPACE_DECL))
|
|
||||||
+ return(NULL);
|
|
||||||
+
|
|
||||||
+ ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
+ if (ret == NULL) {
|
|
||||||
+ xmlXPtrErrMemory("allocating range");
|
|
||||||
+ return(NULL);
|
|
||||||
+ }
|
|
||||||
+ memset(ret, 0, sizeof(xmlXPathObject));
|
|
||||||
+ ret->type = XPATH_RANGE;
|
|
||||||
+ ret->user = start;
|
|
||||||
+ ret->index = startindex;
|
|
||||||
+ ret->user2 = end;
|
|
||||||
+ ret->index2 = endindex;
|
|
||||||
+ return(ret);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/**
|
|
||||||
* xmlXPtrNewRange:
|
|
||||||
* @start: the starting node
|
|
||||||
* @startindex: the start index
|
|
||||||
@@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex,
|
|
||||||
if (endindex < 0)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start;
|
|
||||||
- ret->index = startindex;
|
|
||||||
- ret->user2 = end;
|
|
||||||
- ret->index2 = endindex;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
@@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) {
|
|
||||||
if (end->type != XPATH_POINT)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start->user;
|
|
||||||
- ret->index = start->index;
|
|
||||||
- ret->user2 = end->user;
|
|
||||||
- ret->index2 = end->index;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user,
|
|
||||||
+ end->index);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
@@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) {
|
|
||||||
if (start->type != XPATH_POINT)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start->user;
|
|
||||||
- ret->index = start->index;
|
|
||||||
- ret->user2 = end;
|
|
||||||
- ret->index2 = -1;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
@@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) {
|
|
||||||
if (end->type != XPATH_POINT)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start;
|
|
||||||
- ret->index = -1;
|
|
||||||
- ret->user2 = end->user;
|
|
||||||
- ret->index2 = end->index;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
@@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) {
|
|
||||||
if (end == NULL)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start;
|
|
||||||
- ret->index = -1;
|
|
||||||
- ret->user2 = end;
|
|
||||||
- ret->index2 = -1;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start, -1, end, -1);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
@@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) {
|
|
||||||
if (start == NULL)
|
|
||||||
return(NULL);
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start;
|
|
||||||
- ret->index = -1;
|
|
||||||
- ret->user2 = NULL;
|
|
||||||
- ret->index2 = -1;
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) {
|
|
||||||
*/
|
|
||||||
xmlXPathObjectPtr
|
|
||||||
xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) {
|
|
||||||
+ xmlNodePtr endNode;
|
|
||||||
+ int endIndex;
|
|
||||||
xmlXPathObjectPtr ret;
|
|
||||||
|
|
||||||
if (start == NULL)
|
|
||||||
@@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) {
|
|
||||||
return(NULL);
|
|
||||||
switch (end->type) {
|
|
||||||
case XPATH_POINT:
|
|
||||||
+ endNode = end->user;
|
|
||||||
+ endIndex = end->index;
|
|
||||||
+ break;
|
|
||||||
case XPATH_RANGE:
|
|
||||||
+ endNode = end->user2;
|
|
||||||
+ endIndex = end->index2;
|
|
||||||
break;
|
|
||||||
case XPATH_NODESET:
|
|
||||||
/*
|
|
||||||
@@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) {
|
|
||||||
*/
|
|
||||||
if (end->nodesetval->nodeNr <= 0)
|
|
||||||
return(NULL);
|
|
||||||
+ endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1];
|
|
||||||
+ endIndex = -1;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* TODO */
|
|
||||||
return(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject));
|
|
||||||
- if (ret == NULL) {
|
|
||||||
- xmlXPtrErrMemory("allocating range");
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
- memset(ret, 0 , (size_t) sizeof(xmlXPathObject));
|
|
||||||
- ret->type = XPATH_RANGE;
|
|
||||||
- ret->user = start;
|
|
||||||
- ret->index = -1;
|
|
||||||
- switch (end->type) {
|
|
||||||
- case XPATH_POINT:
|
|
||||||
- ret->user2 = end->user;
|
|
||||||
- ret->index2 = end->index;
|
|
||||||
- break;
|
|
||||||
- case XPATH_RANGE:
|
|
||||||
- ret->user2 = end->user2;
|
|
||||||
- ret->index2 = end->index2;
|
|
||||||
- break;
|
|
||||||
- case XPATH_NODESET: {
|
|
||||||
- ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1];
|
|
||||||
- ret->index2 = -1;
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- default:
|
|
||||||
- STRANGE
|
|
||||||
- return(NULL);
|
|
||||||
- }
|
|
||||||
+ ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex);
|
|
||||||
xmlXPtrRangeCheckOrder(ret);
|
|
||||||
return(ret);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.10.2
|
|
||||||
|
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
# Locally calculated after checking pgp signature
|
# Locally calculated after checking pgp signature
|
||||||
sha256 ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c libxml2-2.9.4.tar.gz
|
sha256 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38 libxml2-2.9.5.tar.gz
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
LIBXML2_VERSION = 2.9.4
|
LIBXML2_VERSION = 2.9.5
|
||||||
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
|
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
|
||||||
LIBXML2_INSTALL_STAGING = YES
|
LIBXML2_INSTALL_STAGING = YES
|
||||||
LIBXML2_LICENSE = MIT
|
LIBXML2_LICENSE = MIT
|
||||||
|
|||||||
@@ -28,12 +28,12 @@ choice
|
|||||||
|
|
||||||
config BR2_KERNEL_HEADERS_3_2
|
config BR2_KERNEL_HEADERS_3_2
|
||||||
bool "Linux 3.2.x kernel headers"
|
bool "Linux 3.2.x kernel headers"
|
||||||
depends on !BR2_arc && !BR2_nios2
|
depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
|
||||||
|
|
||||||
config BR2_KERNEL_HEADERS_3_4
|
config BR2_KERNEL_HEADERS_3_4
|
||||||
bool "Linux 3.4.x kernel headers"
|
bool "Linux 3.4.x kernel headers"
|
||||||
depends on !BR2_arc && !BR2_nios2
|
depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
|
||||||
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||||
|
|
||||||
config BR2_KERNEL_HEADERS_3_10
|
config BR2_KERNEL_HEADERS_3_10
|
||||||
@@ -214,15 +214,15 @@ endchoice
|
|||||||
|
|
||||||
config BR2_DEFAULT_KERNEL_HEADERS
|
config BR2_DEFAULT_KERNEL_HEADERS
|
||||||
string
|
string
|
||||||
default "3.2.91" if BR2_KERNEL_HEADERS_3_2
|
default "3.2.93" if BR2_KERNEL_HEADERS_3_2
|
||||||
default "3.4.113" if BR2_KERNEL_HEADERS_3_4
|
default "3.4.113" if BR2_KERNEL_HEADERS_3_4
|
||||||
default "3.10.107" if BR2_KERNEL_HEADERS_3_10
|
default "3.10.107" if BR2_KERNEL_HEADERS_3_10
|
||||||
default "3.12.74" if BR2_KERNEL_HEADERS_3_12
|
default "3.12.74" if BR2_KERNEL_HEADERS_3_12
|
||||||
default "3.18.61" if BR2_KERNEL_HEADERS_3_18
|
default "3.18.71" if BR2_KERNEL_HEADERS_3_18
|
||||||
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
||||||
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
||||||
default "4.1.42" if BR2_KERNEL_HEADERS_4_1
|
default "4.1.44" if BR2_KERNEL_HEADERS_4_1
|
||||||
default "4.4.78" if BR2_KERNEL_HEADERS_4_4
|
default "4.4.88" if BR2_KERNEL_HEADERS_4_4
|
||||||
default "4.8.17" if BR2_KERNEL_HEADERS_4_8
|
default "4.8.17" if BR2_KERNEL_HEADERS_4_8
|
||||||
default "4.9.39" if BR2_KERNEL_HEADERS_4_9
|
default "4.9.51" if BR2_KERNEL_HEADERS_4_9
|
||||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||||
|
|||||||
@@ -15,13 +15,13 @@ define GPIO_BUILD_CMDS
|
|||||||
exit 1 ; \
|
exit 1 ; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
|
$(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools \
|
||||||
$(GPIO_MAKE_OPTS) \
|
$(GPIO_MAKE_OPTS) \
|
||||||
gpio
|
gpio
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define GPIO_INSTALL_TARGET_CMDS
|
define GPIO_INSTALL_TARGET_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
|
$(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools \
|
||||||
$(GPIO_MAKE_OPTS) \
|
$(GPIO_MAKE_OPTS) \
|
||||||
DESTDIR=$(TARGET_DIR) \
|
DESTDIR=$(TARGET_DIR) \
|
||||||
gpio_install
|
gpio_install
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
add lua.pc
|
add lua.pc
|
||||||
|
|
||||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||||
|
[Jörg Krause: add @MYLIBS@]
|
||||||
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||||
|
|
||||||
Index: b/etc/lua.pc
|
Index: b/etc/lua.pc
|
||||||
===================================================================
|
===================================================================
|
||||||
@@ -34,7 +36,7 @@ Index: b/etc/lua.pc
|
|||||||
+Description: An Extensible Extension Language
|
+Description: An Extensible Extension Language
|
||||||
+Version: ${R}
|
+Version: ${R}
|
||||||
+Requires:
|
+Requires:
|
||||||
+Libs: -L${libdir} -llua -lm
|
+Libs: -L${libdir} -llua -lm @MYLIBS@
|
||||||
+Cflags: -I${includedir}
|
+Cflags: -I${includedir}
|
||||||
+
|
+
|
||||||
+# (end of lua.pc)
|
+# (end of lua.pc)
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
add lua.pc
|
add lua.pc
|
||||||
|
|
||||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||||
|
[Jörg Krause: add @MYLIBS@]
|
||||||
|
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||||
|
|
||||||
Index: b/etc/lua.pc
|
Index: b/etc/lua.pc
|
||||||
===================================================================
|
===================================================================
|
||||||
@@ -34,7 +36,7 @@ Index: b/etc/lua.pc
|
|||||||
+Description: An Extensible Extension Language
|
+Description: An Extensible Extension Language
|
||||||
+Version: ${R}
|
+Version: ${R}
|
||||||
+Requires:
|
+Requires:
|
||||||
+Libs: -L${libdir} -llua -lm
|
+Libs: -L${libdir} -llua -lm @MYLIBS@
|
||||||
+Cflags: -I${includedir}
|
+Cflags: -I${includedir}
|
||||||
+
|
+
|
||||||
+# (end of lua.pc)
|
+# (end of lua.pc)
|
||||||
|
|||||||
@@ -86,8 +86,9 @@ endef
|
|||||||
|
|
||||||
define LUA_INSTALL_STAGING_CMDS
|
define LUA_INSTALL_STAGING_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
|
||||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
|
||||||
$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
|
||||||
|
> $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define LUA_INSTALL_TARGET_CMDS
|
define LUA_INSTALL_TARGET_CMDS
|
||||||
@@ -96,8 +97,9 @@ endef
|
|||||||
|
|
||||||
define HOST_LUA_INSTALL_CMDS
|
define HOST_LUA_INSTALL_CMDS
|
||||||
$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
|
$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
|
||||||
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
|
mkdir -p $(HOST_DIR)/usr/lib/pkgconfig/
|
||||||
$(HOST_DIR)/usr/lib/pkgconfig/lua.pc
|
sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
|
||||||
|
> $(HOST_DIR)/lib/pkgconfig/lua.pc
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(generic-package))
|
$(eval $(generic-package))
|
||||||
|
|||||||
@@ -1,2 +1,6 @@
|
|||||||
# From https://downloads.mariadb.org/mariadb/10.1.23/
|
# From https://downloads.mariadb.org/mariadb/10.1.26/
|
||||||
sha256 54d8114e24bfa5e3ebdc7d69e071ad1471912847ea481b227d204f9d644300bf mariadb-10.1.23.tar.gz
|
sha256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d mariadb-10.1.26.tar.gz
|
||||||
|
|
||||||
|
# Hash for license files
|
||||||
|
sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README
|
||||||
|
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MARIADB_VERSION = 10.1.23
|
MARIADB_VERSION = 10.1.26
|
||||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||||
MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
|
MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
|
||||||
# Tarball no longer contains LGPL license text
|
# Tarball no longer contains LGPL license text
|
||||||
@@ -67,6 +67,8 @@ MARIADB_CONF_OPTS += \
|
|||||||
-DMYSQL_DATADIR=/var/lib/mysql \
|
-DMYSQL_DATADIR=/var/lib/mysql \
|
||||||
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
|
-DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET)
|
||||||
|
|
||||||
|
HOST_MARIADB_CONF_OPTS += -DWITH_SSL=bundled
|
||||||
|
|
||||||
# Some helpers must be compiled for host in order to crosscompile mariadb for
|
# Some helpers must be compiled for host in order to crosscompile mariadb for
|
||||||
# the target. They are then included by import_executables.cmake which is
|
# the target. They are then included by import_executables.cmake which is
|
||||||
# generated during the build of the host helpers. It is not necessary to build
|
# generated during the build of the host helpers. It is not necessary to build
|
||||||
|
|||||||
@@ -1,2 +1,5 @@
|
|||||||
# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.4.2-2.1.7-and-1.3.19-released
|
# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.6.0-2.1.9-and-1.3.21-released
|
||||||
sha256 17dd98af7478aadacc480c7e4159e447353b5b2037c1b6d48ed4fd157fb1b018 mbedtls-2.4.2-apache.tgz
|
sha1 e914288da50977f541773f9d36e26f14926594a5 mbedtls-2.6.0-apache.tgz
|
||||||
|
sha256 99bc9d4212d3d885eeb96273bcde8ecc649a481404b8d7ea7bb26397c9909687 mbedtls-2.6.0-apache.tgz
|
||||||
|
# Locally calculated
|
||||||
|
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 apache-2.0.txt
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MBEDTLS_SITE = https://tls.mbed.org/code/releases
|
MBEDTLS_SITE = https://tls.mbed.org/code/releases
|
||||||
MBEDTLS_VERSION = 2.4.2
|
MBEDTLS_VERSION = 2.6.0
|
||||||
MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
|
MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
|
||||||
MBEDTLS_CONF_OPTS = \
|
MBEDTLS_CONF_OPTS = \
|
||||||
-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
|
-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
From 26f884bf977977041fe6f98a0af186be1580bf22 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Simon Morlat <simon.morlat@linphone.org>
|
||||||
|
Date: Thu, 29 Sep 2016 15:26:18 +0200
|
||||||
|
Subject: [PATCH] fix compilation issue with latest bctoobox
|
||||||
|
|
||||||
|
[Upstream commit https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22]
|
||||||
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||||
|
---
|
||||||
|
configure.ac | 2 +-
|
||||||
|
src/crypto/dtls_srtp.c | 2 +-
|
||||||
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 7ab20a08f..244d87275 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1116,7 +1116,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
dnl check bctoolbox library
|
||||||
|
-PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.0.0, found_bctoolbox=true, found_bctoolbox=false)
|
||||||
|
+PKG_CHECK_MODULES(BCTOOLBOX, bctoolbox >= 0.4.0, found_bctoolbox=true, found_bctoolbox=false)
|
||||||
|
if test "$found_bctoolbox" = "true" ; then
|
||||||
|
LIBS="$LIBS $BCTOOLBOX_LIBS"
|
||||||
|
CFLAGS="$CFLAGS $BCTOOLBOX_CFLAGS"
|
||||||
|
diff --git a/src/crypto/dtls_srtp.c b/src/crypto/dtls_srtp.c
|
||||||
|
index e2c8e1c44..fd37eb5cb 100644
|
||||||
|
--- a/src/crypto/dtls_srtp.c
|
||||||
|
+++ b/src/crypto/dtls_srtp.c
|
||||||
|
@@ -705,7 +705,7 @@ static int ms_dtls_srtp_initialise_bctbx_dtls_context(DtlsBcToolBoxContext *dtls
|
||||||
|
bctbx_ssl_config_set_authmode(dtlsContext->ssl_config, BCTBX_SSL_VERIFY_OPTIONAL);
|
||||||
|
bctbx_ssl_config_set_own_cert( dtlsContext->ssl_config, dtlsContext->crt, dtlsContext->pkey );
|
||||||
|
/* This is useless as peer would certainly be a self signed certificate and we won't verify it but avoid runtime warnings */
|
||||||
|
- bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt, NULL);
|
||||||
|
+ bctbx_ssl_config_set_ca_chain(dtlsContext->ssl_config, dtlsContext->crt);
|
||||||
|
|
||||||
|
/* we are not ready yet to actually start the ssl context, this will be done by calling bctbx_ssl_setup when stream starts */
|
||||||
|
return 0;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user