rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump Buildroot Version to buildroot 2019_02_6

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-10-25 11:46:00 +02:00
parent e07322a5a8
commit c1075f68da
549 changed files with 6692 additions and 4165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1042,7 +1042,7 @@ menu "External python modules"
source "package/python-slob/Config.in"
source "package/python-smbus-cffi/Config.in"
source "package/python-socketio/Config.in"
source "package/python-sortedcontainers//Config.in"
source "package/python-sortedcontainers/Config.in"
source "package/python-spidev/Config.in"
source "package/python-sqlalchemy/Config.in"
source "package/python-subprocess32/Config.in"

4
bsp/buildroot/package/apache/apache.hash
View File

@@ -1,4 +1,4 @@
# From http://archive.apache.org/dist/httpd/httpd-2.4.39.tar.bz2.sha256
sha256 b4ca9d05773aa59b54d66cd8f4744b945289f084d3be17d7981d1783a5decfa2 httpd-2.4.39.tar.bz2
# From http://archive.apache.org/dist/httpd/httpd-2.4.41.tar.bz2.sha256
sha256 133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40 httpd-2.4.41.tar.bz2
# Locally computed
sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE

2
bsp/buildroot/package/apache/apache.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
APACHE_VERSION = 2.4.39
APACHE_VERSION = 2.4.41
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
APACHE_SITE = http://archive.apache.org/dist/httpd
APACHE_LICENSE = Apache-2.0

5
bsp/buildroot/package/assimp/Config.in
View File

@@ -1,9 +1,5 @@
config BR2_PACKAGE_ASSIMP
bool "assimp"
# All gcc versions affected by
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that
# cause an infinite loop in gcc when building this package.
depends on !BR2_microblaze
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_ZLIB
help
@@ -16,5 +12,4 @@ config BR2_PACKAGE_ASSIMP
http://www.assimp.org
comment "assimp needs a toolchain w/ C++"
depends on !BR2_microblaze
depends on !BR2_INSTALL_LIBSTDCPP

6
bsp/buildroot/package/assimp/assimp.mk
View File

@@ -19,11 +19,15 @@ endif
# workaround SuperH compiler failure when static linking (i.e -fPIC is
# not passed) in gcc versions 5.x or older. The -Os optimization level
# causes a "unable to find a register to spill in class
# ‘GENERAL_REGS’" error. -O2 works fine.
# 'GENERAL_REGS'" error. -O2 works fine.
ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:)
ASSIMP_CXXFLAGS += -O2
endif
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
ASSIMP_CXXFLAGS += -O0
endif
ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \
-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)"

2
bsp/buildroot/package/asterisk/asterisk.hash
View File

@@ -1,5 +1,5 @@
# Locally computed
sha256 c022e9d5410ed94ab1aa51ba1e2a8b196f0dfa15bcd0bd545d06efee4c786578 asterisk-16.2.1.tar.gz
sha256 122ecf242e06da373488024e0c76154f2404d024d09eed20b23cae0795033380 asterisk-16.5.1.tar.gz
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
# sha256 locally computed

2
bsp/buildroot/package/asterisk/asterisk.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
ASTERISK_VERSION = 16.2.1
ASTERISK_VERSION = 16.5.1
# Use the github mirror: it's an official mirror maintained by Digium, and
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))

3
bsp/buildroot/package/atftp/atftp.hash
View File

@@ -1,2 +1,3 @@
# Locally computed
sha1 fc9e9f821dfd2f257b4a5c32b948ed60b4e31fd1 atftp-0.7.1.tar.gz
sha256 1ad080674e9f974217b3a703e7356c6c8446dc5e7b2014d0d06e1bfaa11b5041 atftp-0.7.2.tar.gz
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 LICENSE

10
bsp/buildroot/package/atftp/atftp.mk
View File

@@ -4,19 +4,19 @@
#
################################################################################
ATFTP_VERSION = 0.7.1
ATFTP_VERSION = 0.7.2
ATFTP_SITE = http://sourceforge.net/projects/atftp/files
ATFTP_LICENSE = GPL-2.0+
ATFTP_LICENSE_FILES = LICENSE
# 0001-Makefile.am-link-against-libpthread-for-atftp.patch patches Makefile.am
ATFTP_AUTORECONF = YES
ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
# For static we need to explicitly link against libpthread
ATFTP_LIBS = -lpthread
# We use CPPFLAGS for -fgnu89-inline even though it's a compiler flag
# because atftp discards configure environment CFLAGS. -fgnu89-inline
# is needed to avoid multiple definition error with gcc 5. See
# -fgnu89-inline is needed to avoid multiple definition error with gcc 5. See
# https://gcc.gnu.org/gcc-5/porting_to.html.
ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -fgnu89-inline"
CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline"
ifeq ($(BR2_PACKAGE_READLINE),y)
ATFTP_DEPENDENCIES += readline

4
bsp/buildroot/package/atk/atk.mk
View File

@@ -11,6 +11,8 @@ ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
ATK_LICENSE = LGPL-2.0+
ATK_LICENSE_FILES = COPYING
ATK_INSTALL_STAGING = YES
ATK_DEPENDENCIES = libglib2
ATK_DEPENDENCIES = libglib2 $(TARGET_NLS_DEPENDENCIES)
ATK_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
$(eval $(meson-package))

9
bsp/buildroot/package/atop/atop.mk
View File

@@ -10,8 +10,15 @@ ATOP_LICENSE = GPL-2.0+
ATOP_LICENSE_FILES = COPYING
ATOP_DEPENDENCIES = ncurses zlib
ATOP_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
ATOP_CFLAGS += -O0
endif
define ATOP_BUILD_CMDS
$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(ATOP_CFLAGS)" \
-C $(@D)
endef
define ATOP_INSTALL_TARGET_CMDS

3
bsp/buildroot/package/augeas/augeas.mk
View File

@@ -11,9 +11,6 @@ AUGEAS_LICENSE = LGPL-2.1+
AUGEAS_LICENSE_FILES = COPYING
AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
# patching examples/Makefile.am, can be removed when updating from version 1.9.0
AUGEAS_AUTORECONF = YES
AUGEAS_CONF_OPTS = --disable-gnulib-tests
# Remove the test lenses which occupy about 1.4 MB on the target

11
bsp/buildroot/package/autofs/autofs.mk
View File

@@ -11,11 +11,18 @@ AUTOFS_LICENSE = GPL-2.0+
AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
AUTOFS_DEPENDENCIES = host-flex host-bison host-pkgconf host-nfs-utils
# autofs looks on the build machine for the path of modprobe, so tell
# it explicitly where it will be located on the target.
# autofs looks on the build machine for the path of modprobe, mount,
# umount and fsck programs so tell it explicitly where they will be
# located on the target.
AUTOFS_CONF_ENV = \
ac_cv_path_E2FSCK=/usr/sbin/fsck.ext2 \
ac_cv_path_E3FSCK=/usr/sbin/fsck.ext3 \
ac_cv_path_E4FSCK=/usr/sbin/fsck.ext4 \
ac_cv_path_KRB5_CONFIG=no \
ac_cv_path_MODPROBE=/sbin/modprobe \
ac_cv_path_MOUNT=/bin/mount \
ac_cv_path_MOUNT_NFS=/usr/sbin/mount.nfs \
ac_cv_path_UMOUNT=/bin/umount \
ac_cv_linux_procfs=yes
# instead of looking in the PATH like any reasonable package, autofs

2
bsp/buildroot/package/batctl/batctl.mk
View File

@@ -6,7 +6,7 @@
BATCTL_VERSION = 2017.0
BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
BATCTL_LICENSE = GPL-2.0
BATCTL_LICENSE = GPL-2.0, MIT (batman_adv.h, list.h)
BATCTL_DEPENDENCIES = libnl host-pkgconf
define BATCTL_BUILD_CMDS

2
bsp/buildroot/package/batman-adv/batman-adv.mk
View File

@@ -6,7 +6,7 @@
BATMAN_ADV_VERSION = 2017.0.1
BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
BATMAN_ADV_LICENSE = GPL-2.0
BATMAN_ADV_LICENSE = GPL-2.0, MIT (batman_adv.h)
# Bridge Loop Avoidance, Distributed Arp Table are always enabled
BATMAN_ADV_CFLAGS = \

17
bsp/buildroot/package/berkeleydb/berkeleydb.mk
View File

@@ -44,6 +44,22 @@ define BERKELEYDB_CONFIGURE_CMDS
)
endef
define HOST_BERKELEYDB_CONFIGURE_CMDS
(cd $(@D)/build_unix; rm -rf config.cache; \
$(HOST_CONFIGURE_OPTS) \
../dist/configure $(QUIET) \
--prefix=$(HOST_DIR) \
--with-gnu-ld \
--disable-cxx \
--disable-java \
--disable-tcl \
--disable-compat185 \
--with-pic \
--enable-o_direct \
--disable-mutexsupport \
)
endef
ifneq ($(BR2_PACKAGE_BERKELEYDB_TOOLS),y)
define BERKELEYDB_REMOVE_TOOLS
@@ -61,3 +77,4 @@ endef
BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS
$(eval $(autotools-package))
$(eval $(host-autotools-package))

13
bsp/buildroot/package/bind/0001-cross.patch
View File

@@ -1,18 +1,23 @@
Use host compiler to build 'gen' since it's run when building.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
[Fabrice: updated for 9.11.10]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in
--- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300
+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200
@@ -160,8 +160,8 @@
./gen -s ${srcdir} > code.h
@@ -160,10 +160,8 @@
./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
gen: gen.c
- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS}
- ${LFS_CFLAGS} ${LFS_LDFLAGS} \
- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c \
- ${BUILD_LIBS} ${LFS_LIBS}
+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \
+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c
rbtdb64.@O@: rbtdb.c
timestamp: include libdns.@A@
touch timestamp

