busybox: 1.25.1 -> 1.26.1
This commit is contained in:
parent
cdf306909f
commit
9bd93ac6e0
|
@ -1,14 +1,14 @@
|
||||||
Allow BusyBox to be invoked as "<something>-busybox". This is
|
Allow BusyBox to be invoked as "<something>-busybox". This is
|
||||||
necessary when it's run from the Nix store as <hash>-busybox during
|
necessary when it's run from the Nix store as <hash>-busybox during
|
||||||
stdenv bootstrap.
|
stdenv bootstrap.
|
||||||
--- busybox-1.25.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400
|
--- busybox-1.26.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400
|
||||||
+++ busybox-1.25.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400
|
+++ busybox-1.26.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400
|
||||||
@@ -884,7 +884,7 @@
|
@@ -887,7 +887,7 @@
|
||||||
int applet;
|
static NORETURN void run_applet_and_exit(const char *name, char **argv)
|
||||||
|
{
|
||||||
# if ENABLE_BUSYBOX
|
# if ENABLE_BUSYBOX
|
||||||
- if (is_prefixed_with(name, "busybox"))
|
- if (is_prefixed_with(name, "busybox"))
|
||||||
+ if (strstr(name, "busybox") != 0)
|
+ if (strstr(name, "busybox") != 0)
|
||||||
exit(busybox_main(argv));
|
exit(busybox_main(argv));
|
||||||
# endif
|
# endif
|
||||||
/* find_applet_by_name() search is more expensive, so goes second */
|
# if NUM_APPLETS > 0
|
||||||
|
|
|
@ -26,11 +26,11 @@ let
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "busybox-1.25.1";
|
name = "busybox-1.26.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://busybox.net/downloads/${name}.tar.bz2";
|
url = "http://busybox.net/downloads/${name}.tar.bz2";
|
||||||
sha256 = "0bm0l8xdjdz3kdyajp8wg27yamsw7r2y88nnrxwvvz984c7pwri7";
|
sha256 = "1wl1yy82am53srhgpi1w04hs5hbqjljrrxwwfic35k1mza3y9fqg";
|
||||||
};
|
};
|
||||||
|
|
||||||
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];
|
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];
|
||||||
|
|
Loading…
Reference in a new issue