jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-24 13:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate buildroot 2019.02.9

Browse Source
This commit is contained in:
Pascal Vizeli 2020-01-13 13:52:18 +00:00
parent ed1574306a
commit acc0758a5b
137 changed files with 898 additions and 1178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
buildroot-patches/0001-Docker-AppArmor-support.patch Normal file
View File

@ -0,0 +1,53 @@
From a874e0babaeefacd8e3d04a9c056dd6f1121307d Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 13 Jan 2020 12:27:06 +0000
Subject: [PATCH 1/1] Docker: AppArmor support
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/docker-containerd/docker-containerd.mk | 1 +
package/docker-engine/docker-engine.mk | 2 +-
package/runc/runc.mk | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 69068e44f8..4dc0ef4672 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+DOCKER_CONTAINERD_TAGS = apparmor
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 24022f7107..14673f3183 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
-X main.Version=$(DOCKER_ENGINE_VERSION)
-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index acf61ab160..3432dd5fe0 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace
RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
-RUNC_TAGS = cgo static_build
+RUNC_TAGS = cgo static_build apparmor
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
RUNC_TAGS += seccomp
--
2.17.1

44
buildroot-patches/0001-docker-containerd-bump-to-v1.2.7.patch
View File

@ -1,44 +0,0 @@
From 9759621540997500a9dc0163506a8eac1e4769cc Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 26 Jun 2019 09:57:05 +0000
Subject: [PATCH 1/1] docker-containerd: bump to v1.2.7
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/docker-containerd/docker-containerd.hash | 2 +-
package/docker-containerd/docker-containerd.mk | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index 525191c651..163a519d36 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@
# Computed locally
-sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 docker-containerd-v1.2.6.tar.gz
+sha256 7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801 docker-containerd-v1.2.7.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index c67b36e7dc..4c0877ecd1 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = v1.2.6
+DOCKER_CONTAINERD_VERSION = v1.2.7
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+DOCKER_CONTAINERD_TAGS = apparmor
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
--
2.17.1

41
buildroot-patches/0002-Docker-tini-static.patch Normal file
View File

@ -0,0 +1,41 @@
From 81bf3979ac5aec0dd8d4bccc690fe1bcef5de139 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 13 Jan 2020 12:30:48 +0000
Subject: [PATCH 1/1] Docker: tini & static
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/docker-engine/docker-engine.mk | 6 ++++++
package/tini/tini.mk | 1 +
2 files changed, 7 insertions(+)
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index 14673f3183..b0eaae9580 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -82,4 +82,10 @@ define DOCKER_ENGINE_USERS
- - docker -1 * - - - Docker Application Container Framework
endef
+define DOCKER_ENGINE_INSTALL_SYMLINKS
+ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init
+endef
+
+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS
+
$(eval $(golang-package))
diff --git a/package/tini/tini.mk b/package/tini/tini.mk
index 132bfc99dd..b6d7d80b22 100644
--- a/package/tini/tini.mk
+++ b/package/tini/tini.mk
@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE
TINI_CFLAGS = $(TARGET_CFLAGS) \
-DTINI_VERSION=\"$(TINI_VERSION)\" \
-DTINI_GIT=\"\"
+TINI_CFLAGS += -static
ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
TINI_CFLAGS += -DTINI_MINIMAL
--
2.17.1

26
buildroot-patches/0002-runc-add-AppArmor.patch
View File

@ -1,26 +0,0 @@
From 021395083b5829c4fd00bebcdc7d38c2acd7232d Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Wed, 26 Jun 2019 10:00:31 +0000
Subject: [PATCH 1/1] runc: add AppArmor
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/runc/runc.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index 55097e5a17..31da4fae58 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -13,7 +13,7 @@ RUNC_WORKSPACE = Godeps/_workspace
RUNC_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
-RUNC_TAGS = cgo static_build
+RUNC_TAGS = cgo static_build apparmor
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
RUNC_TAGS += seccomp
--
2.17.1

37
buildroot-patches/0003-docker-engine-add-AppArmor-support.patch
View File

@ -1,37 +0,0 @@
From 93c43e8572d374edbea8521f63c071a0a5cb1098 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Thu, 3 Jan 2019 19:54:57 +0000
Subject: [PATCH 1/1] docker-engine: add AppArmor support
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/docker-engine/docker-engine.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk
index f19c1d9..9ecfd10 100644
--- a/package/docker-engine/docker-engine.mk
+++ b/package/docker-engine/docker-engine.mk
@@ -17,7 +17,7 @@ DOCKER_ENGINE_LDFLAGS = \
-X main.GitCommit=$(DOCKER_ENGINE_VERSION) \
-X main.Version=$(DOCKER_ENGINE_VERSION)
-DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen
+DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen apparmor
DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
@@ -77,4 +77,10 @@ define DOCKER_ENGINE_USERS
- - docker -1 * - - - Docker Application Container Framework
endef
+define DOCKER_ENGINE_INSTALL_SYMLINKS
+ ln -fs tini $(TARGET_DIR)/usr/bin/docker-init
+endef
+
+DOCKER_ENGINE_POST_INSTALL_TARGET_HOOKS += DOCKER_ENGINE_INSTALL_SYMLINKS
+
$(eval $(golang-package))
--
2.17.1

0
buildroot-patches/0004-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch → buildroot-patches/0003-rpi-firmware-Bump-firmware-for-kernel-4.19-RPi4.patch
View File

0
buildroot-patches/0005-network-manager-Bump-version-1.16.2.patch → buildroot-patches/0004-network-manager-Bump-version-1.16.2.patch
View File

0
buildroot-patches/0006-Fix-dhcp-client.patch → buildroot-patches/0005-Fix-dhcp-client.patch
View File

0
buildroot-patches/0007-rpi-use-latest-wifi-driver.patch → buildroot-patches/0006-rpi-use-latest-wifi-driver.patch
View File

0
buildroot-patches/0009-odroid-ux4-firmware.patch → buildroot-patches/0007-odroid-ux4-firmware.patch
View File

0
buildroot-patches/0010-Bump-bluez-5.52.patch → buildroot-patches/0008-Bump-bluez-5.52.patch
View File

25
buildroot-patches/0008-tini-make-static-for-docker.patch
View File

@ -1,25 +0,0 @@
From e757b263a4f3ff67e69ae6cc6abdaa83039bf6b6 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 27 Nov 2018 20:31:33 +0000
Subject: [PATCH 1/1] tini: make static for docker
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
package/tini/tini.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/tini/tini.mk b/package/tini/tini.mk
index 132bfc9..b6d7d80 100644
--- a/package/tini/tini.mk
+++ b/package/tini/tini.mk
@@ -12,6 +12,7 @@ TINI_LICENSE_FILES = LICENSE
TINI_CFLAGS = $(TARGET_CFLAGS) \
-DTINI_VERSION=\"$(TINI_VERSION)\" \
-DTINI_GIT=\"\"
+TINI_CFLAGS += -static
ifeq ($(BR2_PACKAGE_TINI_MINIMAL),y)
TINI_CFLAGS += -DTINI_MINIMAL
--
2.17.1

23
buildroot/CHANGES
View File

@ -1,3 +1,26 @@
2019.02.9, released January 12th, 2020
Important / security related fixes.
pkg-python infrastructure: Ensure correct compiler and linker
flags are used for compiled code
utils/scanpypi: Remind users to update DEVELOPERS
Updated/fixed packages: busybox, cc-tool, cpio, cups, dante,
dillo, docker-cli, docker-containerd, docker-engine, easy-rsa,
ecryptfs-utils, efl, git, glibc, gnupg2, gst1-plugins-bad,
kf5-kcoreaddons, libarchive, libgit2, libkrb5, librsvg,
libssh, libtomcrypt, libuio, lirc-tools, lvm2,
matchbox-desktop, nodejs, ntp, opencv3, openpowerlink,
python-django, python-ecdsa, python-pyasn-modules,
python-pyqt5, python-subprocess32, python3, qpdf, runc, rygel,
samba4, sdl2, wavpack, xserver_xorg-server, zip
Issues resolved (http://bugs.uclibc.org):
#12121: PyQt5.QtSerialPort and other modules not being built
2019.02.8, released December 7th, 2019
Important / security related fixes.

4
buildroot/Makefile
View File

@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2019.02.8
export BR2_VERSION := 2019.02.9
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1575746000
BR2_VERSION_EPOCH = 1578842000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)

8
buildroot/docs/manual/adding-packages-generic.txt
View File

@ -358,9 +358,11 @@ not and can not work as people would expect it should:
* +LIBFOO_DEPENDENCIES+ lists the dependencies (in terms of package
name) that are required for the current target package to
compile. These dependencies are guaranteed to be compiled and
installed before the configuration of the current package starts. In
a similar way, +HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for
the current host package.
installed before the configuration of the current package starts.
However, modifications to configuration of these dependencies will
not force a rebuild of the current package. In a similar way,
+HOST_LIBFOO_DEPENDENCIES+ lists the dependencies for the current
host package.
* +LIBFOO_EXTRACT_DEPENDENCIES+ lists the dependencies (in terms of
package name) that are required for the current target package to be

38
buildroot/docs/manual/manual.html
View File

