lp:busybox

Created by Jelmer Vernooij on 2010-08-01 and last modified on 2020-05-20
Get this branch:
bzr branch lp:busybox

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
VCS imports
Project:
BusyBox
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at git://busybox.net/busybox.git.

The next import is scheduled to run in 4 hours.

Last successful import was 1 hour ago.

Import started 1 hour ago on alnitak and finished 1 hour ago taking 20 seconds — see the log
Import started 8 hours ago on alnitak and finished 8 hours ago taking 25 seconds — see the log
Import started 15 hours ago on alnitak and finished 15 hours ago taking 25 seconds — see the log
Import started 21 hours ago on alnitak and finished 21 hours ago taking 25 seconds — see the log
Import started on 2020-06-03 on alnitak and finished on 2020-06-03 taking 25 seconds — see the log
Import started on 2020-06-02 on alnitak and finished on 2020-06-02 taking 25 seconds — see the log
Import started on 2020-06-02 on alnitak and finished on 2020-06-02 taking 25 seconds — see the log
Import started on 2020-06-02 on alnitak and finished on 2020-06-02 taking 25 seconds — see the log
Import started on 2020-06-02 on alnitak and finished on 2020-06-02 taking 25 seconds — see the log
Import started on 2020-06-01 on alnitak and finished on 2020-06-01 taking 20 seconds — see the log

Recent revisions

16506. By Dimitri John Ledkov on 2020-05-20

wget: implement TLS verification with ENABLE_FEATURE_WGET_OPENSSL

When ENABLE_FEATURE_WGET_OPENSSL is enabled, correctly implement TLS
verification by default. And only ignore verification errors, if
--no-check-certificate was passed.

Also note, that previously OPENSSL implementation did not implement
TLS verification, nor printed any warning messages that verification
was not performed.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1879533

CVE-2018-1000500

Signed-off-by: Dimitri John Ledkov <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16505. By Ron Yorston <email address hidden> on 2020-04-30

ash,hush: drop pointer check before calls to show_history

show_history() checks that its argument in non-null so there's
no need to repeat the test at call sites.

function old new delta
historycmd 25 17 -8
builtin_history 29 21 -8
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-16) Total: -16 bytes

Signed-off-by: Ron Yorston <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16504. By Ron Yorston <email address hidden> on 2020-04-30

mim: run scripts from a specification file

mim runs scripts from a specification file which can be thought
of as an extremely limited Makefile. Neither make variables nor
dependencies are supported. By default the file 'Mimfile' is read.
An example:

   hello:
      echo hello $1

   clean:
      rm -rf *

The command 'mim' or 'mim hello' will echo 'hello'. Unlike 'make'
arguments after the first are available to the script; they don't
specify additional targets.

mim isn't enabled by default. Enabling it increases the size of the
binary by about 500 bytes.

Signed-off-by: Ron Yorston <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16503. By Ron Yorston <email address hidden> on 2020-04-30

ash: fix build failure when command built-in is disabled

Since commit 7eb8eecbb (ash: eval: Add assignment built-in support
again) building BusyBox with the 'command' built-in disabled fails.

parse_command_args() only needs to be called when the 'command'
built-in is run. Which it won't be if it's disabled.

v2: Avoiding infinite loops is good, too. Thanks, Harald van Dijk.

Reported-by: Deweloper <email address hidden>
Signed-off-by: Ron Yorston <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16502. By Ron Yorston <email address hidden> on 2020-04-30

httpd: permit non-default home directory with NOMMU enabled

When BusyBox is compiled with NOMMU enabled running httpd with
the '-h' option fails even if the specified directory exists:

   $ ls -d www
   www
   $ busybox httpd -fvvvp 8080 -h www
   ...
   ... try to access http://localhost:8080/www
   ...
   httpd: can't change directory to 'www': No such file or directory

The parent process executes xchdir("www"). When a connection is accepted
it's handled by re-executing httpd in inetd mode. The child process
inherits the current directory "www" and tries to change directory again
to "www", which fails.

Omit the call to xchdir() when httpd is re-executed.

Signed-off-by: Ron Yorston <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16501. By Sören Tempel <email address hidden> on 2020-04-29

grep: add proper support for pattern_list

From POSIX.1-2008:

 The pattern_list's value shall consist of one or more patterns
 separated by <newline> characters;

As such, given patterns need to be split at newline characters. Without
doing so, busybox grep will interpret the newline as part of the pattern
which is not in accordance with POSIX.

See also: https://bugs.busybox.net/show_bug.cgi?id=12721

Signed-off-by: Denys Vlasenko <email address hidden>

16500. By Gray Wolf <email address hidden> on 2020-04-29

grep: Fix -f FILE when FILE is empty and -x provided

Grep currently special-cased empty pattern file to be the same as
pattern file with one empty line (empty pattern). That does mirror how
GNU grep behaves, except when -x is provided. In that case .* pattern
needs to be used instead.

Signed-off-by: Gray Wolf <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16499. By Ron Yorston <email address hidden> on 2020-04-29

xargs: restore correct behaviour of -n option

Since commit 1ff7002b1 (xargs: fix handling of quoted arguments, closes
11441) the -n option hasn't worked properly:

   $ echo 1 2 3 | xargs -n 1 echo
   1
   2

   3

   $

Because state is now remembered between calls to process_stdin() it's
necessary to update the state before any premature return.

Signed-off-by: Ron Yorston <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16498. By Jean-Philippe Brucker <email address hidden> on 2020-04-29

build system: remove KBUILD_STR()

When using GNU Make >=4.3, the KBUILD_STR() definition interferes badly
with dependency checks during build, and forces a complete rebuild every
time Make runs.

In if_changed_rule, Kconfig checks if the command used to build a file
has changed since last execution. The previous command is stored in the
generated .<file>.o.cmd file. For example applets/.applets.o.cmd defines
a "cmd_applets/applets.o" variable:

 cmd_applets/applets.o := gcc ... -D"KBUILD_STR(s)=#s" ...

Here the '#' should be escaped with a backslash, otherwise GNU Make
interprets it as starting a comment, and ignore the rest of the
variable. As a result of this truncation, the previous command doesn't
equal the new command and Make rebuilds each target.

The problem started to appear when GNU Make 4.3 (released January 2020),
introduced a backward-incompatible fix to macros containing a '#'. While
the above use of '#', a simple Make variable, still needs to be escaped,
a '#' within a function invocation doesn't need to be escaped anymore.
As Martin Dorey explained on the GNU Make discussion [1], the above
declaration is generated from make-cmd, defined as:

 make-cmd = $(subst \#,\\\#,$(subst $$,$$$$,$(call escsq,$(cmd_$(1))))

Since GNU Make 4.3, the first argument of subst should not have a
backslash. make-cmd now looks for literally \# and doesn't find it, and
as a result doesn't add the backslash when generating .o.cmd files.

[1] http://savannah.gnu.org/bugs/?20513

We could fix it by changing make-cmd to "$(subst #,\#,...)", but to
avoid compatibility headaches, simply get rid of the KBUILD_STR
definition, as done in Linux by b42841b7bb62 ("kbuild: Get rid of
KBUILD_STR"). Quote the string arguments directly rather than asking the
preprocessor to quote them.

Signed-off-by: Jean-Philippe Brucker <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

16497. By Lauri Kasanen <email address hidden> on 2020-04-29

unzip: -d should create the dir

The official Info-Zip unzip creates the dir if it doesn't exist.

Signed-off-by: Lauri Kasanen <email address hidden>
Signed-off-by: Denys Vlasenko <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers

No subscribers.