JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

busybox: 1.27.2 -> 1.28.0

Browse Source
This commit is contained in:
adisbladis 2018-01-08 05:50:23 +08:00
parent 8c1e47a320
commit 65774cb22e
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/os-specific/linux/busybox/busybox-in-store.patch
View File

@ -1,19 +1,19 @@
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.26.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400 --- a/libbb/appletlib.c
+++ busybox-1.26.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400 +++ b/libbb/appletlib.c
@@ -887,7 +887,7 @@ @@ -947,7 +947,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
static NORETURN void run_applet_and_exit(const char *name, char **argv) 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(/*unused:*/ 0, argv));
# endif # endif
# if NUM_APPLETS > 0 # if NUM_APPLETS > 0
@@ -981,7 +981,7 @@ int main(int argc UNUSED_PARAM, char **argv) @@ -1045,7 +1045,7 @@ int main(int argc UNUSED_PARAM, char **argv)
lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv)); lbb_prepare("busybox" IF_FEATURE_INDIVIDUAL(, argv));
# if !ENABLE_BUSYBOX # if !ENABLE_BUSYBOX
- if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox")) - if (argv[1] && is_prefixed_with(bb_basename(argv[0]), "busybox"))

21
pkgs/os-specific/linux/busybox/default.nix
View File

@ -27,35 +27,20 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "busybox-1.27.2"; name = "busybox-1.28.0";
# Note to whoever is updating busybox: please verify that: # Note to whoever is updating busybox: please verify that:
# nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
# still builds after the update. # still builds after the update.
src = fetchurl { src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2"; url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "1pv3vs2w4l2wnw5qb0rkbpvjjdd1fwjv87miavqq0r0ynqbfajwx"; sha256 = "1701carjf02y7r3djm1yvyd5kzrcxm4szinp7agfv7fmvfvm6ib0";
}; };
hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ]; hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];
patches = [ patches = [
./busybox-in-store.patch ./busybox-in-store.patch
(fetchpatch {
name = "CVE-2017-15873.patch";
url = "https://git.busybox.net/busybox/patch/?id=0402cb32df015d9372578e3db27db47b33d5c7b0";
sha256 = "1s3xqifd0dww19mbnzrks0i1az0qwd884sxjzrx33d6a9jxv4dzn";
})
(fetchpatch {
name = "CVE-2017-15874.patch";
url = "https://git.busybox.net/busybox/patch/?id=9ac42c500586fa5f10a1f6d22c3f797df11b1f6b";
sha256 = "0169p4ylz9zd14ghhb39yfjvbdca2kb21pphylfh9ny7i484ahql";
})
(fetchpatch {
name = "CVE-2017-16544.patch";
url = "https://git.busybox.net/busybox/patch/?id=c3797d40a1c57352192c6106cc0f435e7d9c11e8";
sha256 = "1q3lkc4xczxrzhz73x2r0w7kmd6y33zhcnz3478nk5xi0qr66mcy";
})
]; ];
configurePhase = '' configurePhase = ''