File diff suppressed because one or more lines are too long

BIN
buildroot/docs/manual/manual.pdf
View File

Binary file not shown.

21
buildroot/docs/manual/manual.text
View File

@ -161,13 +161,13 @@ List of Examples
---------------------------------------------------------------------
Buildroot 2019.02.8 manual generated on 2019-12-07 19:24:23 UTC from
git revision aaa1437b11
Buildroot 2019.02.9 manual generated on 2020-01-12 15:28:51 UTC from
git revision 24f25c8d23
The Buildroot manual is written by the Buildroot developers. It is
licensed under the GNU General Public License, version 2. Refer to
the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
aaa1437b110f886ee24757595542f715a77d702a] file in the Buildroot
24f25c8d23bd85d57b6e9c776f2c7716f2ddd4af] file in the Buildroot
sources for the full text of this license.
Copyright © 2004-2019 The Buildroot developers
@ -1197,6 +1197,15 @@ can help you understand how to work with Buildroot:
overlay, a post-build script or a post-image script are made,
there is no need for a full rebuild: a simple make invocation
will take the changes into account.
* When a package listed in FOO_DEPENDENCIES is rebuilt or removed,
the package foo is not automatically rebuilt. For example, if a
package bar is listed in FOO_DEPENDENCIES with FOO_DEPENDENCIES =
bar and the configuration of the bar package is changed, the
configuration change would not result in a rebuild of package foo
automatically. In this scenario, you may need to either rebuild
any packages in your build which reference bar in their
DEPENDENCIES, or perform a full rebuild to ensure any bar
dependent packages are up to date.
Generally speaking, when you’re facing a build error and you’re
unsure of the potential consequences of the configuration changes
@ -4369,8 +4378,10 @@ information is (assuming the package name is libfoo) :
name) that are required for the current target package to
compile. These dependencies are guaranteed to be compiled and
installed before the configuration of the current package starts.
In a similar way, HOST_LIBFOO_DEPENDENCIES lists the dependencies
for the current host package.
However, modifications to configuration of these dependencies
will not force a rebuild of the current package. In a similar
way, HOST_LIBFOO_DEPENDENCIES lists the dependencies for the
current host package.
* LIBFOO_EXTRACT_DEPENDENCIES lists the dependencies (in terms of
package name) that are required for the current target package to
be extracted. These dependencies are guaranteed to be compiled

10
buildroot/docs/manual/rebuilding-packages.txt
View File

@ -65,6 +65,16 @@ can help you understand how to work with Buildroot:
there is no need for a full rebuild: a simple +make+ invocation
will take the changes into account.
* When a package listed in +FOO_DEPENDENCIES+ is rebuilt or removed,
the package +foo+ is not automatically rebuilt. For example, if a
package +bar+ is listed in +FOO_DEPENDENCIES+ with +FOO_DEPENDENCIES
= bar+ and the configuration of the +bar+ package is changed, the
configuration change would not result in a rebuild of package +foo+
automatically. In this scenario, you may need to either rebuild any
packages in your build which reference +bar+ in their +DEPENDENCIES+,
or perform a full rebuild to ensure any +bar+ dependent packages are
up to date.
Generally speaking, when you're facing a build error and you're unsure
of the potential consequences of the configuration changes you've
made, do a full rebuild. If you get the same build error, then you are

2
buildroot/linux/Config.in
View File

@ -122,7 +122,7 @@ endif
config BR2_LINUX_KERNEL_VERSION
string
default "4.19.88" if BR2_LINUX_KERNEL_LATEST_VERSION
default "4.19.94" if BR2_LINUX_KERNEL_LATEST_VERSION
default "v4.4.176-cip31" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
if BR2_LINUX_KERNEL_CUSTOM_VERSION

8
buildroot/linux/linux.hash
View File

@ -1,6 +1,6 @@
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
sha256 d011245629b980d4c15febf080b54804aaf215167b514a3577feddb2495f8a3e linux-4.20.17.tar.xz
sha256 5da5e16fe08fa506f8f74aa4f17be22b52c0f513e9a3f7e7ae22fc53597ad493 linux-4.4.206.tar.xz
sha256 1df27899a9bc4dd874f3830ab9e7b638f0026dffd67a2e230444e5d2805ccad6 linux-4.9.206.tar.xz
sha256 0d49ec72e273f6fc7462ad56849b2285f13fd5f4185e8f932a0074fc2eca1bb3 linux-4.14.158.tar.xz
sha256 c1923b6bd166e6dd07be860c15f59e8273aaa8692bc2a1fce1d31b826b9b3fbe linux-4.19.88.tar.xz
sha256 5899ff2a85e2b84607148349fd8e646f94399655caf0e4e55d1eb0567e48520e linux-4.4.208.tar.xz
sha256 b7ad1c9841d671d026c55a4c91c77205f8b488ca5f980f838591c68662e0525a linux-4.9.208.tar.xz
sha256 eb29cc9cfd54158789064b3d6e5b3eab108facec048b8d405a63e9863329b049 linux-4.14.163.tar.xz
sha256 c62a10a75a7c4213e41287040e7c7509b7d42117d6830feb7dfe505949fa7467 linux-4.19.94.tar.xz

4
buildroot/package/busybox/busybox.mk
View File

@ -262,7 +262,9 @@ endif
ifeq ($(BR2_INIT_BUSYBOX),y)
define BUSYBOX_INSTALL_INITTAB
$(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab
if test ! -e $(TARGET_DIR)/etc/inittab; then \
$(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab; \
fi
endef
endif

3
buildroot/package/cc-tool/cc-tool.hash
View File

@ -1,3 +1,6 @@
# From http://sourceforge.net/projects/cctool/files/
sha1 f313e55f019ea5338438633f5b5e689b699343e1 cc-tool-0.26-src.tgz
md5 26960676f3e6264e612c299fbf8ec5ea cc-tool-0.26-src.tgz
# Hash for license file
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING

51
buildroot/package/cpio/0001-fix-CVE-2016-2037.patch
View File

@ -1,51 +0,0 @@
From: Pavel Raiskup
Subject: [Bug-cpio] [PATCH] fix 1-byte out-of-bounds write
Date: Tue, 26 Jan 2016 23:17:54 +0100
Other calls to cpio_safer_name_suffix seem to be safe.
* src/copyin.c (process_copy_in): Make sure that file_hdr.c_name
has at least two bytes allocated.
* src/util.c (cpio_safer_name_suffix): Document that use of this
function requires to be careful.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Patch status: fetched/submitted
URL: https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html
src/copyin.c | 2 ++
src/util.c | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/copyin.c b/src/copyin.c
index cde911e..032d35f 100644
--- a/src/copyin.c
+++ b/src/copyin.c
@@ -1385,6 +1385,8 @@ process_copy_in ()
break;
}
+ if (file_hdr.c_namesize <= 1)
+ file_hdr.c_name = xrealloc(file_hdr.c_name, 2);
cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
false);
diff --git a/src/util.c b/src/util.c
index 6ff6032..2763ac1 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1411,7 +1411,10 @@ set_file_times (int fd,
}
/* Do we have to ignore absolute paths, and if so, does the filename
- have an absolute path? */
+ have an absolute path?
+ Before calling this function make sure that the allocated NAME buffer has
+ capacity at least 2 bytes to allow us to store the "." string inside. */
+
void
cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names,
bool strip_leading_dots)
--
2.5.0

7
buildroot/package/cpio/cpio.hash
View File

@ -1,2 +1,7 @@
# From https://lists.gnu.org/archive/html/info-gnu/2019-11/msg00002.html
md5 f3438e672e3fa273a7dc26339dd1eed6 cpio-2.13.tar.bz2
sha1 4dcefc0e1bc36b11506a354768d82b15e3fe6bb8 cpio-2.13.tar.bz2
# Locally calculated after checking pgp signature
sha256 08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73 cpio-2.12.tar.gz
sha256 eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d cpio-2.13.tar.bz2
# Locally calculated
sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7 COPYING

3
buildroot/package/cpio/cpio.mk
View File

@ -4,7 +4,8 @@
#
################################################################################
CPIO_VERSION = 2.12
CPIO_VERSION = 2.13
CPIO_SOURCE = cpio-$(CPIO_VERSION).tar.bz2
CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
CPIO_CONF_OPTS = --bindir=/bin
CPIO_LICENSE = GPL-3.0+

2
buildroot/package/cups/cups.hash
View File

@ -1,3 +1,3 @@
# Locally calculated:
sha256 0f61ab449e4748a24c6ab355b481ff7691247a140d327b2b7526fce34b7f9aa8 cups-2.2.12-source.tar.gz
sha256 da375796e5e7ab6d31a853d0e5326486d41d10d42bbff9ec768b0cea85031b48 cups-2.2.13-source.tar.gz
sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c LICENSE.txt

2
buildroot/package/cups/cups.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
CUPS_VERSION = 2.2.12
CUPS_VERSION = 2.2.13
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
CUPS_LICENSE = GPL-2.0, LGPL-2.0

2
buildroot/package/dante/dante.mk
View File

