kirkstone migration: update busybox package
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera
parent
b68ddc2357
commit
1f6ece730d
|
|
@ -1,45 +0,0 @@
|
|||
From 85f164ec427fecbae24140b3c93acbbe2ba1c817 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Tue, 13 Nov 2018 11:27:01 +0800
|
||||
Subject: [PATCH] testsuite: check uudecode before using it
|
||||
|
||||
The unzip and tar test cases use uudecode command, so also
|
||||
check it via optional function.
|
||||
|
||||
Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2018-November/086833.html]
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
testsuite/tar.tests | 2 +-
|
||||
testsuite/unzip.tests | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
|
||||
index d71a349..8c88567 100755
|
||||
--- a/testsuite/tar.tests
|
||||
+++ b/testsuite/tar.tests
|
||||
@@ -339,7 +339,7 @@ cd .. || exit 1; rm -rf tar.tempdir 2>/d
|
||||
fi
|
||||
|
||||
mkdir tar.tempdir && cd tar.tempdir || exit 1
|
||||
-optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS
|
||||
+optional FEATURE_SEAMLESS_BZ2 FEATURE_TAR_AUTODETECT LS UUDECODE
|
||||
testing "tar Symlink attack: create symlink and then write through it" '\
|
||||
exec 2>&1
|
||||
uudecode -o input && tar xvf input; echo $?
|
||||
diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
|
||||
index af53de9..3b45ece 100755
|
||||
--- a/testsuite/unzip.tests
|
||||
+++ b/testsuite/unzip.tests
|
||||
@@ -31,7 +31,7 @@ rmdir foo
|
||||
rm foo.zip
|
||||
|
||||
# File containing some damaged encrypted stream
|
||||
-optional FEATURE_UNZIP_CDF CONFIG_UNICODE_SUPPORT
|
||||
+optional FEATURE_UNZIP_CDF CONFIG_UNICODE_SUPPORT UUDECODE
|
||||
testing "unzip (bad archive)" "uudecode; unzip bad.zip 2>&1; echo \$?" \
|
||||
"Archive: bad.zip
|
||||
inflating: ]3j½r«I??K-%Ix
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
|
@ -1,87 +0,0 @@
|
|||
From 53626cd06a3ef05ed847daea802ef0aa9661caa7 Mon Sep 17 00:00:00 2001
|
||||
From: Anders Darander <anders@chargestorm.se>
|
||||
Date: Thu, 3 Nov 2011 08:51:31 +0100
|
||||
Subject: [PATCH] busybox-udhcpc-no_deconfig.patch
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Add a new option -D to the udhcpc client that allows for
|
||||
dhcp renewal to occur without having to down the interface
|
||||
in the process.
|
||||
|
||||
Signed-off-by: Greg Moffatt <greg.moffatt@windriver.com>
|
||||
|
||||
Updated to latest Busybox 1.17.3
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
Updated to Busybox 1.18.4
|
||||
option spec is changed
|
||||
|
||||
Signed-off-by: Qing He <qing.he@intel.com>
|
||||
|
||||
Updated to Busybox 1.19.3
|
||||
|
||||
Signed-off-by: Anders Darander <anders@chargestorm.se>
|
||||
|
||||
Fixed options -b, -a and -P.
|
||||
|
||||
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||
---
|
||||
networking/udhcp/dhcpc.c | 29 ++++++++++++++++------
|
||||
1 file changed, 21 insertions(+), 8 deletions(-)
|
||||
|
||||
Index: busybox-1.34.0/networking/udhcp/dhcpc.c
|
||||
===================================================================
|
||||
--- busybox-1.34.0.orig/networking/udhcp/dhcpc.c
|
||||
+++ busybox-1.34.0/networking/udhcp/dhcpc.c
|
||||
@@ -48,6 +48,8 @@
|
||||
};
|
||||
#endif
|
||||
|
||||
+/* option whether to down the interface when reconfiguring */
|
||||
+static int allow_deconfig = 1;
|
||||
|
||||
/* "struct client_data_t client_data" is in bb_common_bufsiz1 */
|
||||
|
||||
@@ -100,8 +102,10 @@
|
||||
OPT_x = 1 << 16,
|
||||
OPT_f = 1 << 17,
|
||||
OPT_B = 1 << 18,
|
||||
+ OPT_D = 1 << 19,
|
||||
/* The rest has variable bit positions, need to be clever */
|
||||
OPTBIT_B = 18,
|
||||
+ OPTBIT_D = 19,
|
||||
USE_FOR_MMU( OPTBIT_b,)
|
||||
IF_FEATURE_UDHCPC_ARPING(OPTBIT_a,)
|
||||
IF_FEATURE_UDHCP_PORT( OPTBIT_P,)
|
||||
@@ -587,7 +591,8 @@
|
||||
|
||||
static void d4_run_script_deconfig(void)
|
||||
{
|
||||
- d4_run_script(NULL, "deconfig");
|
||||
+ if (allow_deconfig)
|
||||
+ d4_run_script(NULL, "deconfig");
|
||||
}
|
||||
|
||||
/*** Sending/receiving packets ***/
|
||||
@@ -1244,7 +1249,7 @@
|
||||
/* Parse command line */
|
||||
opt = getopt32long(argv, "^"
|
||||
/* O,x: list; -T,-t,-A take numeric param */
|
||||
- "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fB"
|
||||
+ "CV:F:i:np:qRr:s:T:+t:+SA:+O:*ox:*fBD"
|
||||
USE_FOR_MMU("b")
|
||||
IF_FEATURE_UDHCPC_ARPING("a::")
|
||||
IF_FEATURE_UDHCP_PORT("P:")
|
||||
@@ -1361,6 +1366,10 @@
|
||||
logmode |= LOGMODE_SYSLOG;
|
||||
}
|
||||
|
||||
+ if (opt & OPT_D) {
|
||||
+ allow_deconfig = 0;
|
||||
+ }
|
||||
+
|
||||
/* Create pidfile */
|
||||
write_pidfile(client_data.pidfile);
|
||||
/* Goes to stdout (unless NOMMU) and possibly syslog */
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_TAR_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_CHOWN_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_CP_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_BC_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
|
||||
CONFIG_FEATURE_WGET_LONG_OPTIONS=y
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
CONFIG_BLKID=y
|
||||
CONFIG_FEATURE_BLKID_TYPE=y
|
||||
CONFIG_FEATURE_MOUNT_LABEL=y
|
||||
CONFIG_FEATURE_SWAPONOFF_LABEL=y
|
||||
CONFIG_VOLUMEID=y
|
||||
CONFIG_FEATURE_VOLUMEID_BTRFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_EXT=y
|
||||
CONFIG_FEATURE_VOLUMEID_F2FS=y
|
||||
CONFIG_FEATURE_VOLUMEID_FAT=y
|
||||
CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
|
||||
CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
require recipes-core/busybox/busybox.inc
|
||||
|
||||
# Digi: the files used in honister are practically the same as the ones in
|
||||
# hardknott with a few minor differences. Re-use most of the files from poky
|
||||
# to avoid duplicity, while giving priority to our version of the files so that we can
|
||||
# replace the hardknott versions with their respective honister ones.
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:"
|
||||
FILESEXTRAPATHS:append := ":${COREBASE}/meta/recipes-core/busybox/${PN}"
|
||||
FILESEXTRAPATHS:append := ":${COREBASE}/meta/recipes-core/busybox/files"
|
||||
|
||||
SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
|
||||
file://busybox-udhcpc-no_deconfig.patch \
|
||||
file://find-touchscreen.sh \
|
||||
file://busybox-cron \
|
||||
file://busybox-httpd \
|
||||
file://busybox-udhcpd \
|
||||
file://default.script \
|
||||
file://simple.script \
|
||||
file://hwclock.sh \
|
||||
file://syslog \
|
||||
file://syslog-startup.conf \
|
||||
file://syslog.conf \
|
||||
file://busybox-syslog.default \
|
||||
file://mdev \
|
||||
file://mdev.conf \
|
||||
file://mdev-mount.sh \
|
||||
file://defconfig \
|
||||
file://busybox-syslog.service.in \
|
||||
file://busybox-klogd.service.in \
|
||||
file://fail_on_no_media.patch \
|
||||
file://run-ptest \
|
||||
file://inetd.conf \
|
||||
file://inetd \
|
||||
file://login-utilities.cfg \
|
||||
file://recognize_connmand.patch \
|
||||
file://busybox-cross-menuconfig.patch \
|
||||
file://0001-Use-CC-when-linking-instead-of-LD-and-use-CFLAGS-and.patch \
|
||||
file://mount-via-label.cfg \
|
||||
file://sha1sum.cfg \
|
||||
file://sha256sum.cfg \
|
||||
file://getopts.cfg \
|
||||
file://longopts.cfg \
|
||||
file://resize.cfg \
|
||||
${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \
|
||||
${@["", "file://rcS.default"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \
|
||||
${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \
|
||||
file://syslog.cfg \
|
||||
file://unicode.cfg \
|
||||
file://rev.cfg \
|
||||
file://pgrep.cfg \
|
||||
file://rcS \
|
||||
file://rcK \
|
||||
file://makefile-libbb-race.patch \
|
||||
file://0001-testsuite-check-uudecode-before-using-it.patch \
|
||||
file://0001-testsuite-use-www.example.org-for-wget-test-cases.patch \
|
||||
file://0001-du-l-works-fix-to-use-145-instead-of-144.patch \
|
||||
file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \
|
||||
file://0001-mktemp-add-tmpdir-option.patch \
|
||||
"
|
||||
SRC_URI:append:libc-musl = " file://musl.cfg "
|
||||
|
||||
SRC_URI[tarball.sha256sum] = "415fbd89e5344c96acf449d94a6f956dbed62e18e835fc83e064db33a34bd549"
|
||||
Loading…
Reference in New Issue