133
bsp/buildroot/package/bind/0002-Replace-atomic-operations-in-bin-named-client.c-with.patch
View File

@@ -1,133 +0,0 @@
From ef49780d30d3ddc5735cfc32561b678a634fa72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= <ondrej@sury.org>
Date: Wed, 17 Apr 2019 15:22:27 +0200
Subject: [PATCH] Replace atomic operations in bin/named/client.c with
isc_refcount reference counting
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
bin/named/client.c | 18 +++++++-----------
bin/named/include/named/interfacemgr.h | 5 +++--
bin/named/interfacemgr.c | 7 +++++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/bin/named/client.c b/bin/named/client.c
index 845326abc0..29fecadca8 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -402,12 +402,10 @@ tcpconn_detach(ns_client_t *client) {
static void
mark_tcp_active(ns_client_t *client, bool active) {
if (active && !client->tcpactive) {
- isc_atomic_xadd(&client->interface->ntcpactive, 1);
+ isc_refcount_increment0(&client->interface->ntcpactive, NULL);
client->tcpactive = active;
} else if (!active && client->tcpactive) {
- uint32_t old =
- isc_atomic_xadd(&client->interface->ntcpactive, -1);
- INSIST(old > 0);
+ isc_refcount_decrement(&client->interface->ntcpactive, NULL);
client->tcpactive = active;
}
}
@@ -554,7 +552,7 @@ exit_check(ns_client_t *client) {
if (client->mortal && TCP_CLIENT(client) &&
client->newstate != NS_CLIENTSTATE_FREED &&
!ns_g_clienttest &&
- isc_atomic_xadd(&client->interface->ntcpaccepting, 0) == 0)
+ isc_refcount_current(&client->interface->ntcpaccepting) == 0)
{
/* Nobody else is accepting */
client->mortal = false;
@@ -3328,7 +3326,6 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
ns_client_t *client = event->ev_arg;
isc_socket_newconnev_t *nevent = (isc_socket_newconnev_t *)event;
- uint32_t old;
REQUIRE(event->ev_type == ISC_SOCKEVENT_NEWCONN);
REQUIRE(NS_CLIENT_VALID(client));
@@ -3348,8 +3345,7 @@ client_newconn(isc_task_t *task, isc_event_t *event) {
INSIST(client->naccepts == 1);
client->naccepts--;
- old = isc_atomic_xadd(&client->interface->ntcpaccepting, -1);
- INSIST(old > 0);
+ isc_refcount_decrement(&client->interface->ntcpaccepting, NULL);
/*
* We must take ownership of the new socket before the exit
@@ -3480,8 +3476,8 @@ client_accept(ns_client_t *client) {
* quota is tcp-clients plus the number of listening
* interfaces plus 1.)
*/
- exit = (isc_atomic_xadd(&client->interface->ntcpactive, 0) >
- (client->tcpactive ? 1 : 0));
+ exit = (isc_refcount_current(&client->interface->ntcpactive) >
+ (client->tcpactive ? 1U : 0U));
if (exit) {
client->newstate = NS_CLIENTSTATE_INACTIVE;
(void)exit_check(client);
@@ -3539,7 +3535,7 @@ client_accept(ns_client_t *client) {
* listening for connections itself to prevent the interface
* going dead.
*/
- isc_atomic_xadd(&client->interface->ntcpaccepting, 1);
+ isc_refcount_increment0(&client->interface->ntcpaccepting, NULL);
}
static void
diff --git a/bin/named/include/named/interfacemgr.h b/bin/named/include/named/interfacemgr.h
index 3535ef22a8..6e10f210fd 100644
--- a/bin/named/include/named/interfacemgr.h
+++ b/bin/named/include/named/interfacemgr.h
@@ -45,6 +45,7 @@
#include <isc/magic.h>
#include <isc/mem.h>
#include <isc/socket.h>
+#include <isc/refcount.h>
#include <dns/result.h>
@@ -75,11 +76,11 @@ struct ns_interface {
/*%< UDP dispatchers. */
isc_socket_t * tcpsocket; /*%< TCP socket. */
isc_dscp_t dscp; /*%< "listen-on" DSCP value */
- int32_t ntcpaccepting; /*%< Number of clients
+ isc_refcount_t ntcpaccepting; /*%< Number of clients
ready to accept new
TCP connections on this
interface */
- int32_t ntcpactive; /*%< Number of clients
+ isc_refcount_t ntcpactive; /*%< Number of clients
servicing TCP queries
(whether accepting or
connected) */
diff --git a/bin/named/interfacemgr.c b/bin/named/interfacemgr.c
index d9f6df5802..135533be6b 100644
--- a/bin/named/interfacemgr.c
+++ b/bin/named/interfacemgr.c
@@ -386,8 +386,8 @@ ns_interface_create(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr,
* connections will be handled in parallel even though there is
* only one client initially.
*/
- ifp->ntcpaccepting = 0;
- ifp->ntcpactive = 0;
+ isc_refcount_init(&ifp->ntcpaccepting, 0);
+ isc_refcount_init(&ifp->ntcpactive, 0);
ifp->nudpdispatch = 0;
@@ -618,6 +618,9 @@ ns_interface_destroy(ns_interface_t *ifp) {
ns_interfacemgr_detach(&ifp->mgr);
+ isc_refcount_destroy(&ifp->ntcpactive);
+ isc_refcount_destroy(&ifp->ntcpaccepting);
+
ifp->magic = 0;
isc_mem_put(mctx, ifp, sizeof(*ifp));
}
--
2.11.0

4
bsp/buildroot/package/bind/bind.hash
View File

@@ -1,4 +1,4 @@
# Verified from https://ftp.isc.org/isc/bind9/9.11.6-P1/bind-9.11.6-P1.tar.gz.asc
# Verified from https://ftp.isc.org/isc/bind9/9.11.10/bind-9.11.10.tar.gz.asc
# with key 156890685EA0DF6A1371EF2017CC5DB1F0088407
sha256 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef bind-9.11.6-P1.tar.gz
sha256 b2bb840cda20e6771ae8c054007b4ec12e1bb6aa6bfe79102890eb94956a70c3 bind-9.11.10.tar.gz
sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT

2
bsp/buildroot/package/bind/bind.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
BIND_VERSION = 9.11.6-P1
BIND_VERSION = 9.11.10
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
# bind does not support parallel builds.
BIND_MAKE = $(MAKE1)

38
bsp/buildroot/package/botan/0003-makefile.in-move-LDFLAGS-after-EXE_LINKS_TO.patch Normal file
View File

@@ -0,0 +1,38 @@
From a837dd63f3ac5a9c206863c82b57c679cb72b8b7 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 28 Apr 2019 10:21:06 +0200
Subject: [PATCH] makefile.in: move LDFLAGS after EXE_LINKS_TO
Move LDFLAGS after EXE_LINKS_TO to allow the user to give additional
libraries such as -latomic otherwise static build will fail:
cli/tls_server.o build/obj/cli/tls_utils.o build/obj/cli/utils.o build/obj/cli/x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan
/home/buildroot/autobuild/instance-1/output/host/bin/sparc-linux-g++ -Wl,-rpath=\$ORIGIN -pthread -static -latomic build/obj/test/main.o build/obj/test/test_aead.o build/obj/test/test_asn1.o build/obj/test/test_bigint.o build/obj/test/test_block.o build/obj/test/test_blowfish.o build/obj/test/test_c25519.o build/obj/test/test_certstor.o build/obj/test/test_compression.o build/obj/test/test_cryptobox.o build/obj/test/test_datastore.o build/obj/test/test_dh.o build/obj/test/test_dl_group.o build/obj/test/test_dlies.o build/obj/test/test_dsa.o build/obj/test/test_ecc_pointmul.o build/obj/test/test_ecdh.o build/obj/test/test_ecdsa.o build/obj/test/test_ecgdsa.o build/obj/test/test_ecies.o build/obj/test/test_eckcdsa.o build/obj/test/test_ed25519.o build/obj/test/test_elg.o build/obj/test/test_entropy.o build/obj/test/test_ffi.o build/obj/test/test_filters.o build/obj/test/test_fpe.o build/obj/test/test_gf2m.o build/obj/test/test_gost_3410.o build/obj/test/test_hash.o build/obj/test/test_hash_id.o build/obj/test/test_kdf.o build/obj/test/test_keywrap.o build/obj/test/test_mac.o build/obj/test/test_mceliece.o build/obj/test/test_modes.o build/obj/test/test_mp.o build/obj/test/test_name_constraint.o build/obj/test/test_newhope.o build/obj/test/test_ocb.o build/obj/test/test_ocsp.o build/obj/test/test_octetstring.o build/obj/test/test_oid.o build/obj/test/test_os_utils.o build/obj/test/test_otp.o build/obj/test/test_package_transform.o build/obj/test/test_pad.o build/obj/test/test_passhash.o build/obj/test/test_pbkdf.o build/obj/test/test_pem.o build/obj/test/test_pk_pad.o build/obj/test/test_pkcs11.o build/obj/test/test_pkcs11_high_level.o build/obj/test/test_pkcs11_low_level.o build/obj/test/test_psk_db.o build/obj/test/test_pubkey.o build/obj/test/test_rfc6979.o build/obj/test/test_rng.o build/obj/test/test_rng_kat.o build/obj/test/test_rsa.o build/obj/test/test_runner.o build/obj/test/test_simd.o build/obj/test/test_siv.o build/obj/test/test_sm2.o build/obj/test/test_srp6.o build/obj/test/test_stream.o build/obj/test/test_tests.o build/obj/test/test_tls.o build/obj/test/test_tls_messages.o build/obj/test/test_tpm.o build/obj/test/test_tss.o build/obj/test/test_utils.o build/obj/test/test_workfactor.o build/obj/test/test_x509_dn.o build/obj/test/test_x509_path.o build/obj/test/test_xmss.o build/obj/test/tests.o build/obj/test/unit_ecc.o build/obj/test/unit_ecdh.o build/obj/test/unit_ecdsa.o build/obj/test/unit_tls.o build/obj/test/unit_tls_policy.o build/obj/test/unit_x509.o -L. -lbotan-2 -lboost_filesystem -lboost_system -lbz2 -lcrypto -llzma -lsqlite3 -lz -o botan-test
./libbotan-2.a(utils_filesystem.o): In function `Botan::get_files_recursive(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)':
filesystem.cpp:(.text+0x758): undefined reference to `__atomic_fetch_sub_4'
Fixes:
- http://autobuild.buildroot.org/results/9db39b209a0f4be1e09b7e4ddb5e9a63da4fbbfa
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/randombit/botan/pull/1916]
---
src/build-data/makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/build-data/makefile.in b/src/build-data/makefile.in
index 08c9c5421..7111c7b19 100644
--- a/src/build-data/makefile.in
+++ b/src/build-data/makefile.in
@@ -71,7 +71,7 @@ $(CLI): $(LIBRARIES) $(CLIOBJS)
$(POST_LINK_CMD)
$(TEST): $(LIBRARIES) $(TESTOBJS)
- $(EXE_LINK_CMD) $(ABI_FLAGS) $(LDFLAGS) $(TESTOBJS) $(EXE_LINKS_TO) %{output_to_exe}$@
+ $(EXE_LINK_CMD) $(ABI_FLAGS) $(TESTOBJS) $(EXE_LINKS_TO) $(LDFLAGS) %{output_to_exe}$@
$(POST_LINK_CMD)
%{if build_fuzzers}
--
2.20.1

8
bsp/buildroot/package/brotli/brotli.mk
View File

@@ -14,4 +14,12 @@ BROTLI_CONF_OPTS = \
-DBROTLI_DISABLE_TESTS=ON \
-DBROTLI_BUNDLED_MODE=OFF
BROTLI_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y)
BROTLI_CFLAGS += -O0
endif
BROTLI_CONF_OPTS += -DCMAKE_C_FLAGS="$(BROTLI_CFLAGS)"
$(eval $(cmake-package))

4
bsp/buildroot/package/busybox/busybox.config
View File

@@ -967,9 +967,9 @@ CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n -O search"
#
# Print Utilities

1
bsp/buildroot/package/busybox/busybox.mk
View File

@@ -32,6 +32,7 @@ BUSYBOX_DEPENDENCIES = \
$(if $(BR2_PACKAGE_DEBIANUTILS),debianutils) \
$(if $(BR2_PACKAGE_DIFFUTILS),diffutils) \
$(if $(BR2_PACKAGE_DOS2UNIX),dos2unix) \
$(if $(BR2_PACKAGE_DOSFSTOOLS),dosfstools) \
$(if $(BR2_PACKAGE_E2FSPROGS),e2fsprogs) \
$(if $(BR2_PACKAGE_FBSET),fbset) \
$(if $(BR2_PACKAGE_GAWK),gawk) \

2
bsp/buildroot/package/busybox/udhcpc.script
View File

@@ -56,7 +56,7 @@ case "$1" in
cat $TMPFILE > $RESOLV_CONF
rm -f $TMPFILE
# prefer rfc3359 domain search list (option 119) if available
# prefer rfc3397 domain search list (option 119) if available
if [ -n "$search" ]; then
search_list=$search
elif [ -n "$domain" ]; then

2
bsp/buildroot/package/bwm-ng/bwm-ng.mk
View File

@@ -7,7 +7,7 @@
BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef
BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION))
BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
BWM_NG_LICENSE = GPL-2.0
BWM_NG_LICENSE = GPL-2.0+
BWM_NG_LICENSE_FILES = COPYING
BWM_NG_AUTORECONF = YES

14
bsp/buildroot/package/bzip2/0002-improve-build-system.patch
View File

@@ -70,15 +70,15 @@ Index: b/Makefile-libbz2_so
huffman.o \
@@ -37,8 +36,11 @@
all: $(OBJS)
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
$(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.8 $(OBJS)
$(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8
- rm -f libbz2.so.1.0
- ln -s libbz2.so.1.0.6 libbz2.so.1.0
- ln -s libbz2.so.1.0.8 libbz2.so.1.0
+
+install:
+ install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so
+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0
+ install -m 0755 -D libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0.8
+ ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so
+ ln -sf libbz2.so.1.0.8 $(PREFIX)/lib/libbz2.so.1.0
clean:
rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared
rm -f $(OBJS) bzip2.o libbz2.so.1.0.8 libbz2.so.1.0 bzip2-shared

2
bsp/buildroot/package/bzip2/Config.in
View File

@@ -5,3 +5,5 @@ config BR2_PACKAGE_BZIP2
It typically compresses files to within 10% to 15% of the best
available techniques, while being around twice as fast at
compression and six times faster at decompression.
https://sourceware.org/bzip2/

6
bsp/buildroot/package/bzip2/bzip2.hash
View File

@@ -1,2 +1,4 @@
# From http://www.bzip.org/downloads.html
md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
# From https://sourceware.org/pub/bzip2/sha512.sum
sha512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3 bzip2-1.0.8.tar.gz
# Locally calculated
sha256 c6dbbf828498be844a89eaa3b84adbab3199e342eb5cb2ed2f0d4ba7ec0f38a3 LICENSE

4
bsp/buildroot/package/bzip2/bzip2.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
BZIP2_VERSION = 1.0.6
BZIP2_SITE = http://sources.buildroot.net
BZIP2_VERSION = 1.0.8
BZIP2_SITE = https://sourceware.org/pub/bzip2
BZIP2_INSTALL_STAGING = YES
BZIP2_LICENSE = bzip2 license
BZIP2_LICENSE_FILES = LICENSE

7
bsp/buildroot/package/ca-certificates/ca-certificates.hash
View File

@@ -1,3 +1,6 @@
# hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
sha1 edf0ec04b02fcbc90cc65906ff83fb042894a3b7 ca-certificates_20180409.tar.xz
sha256 7af6f5bfc619fd29cbf0258c1d95107c38ce840ad6274e343e1e0d971fc72b51 ca-certificates_20180409.tar.xz
sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz
sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
# Locally computed
sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright

4
bsp/buildroot/package/ca-certificates/ca-certificates.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
CA_CERTIFICATES_VERSION = 20180409
CA_CERTIFICATES_VERSION = 20190110
CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20180411T111033Z/pool/main/c/ca-certificates
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
CA_CERTIFICATES_DEPENDENCIES = host-openssl
# ca-certificates can be built with either python 2 or python 3
# but it must be at least python 2.7

2
bsp/buildroot/package/capnproto/Config.in
View File

@@ -10,7 +10,7 @@ config BR2_PACKAGE_CAPNPROTO
Cap'n Proto is an insanely fast data interchange format
and capability-based RPC system. Think JSON, except
binary. Or think Protocol Buffers, except faster. In
fact, in benchmarks, Cap’n Proto is INFINITY TIMES
fact, in benchmarks, Cap'n Proto is INFINITY TIMES
faster than Protocol Buffers.
https://capnproto.org/index.html

8
bsp/buildroot/package/chocolate-doom/chocolate-doom.mk
View File

@@ -21,6 +21,14 @@ CHOCOLATE_DOOM_CONF_OPTS = \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr
CHOCOLATE_DOOM_CFLAGS = $(TARGET_CFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
CHOCOLATE_DOOM_CFLAGS += -O0
endif
CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)"
ifeq ($(BR2_PACKAGE_LIBPNG),y)
CHOCOLATE_DOOM_DEPENDENCIES += libpng
CHOCOLATE_DOOM_CONF_OPTS += --with-libpng

2
bsp/buildroot/package/cjson/cjson.hash
View File

@@ -1,3 +1,3 @@
# Locally computed:
sha256 17ace0e31ebd639906983b05fe1d51576b948ca5411c2162f55dd34c122162ca cjson-v1.7.11.tar.gz
sha256 760687665ab41a5cff9c40b1053c19572bcdaadef1194e5cba1b5e6f824686e7 cjson-v1.7.12.tar.gz
sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c LICENSE

2
bsp/buildroot/package/cjson/cjson.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
CJSON_VERSION = v1.7.11
CJSON_VERSION = v1.7.12
CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
CJSON_INSTALL_STAGING = YES
CJSON_LICENSE = MIT

2
bsp/buildroot/package/clamav/clamav.hash
View File

@@ -1,5 +1,5 @@
# Locally calculated
sha256 0a12ebdf6ff7a74c0bde2bdc2b55cae33449e6dd953ec90824a9e01291277634 clamav-0.101.2.tar.gz
sha256 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd clamav-0.101.4.tar.gz
sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584 COPYING
sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed COPYING.bzip2
sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6 COPYING.file

2
bsp/buildroot/package/clamav/clamav.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
CLAMAV_VERSION = 0.101.2
CLAMAV_VERSION = 0.101.4
CLAMAV_SITE = https://www.clamav.net/downloads/production
CLAMAV_LICENSE = GPL-2.0
CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \

3
bsp/buildroot/package/cloop/cloop.mk
View File

@@ -13,7 +13,8 @@ CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
HOST_CLOOP_DEPENDENCIES = host-zlib
define HOST_CLOOP_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes
$(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes \
CFLAGS="$(HOST_CFLAGS) -D_GNU_SOURCE"
endef
define HOST_CLOOP_INSTALL_CMDS

2
bsp/buildroot/package/collectd/Config.in
View File

@@ -389,7 +389,7 @@ config BR2_PACKAGE_COLLECTD_POSTGRESQL
Connects to and executes SQL statements on a PostgreSQL
database. It then reads back the results and, depending on the
configuration, the returned values are then converted into
collectd “value lists”.
collectd 'value lists'.
comment "postgresql support needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR

2
bsp/buildroot/package/collectd/collectd.hash
View File

@@ -1,5 +1,5 @@
# From https://collectd.org/files/SHA256SUM
sha256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 collectd-5.7.1.tar.bz2
sha256 9d20a0221569a8d6b80bbc52b86e5e84965f5bafdbf5dfc3790e0fed0763e592 collectd-5.7.2.tar.bz2
# Hash for license files
sha256 ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4 COPYING

4
bsp/buildroot/package/collectd/collectd.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
COLLECTD_VERSION = 5.7.1
COLLECTD_VERSION = 5.7.2
COLLECTD_SITE = http://collectd.org/files
COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
@@ -15,7 +15,7 @@ COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
# These require unmet dependencies, are fringe, pointless or deprecated
COLLECTD_PLUGINS_DISABLE = \
amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \
gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \
gmond grpc hddtemp intel_rdt ipmi java lpar lua lvm \
madwifi mbmon mic multimeter netapp notify_desktop numa \
nut onewire oracle perl pf pinba powerdns python redis routeros \
rrdcached sigrok tape target_v5upgrade teamspeak2 ted \

1
bsp/buildroot/package/connman-gtk/connman-gtk.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

4
bsp/buildroot/package/connman-gtk/connman-gtk.mk
View File

@@ -8,8 +8,10 @@ CONNMAN_GTK_VERSION = 1.1.1
CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONNMAN_GTK_VERSION)
CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2
CONNMAN_GTK_INSTALL_STAGING = YES
CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3
CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3 \
$(TARGET_NLS_DEPENDENCIES)
CONNMAN_GTK_LICENSE = GPL-2.0+
CONNMAN_GTK_LICENSE_FILES = COPYING
CONNMAN_GTK_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
$(eval $(autotools-package))

2
bsp/buildroot/package/coreutils/coreutils.mk
View File

@@ -55,7 +55,7 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
MAKEINFO=true \
INSTALL_PROGRAM=$(INSTALL)
COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
COREUTILS_BIN_PROGS = base64 cat chgrp chmod chown cp date dd df dir echo false \
kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
vdir sleep stty sync touch true uname join

3
bsp/buildroot/package/cracklib/cracklib.mk
View File

@@ -9,7 +9,8 @@ CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-
CRACKLIB_LICENSE = LGPL-2.1
CRACKLIB_LICENSE_FILES = COPYING.LIB
CRACKLIB_INSTALL_STAGING = YES
CRACKLIB_DEPENDENCIES = host-cracklib
CRACKLIB_DEPENDENCIES = host-cracklib $(TARGET_NLS_DEPENDENCIES)
CRACKLIB_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
ifeq ($(BR2_PACKAGE_ZLIB),y)
CRACKLIB_CONF_OPTS += --with-zlib

11
bsp/buildroot/package/cryptopp/cryptopp.mk
View File

@@ -15,16 +15,23 @@ define HOST_CRYPTOPP_EXTRACT_CMDS
$(UNZIP) $(HOST_CRYPTOPP_DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D)
endef
HOST_CRYPTOPP_CXXFLAGS = $(HOST_CFLAGS) -fPIC
# _mm256_broadcastsi128_si256 has been added only in gcc 4.9
ifneq ($(BR2_HOST_GCC_AT_LEAST_4_9),y)
HOST_CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_AVX2
endif
HOST_CRYPTOPP_MAKE_OPTS = \
$(HOST_CONFIGURE_OPTS) \
CXXFLAGS="$(HOST_CXXFLAGS) -fPIC"
CXXFLAGS="$(HOST_CRYPTOPP_CXXFLAGS)"
define HOST_CRYPTOPP_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared
endef
define HOST_CRYPTOPP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib
endef
$(eval $(host-generic-package))

46
bsp/buildroot/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch
View File

@@ -1,46 +0,0 @@
From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001
From: Olivier Schonken <olivier.schonken@gmail.com>
Date: Thu, 8 Mar 2018 12:32:23 +0200
Subject: [PATCH] install: don't use ln -r
Oldish enterprise-class distributions have too old versions of
coreutils, with ln not supporting -r.
So we fake it.
ln -r would create minimalist relative paths, but they are not
trivial to generate. Instead, we always create paths relative to the
root, i.e.:
ln -s -r /usr/bin/foo /usr/sbin/foo
would create: /usr/sbin/foo -> ../bin/foo
while we do : /usr/sbin/foo -> ../../usr/bin/foo
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index d959227..b49914a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -998,11 +998,11 @@ install-exec-hook:
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
if ENABLE_FOOMATIC
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ $(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
endif
if ENABLE_DRIVERLESS
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+ $(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
endif
if ENABLE_BRAILLE
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
--
2.14.1

214
bsp/buildroot/package/cups-filters/0001-install-support-old-ln-versions-without-the-r-option.patch Normal file
View File

@@ -0,0 +1,214 @@
From edd44df686b4ec983a327cabc5035106addb274f Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Mon, 16 Sep 2019 22:22:37 -0300
Subject: [PATCH] install: support old ln versions without the -r option
Oldish enterprise-class Linux distributions have outdated versions of
coreutils whose ln command do not support the -r option. Also non-Linux
systems like FreeBSD don't support that option. Use a shell script that
mimics the missing functionality.
The script creates minimalist relative paths, like ln -r does, but in
order to simplify the logic, it requires that the arguments be absolute
paths and do not end with '/'. This is enough for our purposes.
Add configuration logic to detect if ln supports the -r option, based on
the logic used by Autoconf to check if ln supports the -s option.
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile.am | 6 ++--
configure.ac | 2 ++
ln-srf | 49 ++++++++++++++++++++++++++
m4/ac_ln_srf.m4 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 145 insertions(+), 3 deletions(-)
create mode 100755 ln-srf
create mode 100644 m4/ac_ln_srf.m4
diff --git a/Makefile.am b/Makefile.am
index 76b81de5..beb2882e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -988,11 +988,11 @@ install-exec-hook:
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
if ENABLE_FOOMATIC
- $(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ $(LN_SRF) $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
endif
if ENABLE_DRIVERLESS
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
- $(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+ $(LN_SRF) $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
endif
if ENABLE_BRAILLE
$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
diff --git a/configure.ac b/configure.ac
index d5a539b6..fbcf829a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,8 @@ AM_ICONV
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
+AS_LN_SRF_PREPARE
+AC_PROG_LN_SRF
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.20])
diff --git a/ln-srf b/ln-srf
new file mode 100755
index 00000000..f395a760
--- /dev/null
+++ b/ln-srf
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Author: Carlos Santos <unixmania@gmail.com>
+# This file is in public domain.
+#
+
+error() {
+ echo "$@" 1>&2
+ exit 1
+}
+
+src="$1"
+dst="$2"
+
+check_path() {
+ case "$2" in
+ */../*|*/./*|*/.|*/..) error "$1 path '$2' must be absolute";;
+ */) error "$1 path '$2' must not end with '/'";;
+ /?*) ;;
+ *) error "$1 path '$2' must start with '/'";;
+ esac
+}
+
+check_path "source" "$src"
+check_path "destination" "$dst"
+
+# strip leading '/'
+src=${src#/*}
+tmp=${dst#/*}
+
+s_prefix=${src%%/*}
+d_prefix=${tmp%%/*}
+
+# strip leading common
+while [ "$s_prefix" = "$d_prefix" ]; do
+ src="${src#$s_prefix/}"
+ tmp="${tmp#$d_prefix/}"
+ s_prefix=${src%%/*}
+ d_prefix=${tmp%%/*}
+done
+
+s_prefix="../"
+while [ -n "$d_prefix" ] && [ "$tmp" != "$d_prefix" ]; do
+ s_prefix="../$s_prefix"
+ tmp="${tmp#$d_prefix/}"
+ d_prefix=${tmp%%/*}
+done
+
+ln -s -f "$s_prefix$src" "$dst"
diff --git a/m4/ac_ln_srf.m4 b/m4/ac_ln_srf.m4
new file mode 100644
index 00000000..204b3439
--- /dev/null
+++ b/m4/ac_ln_srf.m4
@@ -0,0 +1,91 @@
+# Adapted from Autoconf Version 2.63 (GPLv2).
+#
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
+# As a special exception, the Free Software Foundation gives unlimited
+# permission to copy, distribute and modify the configure scripts that
+# are the output of Autoconf. You need not follow the terms of the GNU
+# General Public License when using or distributing such scripts, even
+# though portions of the text of Autoconf appear in them. The GNU
+# General Public License (GPL) does govern all other use of the material
+# that constitutes the Autoconf program.
+#
+# Certain portions of the Autoconf source text are designed to be copied
+# (in certain cases, depending on the input) into the output of
+# Autoconf. We call these the "data" portions. The rest of the Autoconf
+# source text consists of comments plus executable code that decides which
+# of the data portions to output in any given case. We call these
+# comments and executable code the "non-data" portions. Autoconf never
+# copies any of the non-data portions into its output.
+#
+# This special exception to the GPL applies to versions of Autoconf
+# released by the Free Software Foundation. When you make and
+# distribute a modified version of Autoconf, you may extend this special
+# exception to the GPL to apply to your modified version as well, *unless*
+# your modified version has the potential to copy into its output some
+# of the text that was the non-data portion of the version that you started
+# with. (In other words, unless your change moves or copies text from
+# the non-data portions to the data portions.) If your modification has
+# such potential, you must delete any notice of this special exception
+# to the GPL from your modified version.
+
+# AS_LN_SRF_PREPARE
+# ------------------------------------
+m4_defun([AS_LN_SRF_PREPARE],
+[rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+ rm -f conf$$.dir/conf$$.file
+else
+ rm -f conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s -r conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf='ln -s -r -f'
+ elif ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf='./ln-srf'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -pRf'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_srf='cp -pRf'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_srf=ln
+ else
+ as_ln_srf='cp -pRf'
+ fi
+else
+ as_ln_srf='cp -pRf'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+])# AS_LN_SRF_PREPARE
+
+# AC_PROG_LN_SRF
+# --------------------------------
+AC_DEFUN([AC_PROG_LN_SRF],
+[AC_MSG_CHECKING([whether ln -s -r -f works])
+AC_SUBST([LN_SRF], [$as_ln_srf])dnl
+if test "$LN_SRF" = "ln -s -r -f"; then
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no, using $LN_SRF])
+fi
+])# AC_PROG_LN_SRF
--
2.18.1

122
bsp/buildroot/package/cups-filters/0002-filter-texttotext.c-link-with-libiconv-if-needed.patch Normal file
View File

@@ -0,0 +1,122 @@
From 734ef160b428c545d8c6ae16c4bfe3c036173aa4 Mon Sep 17 00:00:00 2001
From: Carlos Santos <unixmania@gmail.com>
Date: Sun, 21 Jul 2019 23:54:29 -0300
Subject: [PATCH] filter/texttotext.c: link with libiconv if needed
texttotext.c uses iconv so it should link with libiconv on platforms
where it is a separate library (e.g. uClibc-ng without built-in NLS)
otherwise texttotext fails to link:
CCLD texttotext
[...]/ld: texttotext-texttotext.o: in function `main':
texttotext.c:(.text.startup+0xde0): undefined reference to `libiconv_open'
[...]/ld: texttotext.c:(.text.startup+0xf9d): undefined reference to `libiconv'
[...]/ld: texttotext.c:(.text.startup+0xfd6): undefined reference to `libiconv'
[...]/ld: texttotext.c:(.text.startup+0x16c3): undefined reference to `libiconv_close'
Modify autogen.sh to call autopoint, which adds the libiconv discovery.
It also creates a "po" skeleton but we can discard it, since it is not
really necessary.
Fixes: https://bugs.busybox.net/show_bug.cgi?id=12031
Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
Makefile.am | 4 +++-
autogen.sh | 17 +++++++++++++++++
configure.ac | 6 +++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 72e023ed..76b81de5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -778,7 +778,7 @@ texttotext_SOURCES = \
filter/texttotext.c
EXTRA_texttotext_SOURCES = filter/strcasestr.c
texttotext_CFLAGS = $(CUPS_CFLAGS)
-texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS)
+texttotext_LDADD = $(STRCASESTR) $(CUPS_LIBS) $(LIBICONV)
texttotext_DEPENDENCIES = $(STRCASESTR)
pdftops_SOURCES = \
@@ -1049,3 +1049,5 @@ if ENABLE_BRAILLE
$(RM) $(DESTDIR)$(pkgfilterdir)/vectortoubrl
$(RM) $(DESTDIR)$(pkgfilterdir)/textbrftoindexv4
endif
+
+SUBDIRS =
diff --git a/autogen.sh b/autogen.sh
index 5462a323..cd7397a9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,11 +13,22 @@ aclocal --version > /dev/null 2> /dev/null || {
echo "error: aclocal not found"
exit 1
}
+
automake --version > /dev/null 2> /dev/null || {
echo "error: automake not found"
exit 1
}
+autopoint --version > /dev/null 2> /dev/null || {
+ echo "error: autopoint not found"
+ exit 1
+}
+
+gettext --version > /dev/null 2> /dev/null || {
+ echo "error: gettext not found"
+ exit 1
+}
+
for i in $TESTLIBTOOLIZE; do
if which $i > /dev/null 2>&1; then
LIBTOOLIZE=$i
@@ -39,6 +50,12 @@ fi
rm -rf autom4te*.cache
+autopoint --force || {
+ echo "error: autopoint failed"
+ exit 1
+}
+# autopoint is for libiconv discovery; we don't want the po directory
+rm -rf po
$LIBTOOLIZE --force --copy || {
echo "error: libtoolize failed"
exit 1
diff --git a/configure.ac b/configure.ac
index 607dc17a..d5a539b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/ac_define_dir.m4])
m4_include([m4/ax_compare_version.m4])
m4_include([m4/basic-directories.m4])
-AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 gnu dist-xz dist-bzip2 subdir-objects])
AM_SILENT_RULES([yes])
AC_LANG([C++])
AC_CONFIG_HEADERS([config.h])
@@ -54,6 +54,7 @@ AC_PROG_CC
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
AM_PROG_CC_C_O
+AM_ICONV
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -61,6 +62,9 @@ AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.20])
+AM_GNU_GETTEXT_VERSION([0.18.3])
+AM_GNU_GETTEXT([external])
+
# ========================================
# Specify the fontdir patch if not default
# ========================================
--
2.18.1

11
bsp/buildroot/package/cups-filters/cups-filters.mk
View File

@@ -8,7 +8,7 @@ CUPS_FILTERS_VERSION = 1.21.3
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
CUPS_FILTERS_LICENSE_FILES = COPYING
# 0001-Replace-relative-linking-with-absolute-linking.patch
# 0001-install-support-old-ln-versions-without-the-r-option.patch
CUPS_FILTERS_AUTORECONF = YES
CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
@@ -16,11 +16,20 @@ CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
--disable-mutool \
--disable-foomatic \
--disable-braille \
--with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
--with-sysroot=$(STAGING_DIR) \
--with-pdftops=pdftops \
--with-jpeg
# After 0002-filter-texttotext.c-link-with-libiconv-if-needed.patch autoreconf
# needs config.rpath and ABOUT-NLS, which are not in v1.25.4 yet. Fake them.
define CUPS_FILTERS_ADD_MISSING_FILE
touch $(@D)/config.rpath $(@D)/ABOUT-NLS
endef
CUPS_FILTERS_PRE_CONFIGURE_HOOKS = CUPS_FILTERS_ADD_MISSING_FILE
ifeq ($(BR2_PACKAGE_LIBPNG),y)
CUPS_FILTERS_CONF_OPTS += --with-png
CUPS_FILTERS_DEPENDENCIES += libpng

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

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

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

@@ -4,7 +4,7 @@
#
################################################################################
CUPS_VERSION = 2.2.10
CUPS_VERSION = 2.2.12
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

4
bsp/buildroot/package/dahdi-linux/dahdi-linux.hash
View File

@@ -1,7 +1,7 @@
# sha1 from: http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
# sha256 locally computed
sha1 8cbd55b8611c6ed80bcdf84d537566b4934f3def dahdi-linux-2.11.1.tar.gz
sha256 f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df dahdi-linux-2.11.1.tar.gz
sha1 9827f0afc625e293021b81daf94ec054145c975b dahdi-linux-3.0.0.tar.gz
sha256 02a8a680d20a3e243f37259edc3554ab9a488595a28562c45c33da3792d12caa dahdi-linux-3.0.0.tar.gz
# Firmware files have no upstream hash, so sha56 locally computed
sha256 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1 dahdi-fwload-vpmadt032-1.25.0.tar.gz

2
bsp/buildroot/package/dahdi-linux/dahdi-linux.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DAHDI_LINUX_VERSION = 2.11.1
DAHDI_LINUX_VERSION = 3.0.0
DAHDI_LINUX_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
# We need to download all thoe firmware blobs ourselves, otherwise

4
bsp/buildroot/package/dahdi-tools/dahdi-tools.hash
View File

@@ -1,7 +1,7 @@
# sha1 from http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
# sha256 locally computed
sha1 5da944e6d59a977f814230253f3ddf2847e7f31b dahdi-tools-2.11.1.tar.gz
sha256 53ffeb333f3e44b0c88e5b17475cdbf87d3f652eb81a6422de76250c061e2909 dahdi-tools-2.11.1.tar.gz
sha1 3e988256aae4b6a6ed8efb3ecc07753779f54823 dahdi-tools-3.0.0.tar.gz
sha256 5bebb20d5ae13fa13f0e2075603013954b962be477db02271eef44b3e41557c5 dahdi-tools-3.0.0.tar.gz
# License files, locally computed
sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 LICENSE

2
bsp/buildroot/package/dahdi-tools/dahdi-tools.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DAHDI_TOOLS_VERSION = 2.11.1
DAHDI_TOOLS_VERSION = 3.0.0
DAHDI_TOOLS_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
DAHDI_TOOLS_LICENSE = GPLv2, LGPLv2.1

7
bsp/buildroot/package/daq/daq.mk
View File

@@ -18,6 +18,13 @@ DAQ_MAKE = $(MAKE1)
# disable ipq module as libipq is deprecated
DAQ_CONF_OPTS += --disable-ipq-module
# Set --with-dnet-{includes,libraries} even if ipq and nfq modules are disabled
# otherwise daq will call 'dnet-config --cflags' and 'dnet-config --libs' which
# will result in a build failure if libdnet is installed on host
DAQ_CONF_OPTS += \
--with-dnet-includes=$(STAGING_DIR)/usr/include \
--with-dnet-libraries=$(STAGING_DIR)/usr/lib
ifeq ($(BR2_PACKAGE_LIBDNET)$(BR2_PACKAGE_LIBNETFILTER_QUEUE),yy)
DAQ_DEPENDENCIES += libdnet libnetfilter_queue
DAQ_CONF_OPTS += --enable-nfq-module

2
bsp/buildroot/package/davfs2/davfs2.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated
sha256 c9c4e0f0912a782386216b2147eb9c36c47f193b8fcf3d637719e0b9fe7c96e0 davfs2-1.5.4.tar.gz
sha256 587c6a25ad78109995a7ccb8e60aa1c491b149f2c99d47033f3d5e648430ad2f davfs2-1.5.5.tar.gz
# License file, locally calculated
sha256 0ae0485a5bd37a63e63603596417e4eb0e653334fa6c7f932ca3a0e85d4af227 COPYING

2
bsp/buildroot/package/davfs2/davfs2.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DAVFS2_VERSION = 1.5.4
DAVFS2_VERSION = 1.5.5
DAVFS2_SITE = http://download.savannah.nongnu.org/releases/davfs2
DAVFS2_LICENSE = GPL-3.0+
DAVFS2_LICENSE_FILES = COPYING

4
bsp/buildroot/package/dbus/dbus.hash
View File

@@ -1,6 +1,6 @@
# Locally calculated after checking pgp signature
# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.10.tar.gz.asc
# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz.asc
# using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F
sha256 4b693d24976258c3f2fa9cc33ad9288c5fbfa7a16481dbd9a8a429f7aa8cdcf7 dbus-1.12.10.tar.gz
sha256 54a22d2fa42f2eb2a871f32811c6005b531b9613b1b93a0d269b05e7549fec80 dbus-1.12.16.tar.gz
# Locally calculated
sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING

2
bsp/buildroot/package/dbus/dbus.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DBUS_VERSION = 1.12.10
DBUS_VERSION = 1.12.16
DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
DBUS_LICENSE_FILES = COPYING

8
bsp/buildroot/package/ddrescue/ddrescue.mk
View File

@@ -18,8 +18,14 @@ define DDRESCUE_CONFIGURE_CMDS
)
endef
DDRESCUE_CXXFLAGS = $(TARGET_CXXFLAGS)
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
DDRESCUE_CXXFLAGS += -O0
endif
define DDRESCUE_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
$(TARGET_MAKE_ENV) $(MAKE) CXXFLAGS="$(DDRESCUE_CXXFLAGS)" -C $(@D)
endef
define DDRESCUE_INSTALL_TARGET_CMDS

4
bsp/buildroot/package/dehydrated/dehydrated.hash
View File

@@ -1,6 +1,6 @@
# Locally computed after verifying
# https://github.com/lukas2511/dehydrated/releases/download/v0.6.2/dehydrated-0.6.2.tar.gz.asc
# https://github.com/lukas2511/dehydrated/releases/download/v0.6.5/dehydrated-0.6.5.tar.gz.asc
# with key 3C2F2605E078A1E18F4793909C4DBE6CF438F333 from https://keybase.io/lukas2511
sha256 163384479199f06f59382ceb6291a299567a2f4f0b963b9b61f2db65a407e80e dehydrated-0.6.2.tar.gz
sha256 10aabd0027450bc70a18e49acaca7a9697e0cfb92368d3e508b7a4d6d69bfa35 dehydrated-0.6.5.tar.gz
# License, locally computed
sha256 b4583b7dd07e3e2a08906de38e7e329d41f921ed9dcb6310b3886e013a6b8723 LICENSE

2
bsp/buildroot/package/dehydrated/dehydrated.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DEHYDRATED_VERSION = 0.6.2
DEHYDRATED_VERSION = 0.6.5
DEHYDRATED_SITE = https://github.com/lukas2511/dehydrated/releases/download/v$(DEHYDRATED_VERSION)
DEHYDRATED_LICENSE = MIT

2
bsp/buildroot/package/dhcp/Config.in
View File

@@ -6,7 +6,7 @@ config BR2_PACKAGE_DHCP
help
DHCP relay agent from the ISC DHCP distribution.
http://www.isc.org/products/DHCP
https://www.isc.org/downloads/dhcp/
if BR2_PACKAGE_DHCP

2
bsp/buildroot/package/dialog/dialog.mk
View File

@@ -9,7 +9,7 @@ DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
DIALOG_SITE = ftp://ftp.invisible-island.net/dialog
DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
--disable-rpath-hack
DIALOG_DEPENDENCIES = host-pkgconf ncurses
DIALOG_DEPENDENCIES = host-pkgconf ncurses $(TARGET_NLS_DEPENDENCIES)
DIALOG_LICENSE = LGPL-2.1
DIALOG_LICENSE_FILES = COPYING

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

@@ -1,3 +1,3 @@
# Locally calculated
sha256 f9be44f395617f3f75faac69ad90f93c94ee4050c193bfa05eddb520a27c5d44 docker-cli-v18.09.4.tar.gz
sha256 cef3f9e8615cde906619f7ab021655a8b974d1b497ce0e5787b1afccbeabb08d docker-cli-18.09.9.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE

4
bsp/buildroot/package/docker-cli/docker-cli.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
DOCKER_CLI_VERSION = v18.09.4
DOCKER_CLI_SITE = $(call github,docker,cli,$(DOCKER_CLI_VERSION))
DOCKER_CLI_VERSION = 18.09.9
DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION))
DOCKER_CLI_WORKSPACE = gopath
DOCKER_CLI_LICENSE = Apache-2.0

2
bsp/buildroot/package/docker-containerd/docker-containerd.hash
View File

@@ -1,3 +1,3 @@
# Computed locally
sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 docker-containerd-v1.2.5.tar.gz
sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 docker-containerd-v1.2.6.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE

2
bsp/buildroot/package/docker-containerd/docker-containerd.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DOCKER_CONTAINERD_VERSION = v1.2.5
DOCKER_CONTAINERD_VERSION = v1.2.6
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE

2
bsp/buildroot/package/docker-engine/docker-engine.hash
View File

@@ -1,3 +1,3 @@
# Locally calculated
sha256 1f4bd15d799420b587024fe3c6d7bd4eb584e509d30c8193db31411579780f2a docker-engine-v18.09.4.tar.gz
sha256 fa3a9e998627418d648495d06d168c4d26ed07859c9370d5fddbfd29c26d8592 docker-engine-18.09.9.tar.gz
sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE

4
bsp/buildroot/package/docker-engine/docker-engine.mk
View File

@@ -4,8 +4,8 @@
#
################################################################################
DOCKER_ENGINE_VERSION = v18.09.4
DOCKER_ENGINE_SITE = $(call github,docker,engine,$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_VERSION = 18.09.9
DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION))
DOCKER_ENGINE_LICENSE = Apache-2.0
DOCKER_ENGINE_LICENSE_FILES = LICENSE

3
bsp/buildroot/package/docker-proxy/docker-proxy.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6 docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
sha256 866c8d196b9396a383b437b0d775476459ed7c11f527c4f6bbf1fd08524b461d docker-proxy-55685ba49593e67f5e1c8180539379b16736c25e.tar.gz
sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE

2
bsp/buildroot/package/docker-proxy/docker-proxy.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
DOCKER_PROXY_VERSION = 55685ba49593e67f5e1c8180539379b16736c25e
DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
DOCKER_PROXY_LICENSE = Apache-2.0

34
bsp/buildroot/package/dosfstools/dosfstools.mk
View File

@@ -24,26 +24,36 @@ DOSFSTOOLS_CONF_OPTS += LIBS="-liconv"
DOSFSTOOLS_DEPENDENCIES += libiconv
endif
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),)
define DOSFSTOOLS_REMOVE_FATLABEL
rm -f $(addprefix $(TARGET_DIR)/sbin/,dosfslabel fatlabel)
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),y)
define DOSFSTOOLS_INSTALL_FATLABEL
$(INSTALL) -D -m 0755 $(@D)/src/fatlabel $(TARGET_DIR)/sbin/fatlabel
ln -sf fatlabel $(TARGET_DIR)/sbin/dosfslabel
endef
DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FATLABEL
endif
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),)
define DOSFSTOOLS_REMOVE_FSCK_FAT
rm -f $(addprefix $(TARGET_DIR)/sbin/,fsck.fat dosfsck fsck.msdos fsck.vfat)
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),y)
define DOSFSTOOLS_INSTALL_FSCK_FAT
$(INSTALL) -D -m 0755 $(@D)/src/fsck.fat $(TARGET_DIR)/sbin/fsck.fat
ln -sf fsck.fat $(TARGET_DIR)/sbin/fsck.vfat
ln -sf fsck.fat $(TARGET_DIR)/sbin/fsck.msdos
ln -sf fsck.fat $(TARGET_DIR)/sbin/dosfsck
endef
DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FSCK_FAT
endif
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),)
define DOSFSTOOLS_REMOVE_MKFS_FAT
rm -f $(addprefix $(TARGET_DIR)/sbin/,mkfs.fat mkdosfs mkfs.msdos mkfs.vfat)
ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),y)
define DOSFSTOOLS_INSTALL_MKFS_FAT
$(INSTALL) -D -m 0755 $(@D)/src/mkfs.fat $(TARGET_DIR)/sbin/mkfs.fat
ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkdosfs
ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkfs.msdos
ln -sf mkfs.fat $(TARGET_DIR)/sbin/mkfs.vfat
endef
DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_MKFS_FAT
endif
define DOSFSTOOLS_INSTALL_TARGET_CMDS
$(call DOSFSTOOLS_INSTALL_FATLABEL)
$(call DOSFSTOOLS_INSTALL_FSCK_FAT)
$(call DOSFSTOOLS_INSTALL_MKFS_FAT)
endef
$(eval $(autotools-package))
$(eval $(host-autotools-package))

2
bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
View File

@@ -1,3 +1,3 @@
# Locally computed after checking signature
sha256 cbaa106e1c2b23824420efdd6a9f8572c64c8dccf75a3101a899b6ddb25149a5 dovecot-2.3-pigeonhole-0.5.5.tar.gz
sha256 d59d0c5c5225a126e5b98bf95d75e8dd368bdeeb3da2e9766dbe4fddaa9411b0 dovecot-2.3-pigeonhole-0.5.7.2.tar.gz
sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING

2
bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
DOVECOT_PIGEONHOLE_VERSION = 0.5.5
DOVECOT_PIGEONHOLE_VERSION = 0.5.7.2
DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3
DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1

2
bsp/buildroot/package/dovecot/dovecot.hash
View File

@@ -1,5 +1,5 @@
# Locally computed after checking signature
sha256 ba14e41aefd81a868a35b83bcb54194116106424d37690519b50ea83c0f31bf2 dovecot-2.3.5.2.tar.gz
sha256 666ce084760a47e601d49a9be3c7993c48789d332631e8dfb45f443b367b1260 dovecot-2.3.7.2.tar.gz
sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT

11
bsp/buildroot/package/dovecot/dovecot.mk
View File

@@ -5,8 +5,8 @@
################################################################################
DOVECOT_VERSION_MAJOR = 2.3
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).5.2
DOVECOT_SITE = https://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).7.2
DOVECOT_SITE = https://dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
DOVECOT_INSTALL_STAGING = YES
DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
@@ -64,6 +64,13 @@ else
DOVECOT_CONF_OPTS += --without-sodium
endif
ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
DOVECOT_CONF_OPTS += --with-pam
DOVECOT_DEPENDENCIES += linux-pam
else
DOVECOT_CONF_OPTS += --without-pam
endif
ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y)
DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
DOVECOT_CONF_OPTS += --with-mysql

35
bsp/buildroot/package/dropbear/0003-Fix-for-issue-successfull-login-of-disabled-user-78.patch Normal file
View File

@@ -0,0 +1,35 @@
From a0aa2749813331134452f80bb8a808bdc871ba41 Mon Sep 17 00:00:00 2001
From: vincentto13 <33652988+vincentto13@users.noreply.github.com>
Date: Wed, 20 Mar 2019 15:03:40 +0100
Subject: [PATCH] Fix for issue successfull login of disabled user (#78)
This commit introduces fix for scenario:
1. Root login disabled on dropbear
2. PAM authentication model enabled
While login as root user, after prompt for password
user is being notified about login failrue, but
after second attempt of prompt for password within
same session, login becames succesfull.
Signed-off-by: Pawel Rapkiewicz <pawel.rapkiewicz@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
svr-authpam.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/svr-authpam.c b/svr-authpam.c
index d201bc9..e236db4 100644
--- a/svr-authpam.c
+++ b/svr-authpam.c
@@ -275,6 +275,7 @@ void svr_auth_pam(int valid_user) {
/* PAM auth succeeded but the username isn't allowed in for another reason
(checkusername() failed) */
send_msg_userauth_failure(0, 1);
+ goto cleanup;
}
/* successful authentication */
--
2.11.0

2
bsp/buildroot/package/dropbear/dropbear.mk
View File

@@ -7,7 +7,7 @@
DROPBEAR_VERSION = 2018.76
DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
DROPBEAR_LICENSE = MIT, BSD-2-Clause, BSD-3-Clause
DROPBEAR_LICENSE_FILES = LICENSE
DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)

4
bsp/buildroot/package/e2fsprogs/e2fsprogs.hash
View File

@@ -1,5 +1,5 @@
# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.44.5/sha256sums.asc
sha256 ba5eb3069d69160d96818bb9700de9ab5a8458d9add1fd85d427c0000d34c5b9 e2fsprogs-1.44.5.tar.xz
# https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.4/sha256sums.asc
sha256 65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02 e2fsprogs-1.45.4.tar.xz
# Locally calculated
sha256 5da5ef153e559c1d990d4c3eedbedd4442db892d37eae1f35fff069de8ec9020 NOTICE
sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d lib/ss/mit-sipb-copyright.h

5
bsp/buildroot/package/e2fsprogs/e2fsprogs.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
E2FSPROGS_VERSION = 1.44.5
E2FSPROGS_VERSION = 1.45.4
E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
@@ -28,7 +28,8 @@ HOST_E2FSPROGS_CONF_OPTS = \
--disable-libuuid \
--disable-testio-debug \
--enable-symlink-install \
--enable-elf-shlibs
--enable-elf-shlibs \
--with-crond-dir=no
# Set the binary directories to "/bin" and "/sbin", as busybox does,
# so that we do not end up with two versions of e2fs tools.

32
bsp/buildroot/package/elfutils/0004-libelf-Fix-possible-resource-leak-in-elf-32-64-_updatefile.patch Normal file
View File

@@ -0,0 +1,32 @@
From 75e147d0ab85262d9bb2fff093db7ce67dbd4b62 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Wed, 6 Mar 2019 19:56:54 +0100
Subject: [PATCH] libelf: Fix possible resource leak in elf[32|64]_updatefile.
When we cannot allocate enough memory to convert the data in
updatemmap we should free the scns before returning an error.
Signed-off-by: Mark Wielaard <mark@klomp.org>
[Retrieved (and slightly updated to remove ChangeLog update) from:
https://sourceware.org/git/?p=elfutils.git;a=patch;h=75e147d0ab85262d9bb2fff093db7ce67dbd4b62]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libelf/elf32_updatefile.c | 1 +
2 files changed, 6 insertions(+)
* gelf_xlate.c (__elf_xfctstof): Remove alias.
diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 2899c6f..457d18e 100644
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -365,6 +365,7 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
char *converted = aligned_alloc (align, size);
if (converted == NULL)
{
+ free (scns);
__libelf_seterrno (ELF_E_NOMEM);
return 1;
}
--
2.9.3

58
bsp/buildroot/package/elfutils/0005-libelf-Use-posix_memalign-instead-of-aligned_alloc.patch Normal file
View File

@@ -0,0 +1,58 @@
From 6bd060a23f43a842fbc37dd1bb8d6d7964eda36e Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mark@klomp.org>
Date: Thu, 7 Mar 2019 17:31:53 +0100
Subject: [PATCH] libelf: Use posix_memalign instead of aligned_alloc.
Older glibc might not have aligned_alloc (it is C11).
Use posix_memalign instead. posix_memalign requires the alignment to
be a multiple of sizeof (void *). So use malloc for smaller alignments.
Signed-off-by: Mark Wielaard <mark@klomp.org>
[Retrieved (and slighlty updated to remove ChangeLog update) from:
https://sourceware.org/git/?p=elfutils.git;a=patch;h=6bd060a23f43a842fbc37dd1bb8d6d7964eda36e]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libelf/elf32_updatefile.c | 20 +++++++++++++++++---
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 457d18e..eea51a7 100644
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -360,16 +360,30 @@ __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
else
{
/* We have to do the conversion on properly
- aligned memory first. */
+ aligned memory first. align is a power of 2,
+ but posix_memalign only works for alignments
+ which are a multiple of sizeof (void *).
+ So use normal malloc for smaller alignments. */
size_t size = dl->data.d.d_size;
- char *converted = aligned_alloc (align, size);
+ void *converted;
+ if (align < sizeof (void *))
+ converted = malloc (size);
+ else
+ {
+ int res;
+ res = posix_memalign (&converted, align, size);
+ if (res != 0)
+ converted = NULL;
+ }
+
if (converted == NULL)
{
free (scns);
__libelf_seterrno (ELF_E_NOMEM);
return 1;
}
- (*fctp) (converted, dl->data.d.d_buf, size, 1);
+
+ (*fctp) (converted, dl->data.d.d_buf, size, 1);
/* And then write it to the mmapped file. */
memcpy (last_position, converted, size);
--
2.9.3

4
bsp/buildroot/package/elfutils/elfutils.hash
View File

@@ -1,5 +1,5 @@
# From https://sourceware.org/elfutils/ftp/0.174/sha512.sum
sha512 696708309c2a9a076099748809ecdc0490f4a8a842b2efc1aae0d746e7c5a8b203743f5626739eff837216b0c052696516b2821f5d3cc3f2eef86597c96d42df elfutils-0.174.tar.bz2
# From https://sourceware.org/elfutils/ftp/0.176/sha512.sum
sha512 7f032913be363a43229ded85d495dcf7542b3c85974aaaba0d984228dc9ac1721da3dc388d3fa02325a80940161db7e9ad2c9e4521a424ad8a7d050c0902915b elfutils-0.176.tar.bz2
# Locally calculated
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING-GPLV2

2
bsp/buildroot/package/elfutils/elfutils.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
ELFUTILS_VERSION = 0.174
ELFUTILS_VERSION = 0.176
ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
ELFUTILS_INSTALL_STAGING = YES

2
bsp/buildroot/package/eudev/eudev.mk
View File

@@ -51,6 +51,8 @@ endef
# Required by default rules for input devices
define EUDEV_USERS
- - input -1 * - - - Input device group
- - render -1 * - - - DRI rendering nodes
- - kvm -1 * - - - kvm nodes
endef
$(eval $(autotools-package))

38
bsp/buildroot/package/evtest/0001-Add-missing-limits.h-include.patch Normal file
View File

@@ -0,0 +1,38 @@
From 7d7c5a81b0e2f3321d269b7acc450d1eec7a910b Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Sun, 18 Aug 2019 09:57:23 +0300
Subject: [PATCH] Add missing limits.h include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes build with musl libc that does not include limits.h indirectly via
other headers.
evtest.c: In function ‘scan_devices’:
evtest.c:886:14: error: ‘PATH_MAX’ undeclared (first use in this function); did you mean INT8_MAX’?
char fname[PATH_MAX];
^~~~~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: sent to input-tools@lists.freedesktop.org (moderated)
evtest.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/evtest.c b/evtest.c
index 37d4f8540333..548c203564d3 100644
--- a/evtest.c
+++ b/evtest.c
@@ -56,6 +56,7 @@
#include <getopt.h>
#include <ctype.h>
#include <signal.h>
+#include <limits.h>
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
--
2.23.0.rc1

27
bsp/buildroot/package/exim/0004-glibc.patch
View File

@@ -1,27 +0,0 @@
uClibc does not contain gnu/libc-version.h
Patch sent upstream: https://bugs.exim.org/show_bug.cgi?id=2070
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -uNr exim-4.88.org/src/exim.c exim-4.88/src/exim.c
--- exim-4.88.org/src/exim.c 2016-12-18 15:02:28.000000000 +0100
+++ exim-4.88/src/exim.c 2016-12-26 12:12:57.000000000 +0100
@@ -12,7 +12,7 @@
#include "exim.h"
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
# include <gnu/libc-version.h>
#endif
@@ -1044,7 +1044,7 @@
fprintf(f, "Compiler: <unknown>\n");
#endif
-#ifdef __GLIBC__
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
fprintf(f, "Library version: Glibc: Compile: %d.%d\n",
__GLIBC__, __GLIBC_MINOR__);
if (__GLIBC_PREREQ(2, 1))

0
bsp/buildroot/package/exim/0006-remove-libnsl.patch → bsp/buildroot/package/exim/0004-remove-libnsl.patch
View File

37
bsp/buildroot/package/exim/0005-Fix-base64d-buffer-size-CVE-2018-6789.patch
View File

@@ -1,37 +0,0 @@
From 062990cc1b2f9e5d82a413b53c8f0569075de700 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Mon, 5 Feb 2018 22:23:32 +0100
Subject: [PATCH] Fix base64d() buffer size (CVE-2018-6789)
Credits for discovering this bug: Meh Chang <meh@devco.re>
[Peter: Drop ChangeLog change, fix path]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
src/base64.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/base64.c b/src/base64.c
index f6f187f0..e58ca6c7 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -152,10 +152,14 @@ static uschar dec64table[] = {
int
b64decode(const uschar *code, uschar **ptr)
{
+
int x, y;
-uschar *result = store_get(3*(Ustrlen(code)/4) + 1);
+uschar *result;
-*ptr = result;
+{
+ int l = Ustrlen(code);
+ *ptr = result = store_get(1 + l/4 * 3 + l%4);
+}
/* Each cycle of the loop handles a quantum of 4 input bytes. For the last
quantum this may decode to 1, 2, or 3 output bytes. */
--
2.11.0

35
bsp/buildroot/package/exim/0005-Fix-uClibc-build.patch Normal file
View File

@@ -0,0 +1,35 @@
From 68ea4fc7ca53bf010e5ec738ad078452f0eaa639 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Tue, 23 Jul 2019 18:48:06 +0200
Subject: [PATCH] Fix uClibc build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
structs.h:757:18: error: ‘NS_MAXMSG’ undeclared here (not in a function); did you mean ‘N_MASC’?
uschar answer[NS_MAXMSG]; /* the answer itself */
Patch sent upstream: https://github.com/Exim/exim/pull/70
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
OS/os.h-Linux | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/OS/os.h-Linux b/OS/os.h-Linux
index 63cf9babd..1d82e9bad 100644
--- a/OS/os.h-Linux
+++ b/OS/os.h-Linux
@@ -87,5 +87,9 @@ then change the 0 to 1 in the next block. */
# define TCPI_OPT_SYN_DATA 32
#endif
+/* Needed for uClibc */
+#ifndef NS_MAXMSG
+# define NS_MAXMSG 65535
+#endif
/* End */
--
2.20.1

44
bsp/buildroot/package/exim/0006-Fix-buffer-overflow-in-string_vformat.patch Normal file
View File

@@ -0,0 +1,44 @@
From 478effbfd9c3cc5a627fc671d4bf94d13670d65f Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Fri, 27 Sep 2019 12:21:49 +0100
Subject: [PATCH] Fix buffer overflow in string_vformat. Bug 2449
Fixes CVE-2019-16928:
https://lists.exim.org/lurker/message/20190928.003428.2b4c81a7.en.html
Downloaded from upstream commit
https://git.exim.org/exim.git/patch/478effbfd9c3cc5a627fc671d4bf94d13670d65f
[adjusted patch of string.c and removed patches for test/]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
src/string.c | 4 ++--
scripts/0000-Basic/0214 | 11 +++++++++++
stdout/0214 | 7 +++++++
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/src/string.c b/src/src/string.c
index c6549bf..3445f8a 100644
--- a/src/string.c
+++ b/src/string.c
@@ -1132,7 +1132,7 @@ store_reset(g->s + (g->size = g->ptr + 1));
Arguments:
g the growable-string
p current end of data
- count amount to grow by
+ count amount to grow by, offset from p
*/
static void
@@ -1590,7 +1590,7 @@ while (*fp)
}
else if (g->ptr >= lim - width)
{
- gstring_grow(g, g->ptr, width - (lim - g->ptr));
+ gstring_grow(g, g->ptr, width);
lim = g->size - 1;
gp = CS g->s + g->ptr;
}
--
1.9.1

3
bsp/buildroot/package/exim/exim.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated after checking pgp signature
sha256 1a21322a10e2da9c0bd6a2a483b6e7ef8fa7f16efcab4c450fd73e7188f5fa94 exim-4.89.1.tar.xz
sha256 01d7ae481d03ff408f8e54fd9b250324ea5ddabc83b1db32917c7f27a096a654 exim-4.92.2.tar.xz
sha256 49240db527b7e55b312a46fc59794fde5dd006422e422257f4f057bfd27b3c8f LICENCE

16
bsp/buildroot/package/exim/exim.mk
View File

@@ -4,12 +4,12 @@
#
################################################################################
EXIM_VERSION = 4.89.1
EXIM_VERSION = 4.92.2
EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4
EXIM_SITE = https://ftp.exim.org/pub/exim/exim4
EXIM_LICENSE = GPL-2.0+
EXIM_LICENSE_FILES = LICENCE
EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf
EXIM_DEPENDENCIES = host-berkeleydb host-pcre pcre berkeleydb host-pkgconf
# Modify a variable value. It must already exist in the file, either
# commented or not.
@@ -65,7 +65,7 @@ endef
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
EXIM_DEPENDENCIES += openssl
EXIM_DEPENDENCIES += host-openssl openssl
define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL
$(call exim-config-change,SUPPORT_TLS,yes)
$(call exim-config-change,USE_OPENSSL_PC,openssl)
@@ -111,9 +111,17 @@ ifeq ($(BR2_STATIC_LIBS),y)
EXIM_STATIC_FLAGS = LFLAGS="-pthread --static"
endif
# We need the host version of macro_predef during the build, before
# building it we need to prepare the makefile.
# "The -j (parallel) flag must not be used with make"
# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html)
define EXIM_BUILD_CMDS
$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) makefile
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D)/build-br macro_predef \
CC=$(HOSTCC) \
LNCC=$(HOSTCC) \
CFLAGS="$(HOST_CFLAGS)" \
LFLAGS="-fPIC $(HOST_LDFLAGS)"
$(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS)
endef

8
bsp/buildroot/package/expat/expat.hash
View File

@@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/expat/files/expat/2.2.6/
md5 ca047ae951b40020ac831c28859161b2 expat-2.2.6.tar.bz2
sha1 c8947fc3119a797b55485f2f7bdaaeb49cc9df01 expat-2.2.6.tar.bz2
# From https://sourceforge.net/projects/expat/files/expat/2.2.8/
md5 cdf54239f892fc7914957f10de1e1c70 expat-2.2.8.tar.xz
sha1 500a848d7085df06020a86bf64c5f71c0052a080 expat-2.2.8.tar.xz
# Locally calculated
sha256 17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2 expat-2.2.6.tar.bz2
sha256 61caa81a49d858afb2031c7b1a25c97174e7f2009aa1ec4e1ffad2316b91779b expat-2.2.8.tar.xz
sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 COPYING

4
bsp/buildroot/package/expat/expat.mk
View File

@@ -4,9 +4,9 @@
#
################################################################################
EXPAT_VERSION = 2.2.6
EXPAT_VERSION = 2.2.8
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
EXPAT_INSTALL_STAGING = YES
EXPAT_DEPENDENCIES = host-pkgconf
HOST_EXPAT_DEPENDENCIES = host-pkgconf

4
bsp/buildroot/package/expect/expect.hash
View File

@@ -1,4 +1,4 @@
# From https://sourceforge.net/projects/expect/files/Expect/5.45.3/expect5.45.3.tar.gz.SHA256
sha256 c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9 expect5.45.3.tar.gz
# From https://sourceforge.net/projects/expect/files/Expect/5.45.4/expect5.45.4.tar.gz.SHA256
sha256 49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34 expect5.45.4.tar.gz
# Locally calculated
sha256 b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab README

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