@ -12,7 +12,7 @@ DANTE_LICENSE_FILES = LICENSE
# 0002-compiler.m4-do-not-remove-g-flag.patch touches a m4 file
DANTE_AUTORECONF = YES
DANTE_CONF_OPTS += --disable-client --disable-preload --without-pam
DANTE_CONF_OPTS += --disable-client --disable-preload
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
DANTE_DEPENDENCIES += linux-pam

29
buildroot/package/dillo/0003-Fix-openssl-detection.patch Normal file
View File

@ -0,0 +1,29 @@
From 96dde9dedf806256cdc6cbf5cacbd5c8d74e6288 Mon Sep 17 00:00:00 2001
From: Jonathan Kimmitt <jrrk2@cam.ac.uk>
Date: Thu, 9 Jan 2020 22:01:42 +0100
Subject: [PATCH] Fix openssl detection
SSL_library_init is now a define, use OPENSSL_init_ssl instead.
Signed-off-by: Jonathan Kimmitt <jrrk2@cam.ac.uk>
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 66b5e9f..206fd53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,7 @@ if test "x$enable_ssl" = "xyes"; then
if test "x$ssl_ok" = "xyes"; then
old_libs="$LIBS"
- AC_CHECK_LIB(ssl, SSL_library_init, ssl_ok=yes, ssl_ok=no, -lcrypto)
+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, ssl_ok=yes, ssl_ok=no, -lcrypto)
LIBS="$old_libs"
fi
--
2.24.1

33
buildroot/package/dillo/0004-Support-OpenSSL-1.1.0.patch Normal file
View File

@ -0,0 +1,33 @@
From ff44d8b2d5211a502afdb3e612dae0e8133b5124 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Thu, 9 Jan 2020 22:07:15 +0100
Subject: [PATCH] Support OpenSSL 1.1.0
taken-from: pkgsrc (Ryo ONODERA)
submitted-by: Jun Ebihara <jun@soum.co.jp>
Upstream: https://hg.dillo.org/dillo/rev/b171b8610400
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
dpi/https.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dpi/https.c b/dpi/https.c
index 766b3af..025cfc4 100644
--- a/dpi/https.c
+++ b/dpi/https.c
@@ -476,7 +476,11 @@ static int handle_certificate_problem(SSL * ssl_connection)
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
/*Either self signed and untrusted*/
/*Extract CN from certificate name information*/
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if ((cn = strstr(remote_cert->name, "/CN=")) == NULL) {
+#else
+ if ((cn = strstr(X509_get_subject_name(remote_cert), "/CN=")) == NULL) {
+#endif
strcpy(buf, "(no CN given)");
} else {
char *cn_end;
--
2.24.1

2
buildroot/package/docker-cli/docker-cli.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 cef3f9e8615cde906619f7ab021655a8b974d1b497ce0e5787b1afccbeabb08d docker-cli-18.09.9.tar.gz
sha256 00d06baf4793794c0fd9ecad5b7e95aed6eb942f24c8b6e2d7c7f7564b9743ad docker-cli-19.03.5.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE

2
buildroot/package/docker-cli/docker-cli.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOCKER_CLI_VERSION = 18.09.9
DOCKER_CLI_VERSION = 19.03.5
DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
DOCKER_CLI_WORKSPACE = gopath

4
buildroot/package/docker-containerd/docker-containerd.hash
View File

@ -1,3 +1,3 @@
# Computed locally
sha256 7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801 docker-containerd-v1.2.7.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
sha256 6a4192fced10c390373adfa9fa9a4f12fe9f38bde580d90468a79ed6c8af75ee docker-containerd-1.2.11.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE

4
buildroot/package/docker-containerd/docker-containerd.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
DOCKER_CONTAINERD_VERSION = v1.2.7
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_VERSION = 1.2.11
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE

45
buildroot/package/docker-engine/0001-Fix-faulty-runc-version-commit-scrape.patch
View File

@ -1,45 +0,0 @@
From 324e7be4b252c13002bca6a9d82e7b2e43664634 Mon Sep 17 00:00:00 2001
From: Christian Stewart <christian@paral.in>
Date: Mon, 26 Nov 2018 22:59:32 -0800
Subject: [PATCH] Fix faulty runc version commit scrape
This commit replaces faulty logic to determine the runc version commit hash.
The original logic takes the second line of the output of "runc --version" and
does not work if there are a different number of lines printed from the command
than expected. The buildroot version of runc outputs two lines instead of the
expected three, causing the error:
unknown output format: runc version commit: ...
This patch replaces this logic with a simple scan of the "runc --version"
output, searching for the "runc version commit" prefixed line.
Signed-off-by: Christian Stewart <christian@paral.in>
---
daemon/info_unix.go | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/daemon/info_unix.go b/daemon/info_unix.go
index 60b2f99870..688a510796 100644
--- a/daemon/info_unix.go
+++ b/daemon/info_unix.go
@@ -32,10 +32,11 @@ func (daemon *Daemon) fillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo)
defaultRuntimeBinary := daemon.configStore.GetRuntime(v.DefaultRuntime).Path
if rv, err := exec.Command(defaultRuntimeBinary, "--version").Output(); err == nil {
parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
- if len(parts) == 3 {
- parts = strings.Split(parts[1], ": ")
- if len(parts) == 2 {
- v.RuncCommit.ID = strings.TrimSpace(parts[1])
+ for _, pt := range parts {
+ ptKv := strings.Split(pt, ":")
+ if strings.HasSuffix(strings.TrimSpace(ptKv[0]), "commit") {
+ v.RuncCommit.ID = strings.TrimSpace(ptKv[1])
+ break
}
}
--
2.18.1

4
buildroot/package/docker-engine/docker-engine.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592 docker-engine-18.09.9.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE
sha256 bc5d1ac503e44593be8003ed0ad9c75bf0da535db19837a9338429c438bd4637 docker-engine-19.03.5.tar.gz
sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE

2
buildroot/package/docker-engine/docker-engine.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
DOCKER_ENGINE_VERSION = 18.09.9
DOCKER_ENGINE_VERSION = 19.03.5
DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0

3
buildroot/package/easy-rsa/Config.in
View File

@ -1,7 +1,8 @@
config BR2_PACKAGE_EASY_RSA
bool "easy-rsa"
select BR2_PACKAGE_OPENSSL # runtime
select BR2_PACKAGE_OPENSSL_BIN
select BR2_PACKAGE_LIBOPENSSL_BIN if BR2_PACKAGE_LIBOPENSSL
select BR2_PACKAGE_LIBRESSL_BIN if BR2_PACKAGE_LIBRESSL
help
Simple shell based CA utility

10
buildroot/package/ebtables/ebtables.mk
View File

@ -19,19 +19,15 @@ endef
ifeq ($(BR2_STATIC_LIBS),y)
define EBTABLES_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \
$(TARGET_DIR)/sbin/ebtables
$(INSTALL) -m 0755 -D $(@D)/static $(TARGET_DIR)/sbin/ebtables
endef
else
define EBTABLES_INSTALL_TARGET_CMDS
for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \
$(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \
do \
for so in $(@D)/*.so $(@D)/extensions/*.so; do \
$(INSTALL) -m 0755 -D $${so} \
$(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \
done
$(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \
$(TARGET_DIR)/sbin/ebtables
$(INSTALL) -m 0755 -D $(@D)/ebtables $(TARGET_DIR)/sbin/ebtables
$(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes
endef
endif

61
buildroot/package/ecryptfs-utils/0003-fix-parallel-build-issue.patch Normal file
View File

@ -0,0 +1,61 @@
fix parallel build issue
Build randomly fails since December 2017 on buildroot
(http://autobuild.buildroot.org/?reason=ecryptfs-utils-111):
make[5]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/ecryptfs-utils-111/src/utils'
/bin/mkdir -p '/home/buildroot/autobuild/instance-2/output-1/target/sbin'
/bin/bash ../../libtool --mode=install /usr/bin/install -c mount.ecryptfs umount.ecryptfs mount.ecryptfs_private '/home/buildroot/autobuild/instance-2/output-1/target/sbin'
libtool: install: /usr/bin/install -c mount.ecryptfs /home/buildroot/autobuild/instance-2/output-1/target/sbin/mount.ecryptfs
/usr/bin/install: cannot create regular file '/home/buildroot/autobuild/instance-2/output-1/target/sbin/mount.ecryptfs': File exists
Makefile:832: recipe for target 'install-rootsbinPROGRAMS' failed
make[5]: *** [install-rootsbinPROGRAMS] Error 1
As spotted by Thomas Petazzoni, build failure happens because of the
following line in src/utils/Makefile.am:
install-exec-hook: install-rootsbinPROGRAMS
-rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
$(LN_S) "mount.ecryptfs_private" "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
The install-exec-hook target should not have a dependency on
install-rootsbinPROGRAMS.
From https://www.gnu.org/software/automake/manual/html_node/Extending.html#Extending:
"""
In contrast, some rules also have a way to run another rule, called a
hook; hooks are always executed after the main rule’s work is done. The
hook is named after the principal target, with ‘-hook’ appended. The
targets allowing hooks are install-data, install-exec, uninstall, dist,
and distcheck.
For instance, here is how to create a hard link to an installed program:
install-exec-hook:
ln $(DESTDIR)$(bindir)/program$(EXEEXT) \
$(DESTDIR)$(bindir)/proglink$(EXEEXT)
"""
So, they explicitly say that these hooks are run after the main rule
work is done, which means the dependency on install-rootsbinPROGRAMS is
not needed. And the example they use to illustrate is *exactly* the
situation of ecryptfs-utils: creating a link to a program that was
installed.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://bugs.launchpad.net/ecryptfs/+bug/1857622]
diff -Nuar ecryptfs-utils-111-orig/src/utils/Makefile.in ecryptfs-utils-111/src/utils/Makefile.in
--- ecryptfs-utils-111-orig/src/utils/Makefile.in 2019-12-26 15:14:16.656146065 +0100
+++ ecryptfs-utils-111/src/utils/Makefile.in 2019-12-26 17:36:07.108496164 +0100
@@ -1522,7 +1522,7 @@
.PRECIOUS: Makefile
-install-exec-hook: install-rootsbinPROGRAMS
+install-exec-hook:
-rm -f "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"
$(LN_S) "mount.ecryptfs_private" "$(DESTDIR)/$(rootsbindir)/umount.ecryptfs_private"

2
buildroot/package/ecryptfs-utils/Config.in
View File

@ -30,7 +30,7 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
http://ecryptfs.org
comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library"
comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library"
depends on !BR2_microblaze
depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
depends on BR2_USE_MMU

1
buildroot/package/efl/Config.in
View File

@ -168,7 +168,6 @@ config BR2_PACKAGE_EFL_X_XLIB
select BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXINERAMA
select BR2_PACKAGE_XLIB_LIBXP
select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXSCRNSAVER

2
buildroot/package/freescale-imx/freescale-imx.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
FREESCALE_IMX_SITE = http://www.freescale.com/lgfiles/NMG/MAD/YOCTO
FREESCALE_IMX_SITE = http://www.nxp.com/lgfiles/NMG/MAD/YOCTO
# Helper for self-extracting binaries distributed by Freescale.
#

2
buildroot/package/git/git.hash
View File

@ -1,4 +1,4 @@
# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
sha256 dfb71b053cbc38a9c5b08c2fe8b5eae210b4e3b63892426923e10cfd6ba63862 git-2.16.5.tar.xz
sha256 cd45502a4146d8e77f40cc64b3b484247e6165633bb024d7a9385a85f68e1d52 git-2.16.6.tar.xz
sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING
sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1

2
buildroot/package/git/git.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GIT_VERSION = 2.16.5
GIT_VERSION = 2.16.6
GIT_SOURCE = git-$(GIT_VERSION).tar.xz
GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
GIT_LICENSE = GPL-2.0, LGPL-2.1+

2
buildroot/package/glibc/glibc-2.28-110-g57922433fa038faa6e37798b9655f85a94978d89/glibc.hash → buildroot/package/glibc/glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f/glibc.hash
View File

@ -1,5 +1,5 @@
# Locally calculated (fetched from Github)
sha256 8cfd8c4564b20e610b41e24cdab85d5b208453c51b06a64603e9ef3f86d6de0a glibc-glibc-2.28-110-g57922433fa038faa6e37798b9655f85a94978d89.tar.gz
sha256 8cb918cef45112554dd5efdbe4e3d4bb2909708a2b115a3b612b22bd7c670859 glibc-glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f.tar.gz
# Hashes for license files
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

2
buildroot/package/glibc/glibc.mk
View File

@ -13,7 +13,7 @@ GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
else
# Generate version string using:
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master
GLIBC_VERSION = glibc-2.28-110-g57922433fa038faa6e37798b9655f85a94978d89
GLIBC_VERSION = glibc-2.28-133-g6578d89c170cc7b524b9bccafffd5b4207bf646f
# Upstream doesn't officially provide an https download link.
# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
# sometimes the connection times out. So use an unofficial github mirror.

8
buildroot/package/gnupg2/gnupg2.hash
View File

@ -1,7 +1,7 @@
# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q3/000439.html
sha1 12c1cee8871c03f0315fc8f27876364b75c95b12 gnupg-2.2.17.tar.bz2
# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q4/000443.html
sha1 e24a1208ffe69d7436b2f27e99542a85f34d0ac0 gnupg-2.2.19.tar.bz2
# Calculated based on the hash above and signature
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.17.tar.bz2.sig
# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.19.tar.bz2.sig
# using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6
sha256 afa262868e39b651a2db4c071fba90415154243e83a830ca00516f9a807fd514 gnupg-2.2.17.tar.bz2
sha256 242554c0e06f3a83c420b052f750b65ead711cc3fddddb5e7274fcdbb4e9dec0 gnupg-2.2.19.tar.bz2
sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING

2
buildroot/package/gnupg2/gnupg2.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
GNUPG2_VERSION = 2.2.17
GNUPG2_VERSION = 2.2.19
GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
GNUPG2_LICENSE = GPL-3.0+

1
buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
View File

@ -567,7 +567,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
select BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING
select BR2_PACKAGE_WEBRTC
help
WebRTC echo-cancellation, gain control and noise suppression

8
buildroot/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
View File

@ -14,10 +14,16 @@ KF5_KCOREADDONS_DEPENDENCIES = kf5-extra-cmake-modules qt5tools
KF5_KCOREADDONS_INSTALL_STAGING = YES
KF5_KCOREADDONS_CXXFLAGS = $(TARGET_CXXFLAGS)
KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
KF5_KCOREADDONS_CXXFLAGS += -latomic
endif
KF5_KCOREADDONS_CONF_OPTS = -DCMAKE_CXX_FLAGS="$(KF5_KCOREADDONS_CXXFLAGS)"
ifeq ($(BR2_microblaze),y)
# Microblaze ld emits warnings, make warnings not to be treated as errors
KF5_KCOREADDONS_CONF_OPTS += -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-fatal-warnings"
endif
$(eval $(cmake-package))

103
buildroot/package/libarchive/0008-Bugfix-and-optimize-archive_wstring_append_from_mbs.patch Normal file
View File

@ -0,0 +1,103 @@
From 22b1db9d46654afc6f0c28f90af8cdc84a199f41 Mon Sep 17 00:00:00 2001
From: Martin Matuska <martin@matuska.org>
Date: Thu, 21 Nov 2019 03:08:40 +0100
Subject: [PATCH] Bugfix and optimize archive_wstring_append_from_mbs()
The cal to mbrtowc() or mbtowc() should read up to mbs_length
bytes and not wcs_length. This avoids out-of-bounds reads.
mbrtowc() and mbtowc() return (size_t)-1 wit errno EILSEQ when
they encounter an invalid multibyte character and (size_t)-2 when
they they encounter an incomplete multibyte character. As we return
failure and all our callers error out it makes no sense to continue
parsing mbs.
As we allocate `len` wchars at the beginning and each wchar has
at least one byte, there will never be need to grow the buffer,
so the code can be left out. On the other hand, we are always
allocatng more memory than we need.
As long as wcs_length == mbs_length == len we can omit wcs_length.
We keep the old code commented if we decide to save memory and
use autoexpanding wcs_length in the future.
Fixes #1276
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[Peter: fixes CVE-2019-19221]
---
libarchive/archive_string.c | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/libarchive/archive_string.c b/libarchive/archive_string.c
index 979a418b..bd39c96f 100644
--- a/libarchive/archive_string.c
+++ b/libarchive/archive_string.c
@@ -591,7 +591,7 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
* No single byte will be more than one wide character,
* so this length estimate will always be big enough.
*/
- size_t wcs_length = len;
+ // size_t wcs_length = len;
size_t mbs_length = len;
const char *mbs = p;
wchar_t *wcs;
@@ -600,7 +600,11 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
memset(&shift_state, 0, sizeof(shift_state));
#endif
- if (NULL == archive_wstring_ensure(dest, dest->length + wcs_length + 1))
+ /*
+ * As we decided to have wcs_length == mbs_length == len
+ * we can use len here instead of wcs_length
+ */
+ if (NULL == archive_wstring_ensure(dest, dest->length + len + 1))
return (-1);
wcs = dest->s + dest->length;
/*
@@ -609,6 +613,12 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
* multi bytes.
*/
while (*mbs && mbs_length > 0) {
+ /*
+ * The buffer we allocated is always big enough.
+ * Keep this code path in a comment if we decide to choose
+ * smaller wcs_length in the future
+ */
+/*
if (wcs_length == 0) {
dest->length = wcs - dest->s;
dest->s[dest->length] = L'\0';
@@ -618,24 +628,20 @@ archive_wstring_append_from_mbs(struct archive_wstring *dest,
return (-1);
wcs = dest->s + dest->length;
}
+*/
#if HAVE_MBRTOWC
- r = mbrtowc(wcs, mbs, wcs_length, &shift_state);
+ r = mbrtowc(wcs, mbs, mbs_length, &shift_state);
#else
- r = mbtowc(wcs, mbs, wcs_length);
+ r = mbtowc(wcs, mbs, mbs_length);
#endif
if (r == (size_t)-1 || r == (size_t)-2) {
ret_val = -1;
- if (errno == EILSEQ) {
- ++mbs;
- --mbs_length;
- continue;
- } else
- break;
+ break;
}
if (r == 0 || r > mbs_length)
break;
wcs++;
- wcs_length--;
+ // wcs_length--;
mbs += r;
mbs_length -= r;
}
--
2.20.1

2
buildroot/package/libgit2/libgit2.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 adf17310b590e6e7618f070c742b5ee028aeeed2c60099bc4190c386b5060de1 libgit2-0.27.9.tar.gz
sha256 f6fd26378ff71bd7a4b17b576c82c774a2e9c2d6b74b24718a8fb29551e1c4a5 libgit2-0.27.10.tar.gz
sha256 d9a8038088df84fde493fa33a0f1e537252eeb9642122aa4b862690197152813 COPYING

2
buildroot/package/libgit2/libgit2.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
LIBGIT2_VERSION = 0.27.9
LIBGIT2_VERSION = 0.27.10
LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION))
LIBGIT2_LICENSE = GPL-2.0 with linking exception
LIBGIT2_LICENSE_FILES = COPYING

2
buildroot/package/libkrb5/libkrb5.mk
View File

@ -41,7 +41,7 @@ endif
ifeq ($(BR2_PACKAGE_LIBEDIT),y)
LIBKRB5_CONF_OPTS += --with-libedit
LIBKRB5_DEPENDENCIES += libedit
LIBKRB5_DEPENDENCIES += host-pkgconf libedit
else
LIBKRB5_CONF_OPTS += --without-libedit
endif

35
buildroot/package/librsvg/0001-librsvg.pc.in-add-libcroco-to-Requires.Private.patch Normal file
View File

@ -0,0 +1,35 @@
From 322b415f92d4dcd36824eef83bd617bac6e5c8c7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 24 Dec 2019 16:38:35 +0100
Subject: [PATCH] librsvg.pc.in: add libcroco to Requires.private
libcroco is a mandatory dependency since version 2.35.0 so add it to
Requires.Private to fix a static build failure with imagemagick
This patch is not upstreamable as librsvg no longer depends on libcroco
since version 2.47.1. It now does all CSS processing using Rust crates
from Mozilla Servo.
Fixes:
- http://autobuild.buildroot.org/results/42f4b4881569779162d3efe4628b934f965913b9
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
librsvg.pc.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/librsvg.pc.in b/librsvg.pc.in
index a451de05..4b09984a 100644
--- a/librsvg.pc.in
+++ b/librsvg.pc.in
@@ -10,6 +10,6 @@ Name: librsvg
Description: library that renders svg files
Version: @VERSION@
Requires: glib-2.0 gio-2.0 gdk-pixbuf-2.0 cairo
-Requires.private:
+Requires.private: libcroco-0.6
Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@
--
2.24.0

48
buildroot/package/libssh/0001-buffer-Fix-size-comparison-with-count.patch
View File

@ -1,48 +0,0 @@
From 2aa8c46a853acd4198af16e417ebffd5b0e2c9f4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 1 Oct 2018 20:58:47 +0200
Subject: [PATCH] buffer: Fix size comparison with count
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: commit 9c3ba94960cd5
src/buffer.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
index da6e587fc9e4..b029f202660f 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -816,8 +816,8 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
ssh_string string = NULL;
char *cstring = NULL;
size_t needed_size = 0;
- size_t count;
size_t len;
+ int count; /* int for size comparison with argc */
int rc = SSH_OK;
for (p = format, count = 0; *p != '\0'; p++, count++) {
@@ -934,7 +934,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
char *cstring;
bignum b;
size_t len;
- int count;
+ int count; /* int for size comparison with argc */
for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
@@ -1098,7 +1098,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
} o;
size_t len, rlen, max_len;
va_list ap_copy;
- int count;
+ int count; /* int for size comparison with argc */
max_len = ssh_buffer_get_len(buffer);
--
2.20.1

152
buildroot/package/libssh/0002-buffer-Use-size_t-for-argc-argument-in-ssh_buffer_-u.patch
View File

@ -1,152 +0,0 @@
From 270d6aa2bb01f3430d07cce5f97b48b741e3df9c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 7 Dec 2018 12:06:03 +0100
Subject: [PATCH] buffer: Use size_t for argc argument in ssh_buffer_(un)pack()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: commit c306a693f3fbe
include/libssh/buffer.h | 4 ++--
src/buffer.c | 38 +++++++++++++++++++-------------------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
index 4721cbe06c20..1c375343ee14 100644
--- a/include/libssh/buffer.h
+++ b/include/libssh/buffer.h
@@ -40,11 +40,11 @@ void *ssh_buffer_allocate(struct ssh_buffer_struct *buffer, uint32_t len);
int ssh_buffer_allocate_size(struct ssh_buffer_struct *buffer, uint32_t len);
int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
va_list ap);
int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
...);
#define ssh_buffer_pack(buffer, format, ...) \
_ssh_buffer_pack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
diff --git a/src/buffer.c b/src/buffer.c
index b029f202660f..99863747fc3c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -809,7 +809,7 @@ ssh_buffer_get_ssh_string(struct ssh_buffer_struct *buffer)
*/
static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
va_list ap)
{
const char *p = NULL;
@@ -817,12 +817,12 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
char *cstring = NULL;
size_t needed_size = 0;
size_t len;
- int count; /* int for size comparison with argc */
+ size_t count;
int rc = SSH_OK;
for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
- if (argc != -1 && count > argc) {
+ if (count > argc) {
return SSH_ERROR;
}
@@ -881,7 +881,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
}
}
- if (argc != -1 && argc != count) {
+ if (argc != count) {
return SSH_ERROR;
}
@@ -891,11 +891,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
*/
uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END) {
- if (argc == -1){
- return SSH_ERROR;
- } else {
- abort();
- }
+ abort();
}
}
@@ -918,7 +914,7 @@ static int ssh_buffer_pack_allocate_va(struct ssh_buffer_struct *buffer,
*/
int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
va_list ap)
{
int rc = SSH_ERROR;
@@ -934,11 +930,15 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
char *cstring;
bignum b;
size_t len;
- int count; /* int for size comparison with argc */
+ size_t count;
+
+ if (argc > 256) {
+ return SSH_ERROR;
+ }
for (p = format, count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
- if (argc != -1 && count > argc) {
+ if (count > argc) {
return SSH_ERROR;
}
@@ -1010,7 +1010,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
}
}
- if (argc != -1 && argc != count) {
+ if (argc != count) {
return SSH_ERROR;
}
@@ -1018,11 +1018,7 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
/* Check if our canary is intact, if not somthing really bad happened */
uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END) {
- if (argc == -1){
- return SSH_ERROR;
- } else {
- abort();
- }
+ abort();
}
}
return rc;
@@ -1050,12 +1046,16 @@ int ssh_buffer_pack_va(struct ssh_buffer_struct *buffer,
*/
int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
...)
{
va_list ap;
int rc;
+ if (argc > 256) {
+ return SSH_ERROR;
+ }
+
va_start(ap, argc);
rc = ssh_buffer_pack_allocate_va(buffer, format, argc, ap);
va_end(ap);
--
2.20.1

122
buildroot/package/libssh/0003-more-strict-overflow-fixes.patch
View File

@ -1,122 +0,0 @@
From 7656b1be8dc5425d5af03ffa6af711599fc07e80 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Tue, 22 Jan 2019 08:16:50 +0200
Subject: [PATCH] buffer: Convert argc to size_t in ssh_buffer_unpack() as well
Commit c306a693f3fb ("buffer: Use size_t for argc argument in
ssh_buffer_(un)pack()") mentioned unpack in the commit log, but it only
touches the pack variants. Extend the conversion to unpack.
Pre-initialize the p pointer to avoid possible use before
initialization in case of early argc check failure.
This fixes build failure:
.../libssh-0.8.6/src/buffer.c: In function 'ssh_buffer_unpack_va':
.../libssh-0.8.6/src/buffer.c:1229:16: error: assuming signed overflow does not occur when simplifying conditional to constant [-Werror=strict-overflow]
if (argc == -1){
^
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: https://www.libssh.org/archive/libssh/2019-01/0000032.html
include/libssh/buffer.h | 4 ++--
src/buffer.c | 25 +++++++++++++------------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/include/libssh/buffer.h b/include/libssh/buffer.h
index 1c375343ee14..cd2dea6a7ecc 100644
--- a/include/libssh/buffer.h
+++ b/include/libssh/buffer.h
@@ -50,11 +50,11 @@ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
_ssh_buffer_pack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
- const char *format, int argc,
+ const char *format, size_t argc,
va_list ap);
int _ssh_buffer_unpack(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
...);
#define ssh_buffer_unpack(buffer, format, ...) \
_ssh_buffer_unpack((buffer), (format), __VA_NARG__(__VA_ARGS__), __VA_ARGS__, SSH_BUFFER_PACK_END)
diff --git a/src/buffer.c b/src/buffer.c
index 99863747fc3c..c8ad20f24e43 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1082,11 +1082,11 @@ int _ssh_buffer_pack(struct ssh_buffer_struct *buffer,
*/
int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
va_list ap)
{
int rc = SSH_ERROR;
- const char *p, *last;
+ const char *p = format, *last;
union {
uint8_t *byte;
uint16_t *word;
@@ -1098,16 +1098,21 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
} o;
size_t len, rlen, max_len;
va_list ap_copy;
- int count; /* int for size comparison with argc */
+ size_t count;
max_len = ssh_buffer_get_len(buffer);
/* copy the argument list in case a rollback is needed */
va_copy(ap_copy, ap);
- for (p = format, count = 0; *p != '\0'; p++, count++) {
+ if (argc > 256) {
+ rc = SSH_ERROR;
+ goto cleanup;
+ }
+
+ for (count = 0; *p != '\0'; p++, count++) {
/* Invalid number of arguments passed */
- if (argc != -1 && count > argc) {
+ if (count > argc) {
rc = SSH_ERROR;
goto cleanup;
}
@@ -1217,7 +1222,7 @@ int ssh_buffer_unpack_va(struct ssh_buffer_struct *buffer,
}
}
- if (argc != -1 && argc != count) {
+ if (argc != count) {
rc = SSH_ERROR;
}
@@ -1226,11 +1231,7 @@ cleanup:
/* Check if our canary is intact, if not something really bad happened */
uint32_t canary = va_arg(ap, uint32_t);
if (canary != SSH_BUFFER_PACK_END){
- if (argc == -1){
- rc = SSH_ERROR;
- } else {
- abort();
- }
+ abort();
}
}
@@ -1320,7 +1321,7 @@ cleanup:
*/
int _ssh_buffer_unpack(struct ssh_buffer_struct *buffer,
const char *format,
- int argc,
+ size_t argc,
...)
{
va_list ap;
--
2.20.1

4
buildroot/package/libssh/libssh.hash
View File

@ -1,5 +1,5 @@
# Locally calculated after checking pgp signature
# https://www.libssh.org/files/0.8/libssh-0.8.7.tar.xz.asc
# https://www.libssh.org/files/0.9/libssh-0.9.3.tar.xz.asc
# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
sha256 43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592 libssh-0.8.7.tar.xz
sha256 2c8b5f894dced58b3d629f16f3afa6562c20b4bdc894639163cf657833688f0c libssh-0.9.3.tar.xz
sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING

4
buildroot/package/libssh/libssh.mk
View File

@ -4,8 +4,8 @@
#
################################################################################
LIBSSH_VERSION_MAJOR = 0.8
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).7
LIBSSH_VERSION_MAJOR = 0.9
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).3
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
LIBSSH_LICENSE = LGPL-2.1

29
buildroot/package/libtomcrypt/0001-fix-CVE-2019-17362.patch Normal file
View File

@ -0,0 +1,29 @@
From 25c26a3b7a9ad8192ccc923e15cf62bf0108ef94 Mon Sep 17 00:00:00 2001
From: werew <werew@ret2libc.com>
Date: Thu, 3 Oct 2019 19:57:10 +0200
Subject: [PATCH] Fixes #507
Fix a vulnerability in der_decode_utf8_string as specified here:
https://github.com/libtom/libtomcrypt/issues/507
[for import into Buildroot]
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
---
src/pk/asn1/der/utf8/der_decode_utf8_string.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pk/asn1/der/utf8/der_decode_utf8_string.c b/src/pk/asn1/der/utf8/der_decode_utf8_string.c
index 94555b99f..d3ed82bea 100644
--- a/src/pk/asn1/der/utf8/der_decode_utf8_string.c
+++ b/src/pk/asn1/der/utf8/der_decode_utf8_string.c
@@ -65,7 +65,7 @@ int der_decode_utf8_string(const unsigned char *in, unsigned long inlen,
/* count number of bytes */
for (z = 0; (tmp & 0x80) && (z <= 4); z++, tmp = (tmp << 1) & 0xFF);
- if (z > 4 || (x + (z - 1) > inlen)) {
+ if (z == 1 || z > 4 || (x + (z - 1) > inlen)) {
return CRYPT_INVALID_PACKET;
}

2
buildroot/package/libuio/libuio.mk
View File

@ -10,7 +10,7 @@ LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs)
LIBUIO_LICENSE_FILES = COPYING
LIBUIO_CONF_OPTS = --with-glib=no --without-werror
LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-pkgconf
LIBUIO_LIBS = $(TARGET_NLS_LIBS)
LIBUIO_INSTALL_STAGING = YES

8
buildroot/package/linux-headers/Config.in.host
View File

@ -287,10 +287,10 @@ endchoice
config BR2_DEFAULT_KERNEL_HEADERS
string
default "4.4.206" if BR2_KERNEL_HEADERS_4_4
default "4.9.206" if BR2_KERNEL_HEADERS_4_9
default "4.14.158" if BR2_KERNEL_HEADERS_4_14
default "4.19.88" if BR2_KERNEL_HEADERS_4_19
default "4.4.208" if BR2_KERNEL_HEADERS_4_4
default "4.9.208" if BR2_KERNEL_HEADERS_4_9
default "4.14.163" if BR2_KERNEL_HEADERS_4_14
default "4.19.94" if BR2_KERNEL_HEADERS_4_19
default "4.20.17" if BR2_KERNEL_HEADERS_4_20
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL

2
buildroot/package/lirc-tools/lirc-tools.mk
View File

@ -47,7 +47,7 @@ endif
ifeq ($(BR2_PACKAGE_PYTHON3),y)
LIRC_TOOLS_DEPENDENCIES += python3 host-python3-setuptools
LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV="$(PKG_PYTHON_SETUPTOOLS_ENV)"
LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV='$(PKG_PYTHON_SETUPTOOLS_ENV)'
endif
define LIRC_TOOLS_INSTALL_INIT_SYSV

4
buildroot/package/lvm2/lvm2.mk
View File

@ -31,6 +31,10 @@ LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
# package/readline is GPL-3.0+, so not license compatible
LVM2_CONF_OPTS += --disable-readline
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
LVM2_CONF_OPTS += --enable-udev_rules
endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
LVM2_CONF_OPTS += --enable-selinux
LVM2_DEPENDENCIES += libselinux

2
buildroot/package/mali-t76x/Config.in
View File

@ -11,7 +11,7 @@ config BR2_PACKAGE_MALI_T76X
Midgard T76X GPU. This package requires a kernel with the
ARM Mali Midgard GPU Kernel Drivers enabled.
Source: http://malideveloper.arm.com/resources/drivers/
http://malideveloper.arm.com/resources/drivers/
if BR2_PACKAGE_MALI_T76X

1
buildroot/package/matchbox-desktop/matchbox-desktop.mk
View File

@ -11,7 +11,6 @@ MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matc
MATCHBOX_DESKTOP_LICENSE = GPL-2.0+
MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat
# The bundled configure script does not properly replace LIBADD_DL, so
# we force an autoreconf even if we don't have any patches touching

4
buildroot/package/nodejs/nodejs.hash
View File

@ -1,5 +1,5 @@
# From https://nodejs.org/dist/v8.16.1/SHASUMS256.txt
sha256 d8c190acdf2d967faf49c22df883d31a8d4e249d67852dae3c2d8a0f756b0512 node-v8.16.1.tar.xz
# From https://nodejs.org/dist/v8.17.0/SHASUMS256.txt
sha256 5b0d96db482b273f0324c299ead86ecfbc5d033516e5fc37c92cfccb933ef6ff node-v8.17.0.tar.xz
# Hash for license file
sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE

2
buildroot/package/nodejs/nodejs.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
NODEJS_VERSION = 8.16.1
NODEJS_VERSION = 8.17.0
NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \

20
buildroot/package/ntp/0003-override-shell.patch Normal file
View File

@ -0,0 +1,20 @@
sntp/libopts/m4/libopts.m4: allow override shell with POSIX_SHELL
Pull in fix from upstream AutoGen [1] to accept POSIX_SHELL from the
environment during the configure step.
[1] http://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a252f3ef3d8db25411ea0edb0ff8ea758
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
diff --git a/sntp/libopts/m4/libopts.m4 b/sntp/libopts/m4/libopts.m4
--- a/sntp/libopts/m4/libopts.m4
+++ b/sntp/libopts/m4/libopts.m4
@@ -114,6 +114,7 @@
AC_PROG_SED
[while :
do
+ test -x "$POSIX_SHELL" && break
POSIX_SHELL=`which bash`
test -x "$POSIX_SHELL" && break
POSIX_SHELL=`which dash`

2
buildroot/package/ntp/ntp.mk
View File

@ -10,7 +10,7 @@ NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJO
NTP_DEPENDENCIES = host-pkgconf libevent
NTP_LICENSE = NTP
NTP_LICENSE_FILES = COPYRIGHT
NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no POSIX_SHELL=/bin/sh
NTP_CONF_OPTS = \
--with-shared \
--program-transform-name=s,,, \

38
buildroot/package/opencv3/0001-3rdparty-protobuf-fix-compilation-issue-on-s390.patch
View File

@ -1,38 +0,0 @@
From ac9ec55b37b2dd3b224144b4f20857a80719b750 Mon Sep 17 00:00:00 2001
From: Loic Devulder <ldevulder@suse.de>
Date: Fri, 28 Sep 2018 15:33:18 +0200
Subject: [PATCH] 3rdparty/protobuf: fix compilation issue on s390
This commit fixes an issue while trying to compile
on s390x architecture.
This is simply a backport of a fixe already applied
in official protobuf code:
- https://github.com/protocolbuffers/protobuf/pull/3955
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://github.com/opencv/opencv/commit/ac9ec55b37b2dd3b224144b4f20857a80719b750]
---
.../protobuf/stubs/atomicops_internals_generic_gcc.h | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
index 0b0b06ce6cf..075c406abab 100644
--- a/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
+++ b/3rdparty/protobuf/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
@@ -146,6 +146,14 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) {
return __atomic_load_n(ptr, __ATOMIC_RELAXED);
}
+inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr,
+ Atomic64 old_value,
+ Atomic64 new_value) {
+ __atomic_compare_exchange_n(ptr, &old_value, new_value, false,
+ __ATOMIC_RELEASE, __ATOMIC_ACQUIRE);
+ return old_value;
+}
+
#endif // defined(__LP64__)
} // namespace internal

1
buildroot/package/opencv3/Config.in
View File

@ -140,6 +140,7 @@ config BR2_PACKAGE_OPENCV3_LIB_ML
config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
bool "objdetect"
# opencv_core dependency is already enabled
select BR2_PACKAGE_OPENCV3_LIB_CALIB3D
select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
select BR2_PACKAGE_OPENCV3_LIB_ML
help

4
buildroot/package/opencv3/opencv3.hash
View File

@ -1,3 +1,3 @@
# Locally calculated
sha256 4eef85759d5450b183459ff216b4c0fa43e87a4f6aa92c8af649f89336f002ec opencv3-3.4.3.tar.gz
sha256 fea311907cb6271b05ff5843b238e0f2edb6f204a3432975211030d20704b321 LICENSE
sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz
sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE

11
buildroot/package/opencv3/opencv3.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
OPENCV3_VERSION = 3.4.3
OPENCV3_VERSION = 3.4.9
OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
OPENCV3_INSTALL_STAGING = YES
OPENCV3_LICENSE = BSD-3-Clause
@ -13,16 +13,15 @@ OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
OPENCV3_CXXFLAGS = $(TARGET_CXXFLAGS)
# Uses __atomic_fetch_add_4
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
OPENCV3_CXXFLAGS += -latomic
endif
# Fix c++11 build with missing std::exception_ptr
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_64735),y)
OPENCV3_CXXFLAGS += -DCV__EXCEPTION_PTR=0
endif
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
OPENCV3_CXXFLAGS += -O0
endif
# OpenCV component options
OPENCV3_CONF_OPTS += \
-DCMAKE_CXX_FLAGS="$(OPENCV3_CXXFLAGS)" \

1
buildroot/package/openpowerlink/Config.in
View File

@ -50,7 +50,6 @@ config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB
config BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB
bool "user-space pcap daemon"
select BR2_PACKAGE_LIBPCAP
select BR2_PACKAGE_OPENPOWERLINK_PCAP_DAEMON
help
Compile openPOWERLINK application library which contains the
interface to a Linux user space driver, and the Linux user

2
buildroot/package/perl-sys-cpu/Config.in
View File

@ -5,5 +5,7 @@ config BR2_PACKAGE_PERL_SYS_CPU
Perl module for getting information about the system CPU
(Sys::CPU).
http://search.cpan.org/dist/Sys-CPU/
comment "perl-sys-cpu needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS

2
buildroot/package/pimd/Config.in
View File

@ -5,4 +5,4 @@ config BR2_PACKAGE_PIMD
pimd is a lightweight stand-alone PIM-SM v2 multicast routing
daemon.
http://troglobit.com/project/pimd/
http://troglobit.com/projects/pimd/

11
buildroot/package/pkg-python.mk
View File

@ -27,9 +27,7 @@ endef
# Target distutils-based packages
PKG_PYTHON_DISTUTILS_ENV = \
PATH=$(BR_PATH) \
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
$(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CROSS)gcc -shared" \
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
PYTHONNOUSERSITE=1 \
@ -52,7 +50,8 @@ PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \
# Host distutils-based packages
HOST_PKG_PYTHON_DISTUTILS_ENV = \
PATH=$(BR_PATH) \
PYTHONNOUSERSITE=1
PYTHONNOUSERSITE=1 \
$(HOST_CONFIGURE_OPTS)
HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
--prefix=$(HOST_DIR)
@ -61,6 +60,7 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
PKG_PYTHON_SETUPTOOLS_ENV = \
_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
PATH=$(BR_PATH) \
$(TARGET_CONFIGURE_OPTS) \
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
PYTHONNOUSERSITE=1 \
_python_sysroot=$(STAGING_DIR) \
@ -82,7 +82,8 @@ PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \
# Host setuptools-based packages
HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
PATH=$(BR_PATH) \
PYTHONNOUSERSITE=1
PYTHONNOUSERSITE=1 \
$(HOST_CONFIGURE_OPTS)
HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
--prefix=$(HOST_DIR) \

2
buildroot/package/python-coherence/Config.in
View File

@ -8,7 +8,7 @@ config BR2_PACKAGE_PYTHON_COHERENCE
help
A DLNA/UPnP Media Server and Framework for the Digital Living.
http://coherence-project.org/
https://github.com/coherence-project/Coherence
comment "python-coherence needs a toolchain w/ C++"
depends on BR2_PACKAGE_PYTHON

2
buildroot/package/python-crc16/Config.in
View File

@ -8,4 +8,4 @@ config BR2_PACKAGE_PYTHON_CRC16
or transmission. There are many variants of CRC and CRC16,
in particular.
http://pycrc16.googlecode.com/
https://code.google.com/archive/p/pycrc16/

4
buildroot/package/python-django/python-django.hash
View File

@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/django/json
md5 a9d02735cb5722608c08fb2d79350523 Django-2.1.15.tar.gz
sha256 a794f7a2f4b7c928eecfbc4ebad03712ff27fb545abe269bf01aa8500781eb1c Django-2.1.15.tar.gz
md5 a9a6555d166196e502b69715341f7ad4 Django-2.2.9.tar.gz
sha256 662a1ff78792e3fd77f16f71b1f31149489434de4b62a74895bd5d6534e635a5 Django-2.2.9.tar.gz
# Locally computed sha256 checksums
sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE

4
buildroot/package/python-django/python-django.mk
View File

@ -4,10 +4,10 @@
#
################################################################################
PYTHON_DJANGO_VERSION = 2.1.15
PYTHON_DJANGO_VERSION = 2.2.9
PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
# The official Django site has an unpractical URL
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/a5/ea/a3424e68851acb44a1f8f823dc32ee3eb10b7fda474b03d527f7e666b443
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/2c/0d/2aa8e58c791d2aa65658fa26f2b035a9da13a6a34d1b2d991912c8a33729
PYTHON_DJANGO_LICENSE = BSD-3-Clause
PYTHON_DJANGO_LICENSE_FILES = LICENSE
PYTHON_DJANGO_SETUP_TYPE = setuptools

2
buildroot/package/python-dpkt/Config.in
View File

@ -6,4 +6,4 @@ config BR2_PACKAGE_PYTHON_DPKT
Fast, simple packet creation / parsing, with definitions
for the basic TCP/IP protocols.
http://code.google.com/p/dpkt/
https://github.com/kbandla/dpkt

9
buildroot/package/python-ecdsa/python-ecdsa.hash
View File

@ -1,4 +1,5 @@
# md5 from https://pypi.python.org/pypi/ecdsa/json
md5 1f60eda9cb5c46722856db41a3ae6670 ecdsa-0.13.tar.gz
# sha256 calculated by scanpypi
sha256 64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa ecdsa-0.13.tar.gz
# md5, sha256 from https://pypi.org/pypi/ecdsa/json
md5 b1b33f7fe171eb1278de6f93eefc34f8 ecdsa-0.13.3.tar.gz
sha256 163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d ecdsa-0.13.3.tar.gz
# Locally computed sha256 checksums
sha256 3eca9845773d2e5b8cc9d8c119d345f00a4806e4bd660d4a3d6cdf9c0e9d8bb2 LICENSE

4
buildroot/package/python-ecdsa/python-ecdsa.mk
View File

@ -4,9 +4,9 @@
#
################################################################################
PYTHON_ECDSA_VERSION = 0.13
PYTHON_ECDSA_VERSION = 0.13.3
PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz
PYTHON_ECDSA_SITE = https://pypi.python.org/packages/source/e/ecdsa
PYTHON_ECDSA_SITE = https://files.pythonhosted.org/packages/8c/d8/9c3596fd0f18ae0a76333492a119c00183323d8e64de1a4f4bd642856963
PYTHON_ECDSA_SETUP_TYPE = setuptools
PYTHON_ECDSA_LICENSE = MIT
PYTHON_ECDSA_LICENSE_FILES = LICENSE

2
buildroot/package/python-pyasn-modules/Config.in
View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_PYTHON_PYASN_MODULES
bool "python-pyasn-modules"
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_PYASN # runtime
select BR2_PACKAGE_PYTHON_PYASN # runtime
help
A collection of ASN.1-based protocols modules.

2
buildroot/package/python-pypcap/Config.in
View File

@ -6,4 +6,4 @@ config BR2_PACKAGE_PYTHON_PYPCAP
The pypcap module is an object-oriented wrapper of the C
libpcap library.
https://code.google.com/p/pypcap/
https://github.com/dugsong/pypcap

3
buildroot/package/python-pyqt5/python-pyqt5.hash
View File

@ -1,3 +1,6 @@
# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed
md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz
sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz
# Hash for license file
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE

108
buildroot/package/python-pyqt5/python-pyqt5.mk
View File

@ -11,6 +11,14 @@ PYTHON_PYQT5_LICENSE = GPL-3.0
PYTHON_PYQT5_LICENSE_FILES = LICENSE
PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base
PYTHON_PYQT5_MODULES = \
QtCore \
$(if $(BR2_PACKAGE_QT5BASE_DBUS),QtDBus) \
$(if $(BR2_PACKAGE_QT5BASE_GUI),QtGui) \
$(if $(BR2_PACKAGE_QT5BASE_NETWORK),QtNetwork) \
$(if $(BR2_PACKAGE_QT5BASE_OPENGL_LIB),QtOpenGL) \
$(if $(BR2_PACKAGE_QT5BASE_PRINTSUPPORT),QtPrintSupport) \
$(if $(BR2_PACKAGE_QT5BASE_XML),QtXml)
ifeq ($(BR2_PACKAGE_PYTHON),y)
PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR)
@ -20,6 +28,103 @@ PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR)
PYTHON_PYQT5_RM_PORT_BASE = port_v2
endif
ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
PYTHON_PYQT5_MODULES += QtWidgets
# QtSql needs QtWidgets
ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y)
PYTHON_PYQT5_MODULES += QtSql
endif
# QtTest needs QtWidgets
ifeq ($(BR2_PACKAGE_QT5BASE_TEST),y)
PYTHON_PYQT5_MODULES += QtTest
endif
endif
ifeq ($(BR2_PACKAGE_QT5CONNECTIVITY),y)
PYTHON_PYQT5_DEPENDENCIES += qt5connectivity
PYTHON_PYQT5_MODULES += QtBluetooth QtNfc
endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
PYTHON_PYQT5_DEPENDENCIES += qt5declarative
PYTHON_PYQT5_MODULES += QtQml
# QtQuick module needs opengl
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_OPENGL_LIB),yy)
PYTHON_PYQT5_MODULES += \
QtQuick \
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtQuickWidgets)
endif
endif
ifeq ($(BR2_PACKAGE_QT5ENGINIO),y)
PYTHON_PYQT5_DEPENDENCIES += qt5enginio
PYTHON_PYQT5_MODULES += Enginio
endif
ifeq ($(BR2_PACKAGE_QT5LOCATION),y)
PYTHON_PYQT5_DEPENDENCIES += qt5location
PYTHON_PYQT5_MODULES += QtLocation QtPositioning
endif
ifeq ($(BR2_PACKAGE_QT5MULTIMEDIA),y)
PYTHON_PYQT5_DEPENDENCIES += qt5multimedia
PYTHON_PYQT5_MODULES += \
QtMultimedia \
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtMultimediaWidgets)
endif
ifeq ($(BR2_PACKAGE_QT5SENSORS),y)
PYTHON_PYQT5_DEPENDENCIES += qt5sensors
PYTHON_PYQT5_MODULES += QtSensors
endif
ifeq ($(BR2_PACKAGE_QT5SERIALPORT),y)
PYTHON_PYQT5_DEPENDENCIES += qt5serialport
PYTHON_PYQT5_MODULES += QtSerialPort
endif
ifeq ($(BR2_PACKAGE_QT5SVG),y)
PYTHON_PYQT5_DEPENDENCIES += qt5svg
PYTHON_PYQT5_MODULES += QtSvg
endif
ifeq ($(BR2_PACKAGE_QT5WEBCHANNEL),y)
PYTHON_PYQT5_DEPENDENCIES += qt5webchannel
PYTHON_PYQT5_MODULES += QtWebChannel
endif
ifeq ($(BR2_PACKAGE_QT5WEBENGINE),y)
PYTHON_PYQT5_DEPENDENCIES += qt5webengine
PYTHON_PYQT5_MODULES += \
QtWebEngineCore \
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebEngineWidgets)
endif
ifeq ($(BR2_PACKAGE_QT5WEBKIT),y)
PYTHON_PYQT5_DEPENDENCIES += qt5webkit
PYTHON_PYQT5_MODULES += \
QtWebKit \
$(if $(BR2_PACKAGE_QT5BASE_WIDGETS),QtWebKitWidgets)
endif
ifeq ($(BR2_PACKAGE_QT5WEBSOCKETS),y)
PYTHON_PYQT5_DEPENDENCIES += qt5websockets
PYTHON_PYQT5_MODULES += QtWebSockets
endif
ifeq ($(BR2_PACKAGE_QT5X11EXTRAS),y)
PYTHON_PYQT5_DEPENDENCIES += qt5x11extras
PYTHON_PYQT5_MODULES += QtX11Extras
endif
ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y)
PYTHON_PYQT5_DEPENDENCIES += qt5xmlpatterns
PYTHON_PYQT5_MODULES += QtXmlPatterns
endif
PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source
PYTHON_PYQT5_QTDETAIL_TYPE = shared
@ -52,7 +157,8 @@ PYTHON_PYQT5_CONF_OPTS = \
-w --confirm-license \
--no-designer-plugin \
--no-docstrings \
--no-sip-files
--no-sip-files \
$(foreach module,$(PYTHON_PYQT5_MODULES),--enable=$(module))
define PYTHON_PYQT5_CONFIGURE_CMDS
$(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D))

17
buildroot/package/python-subprocess32/python-subprocess32.mk
View File

@ -11,4 +11,21 @@ PYTHON_SUBPROCESS32_SETUP_TYPE = setuptools
PYTHON_SUBPROCESS32_LICENSE = Python-2.0
PYTHON_SUBPROCESS32_LICENSE_FILES = LICENSE
# The configure step needs to be run outside of the setup.py since it isn't
# run correctly for cross-compiling
define PYTHON_SUBPROCESS32_CONFIGURE_CMDS
(cd $(@D) && \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
--program-prefix="" \
)
endef
$(eval $(python-package))

6
buildroot/package/python3/python3.hash
View File

@ -1,5 +1,5 @@
# From https://www.python.org/downloads/release/python-375/
md5 08ed8030b1183107c48f2092e79a87e2 Python-3.7.5.tar.xz
# From https://www.python.org/downloads/release/python-376/
md5 c08fbee72ad5c2c95b0f4e44bf6fd72c Python-3.7.6.tar.xz
# Locally computed
sha256 e85a76ea9f3d6c485ec1780fca4e500725a4a7bbc63c78ebc44170de9b619d94 Python-3.7.5.tar.xz
sha256 55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f Python-3.7.6.tar.xz
sha256 a77d71d6be6f9032e6b6e5d2cf6da68f9eeab9036edfbc043633c8979cd5e82c LICENSE

2
buildroot/package/python3/python3.mk
View File

@ -5,7 +5,7 @@
################################################################################
PYTHON3_VERSION_MAJOR = 3.7
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).5
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
PYTHON3_LICENSE = Python-2.0, others

1
buildroot/package/qpdf/Config.in
View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_QPDF
bool "qpdf"
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_PCRE
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_JPEG
help

1
buildroot/package/qpdf/qpdf.hash
View File

@ -1,4 +1,5 @@
# From https://sourceforge.net/projects/qpdf/files/qpdf/8.2.1/qpdf-8.2.1.sha512/download
sha512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz
# Locally computed:
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
sha256 fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5 Artistic-2.0

6
buildroot/package/qpdf/qpdf.mk
View File

@ -7,9 +7,9 @@
QPDF_VERSION = 8.2.1
QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION)
QPDF_INSTALL_STAGING = YES
QPDF_LICENSE = Artistic-2.0
QPDF_LICENSE_FILES = Artistic-2.0
QPDF_DEPENDENCIES = pcre zlib jpeg
QPDF_LICENSE = Apache-2.0 or Artistic-2.0
QPDF_LICENSE_FILES = LICENSE.txt Artistic-2.0
QPDF_DEPENDENCIES = zlib jpeg
QPDF_CONF_OPTS = --without-random

2
buildroot/package/qt-webkit-kiosk/Config.in
View File

@ -15,6 +15,8 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK
help
Simple kiosk-mode browser powered by Qt5Webkit
https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk
if BR2_PACKAGE_QT_WEBKIT_KIOSK
config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS

2
buildroot/package/qt5/qt5virtualkeyboard/Config.in
View File

@ -14,6 +14,8 @@ config BR2_PACKAGE_QT5VIRTUALKEYBOARD
consists of a C++ backend supporting custom input methods as
well as a UI frontend implemented in QML.
https://doc.qt.io/qt-5/qtvirtualkeyboard-index.html
if BR2_PACKAGE_QT5VIRTUALKEYBOARD
config BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS

Some files were not shown because too many files have changed in this diff Show More