alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

busybox: 1.23.2 -> 1.24.2

Browse source 
fixes https://lwn.net/Vulnerabilities/696815/
This commit is contained in:
Jörg Thalheim 2016-09-25 08:35:12 +02:00
parent cdec20ac58
commit 74876b0cad
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/os-specific/linux/busybox/busybox-in-store.patch
View file

@ -2,14 +2,13 @@ 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.
diff -ru -x '*~' busybox-1.22.1-orig/libbb/appletlib.c busybox-1.22.1/libbb/appletlib.c --- busybox-1.24.2-orig/libbb/appletlib.c 2016-03-17 21:35:49.000000000 +0100
--- busybox-1.22.1-orig/libbb/appletlib.c 2014-01-09 19:15:44.000000000 +0100 +++ busybox-1.24.2/libbb/appletlib.c 2016-09-25 08:48:18.293104041 +0200
+++ busybox-1.22.1/libbb/appletlib.c 2014-10-29 09:53:01.232052068 +0100 @@ -779,7 +779,7 @@
@@ -764,7 +764,7 @@
int applet = find_applet_by_name(name); int applet = find_applet_by_name(name);
if (applet >= 0) if (applet >= 0)
run_applet_no_and_exit(applet, argv); run_applet_no_and_exit(applet, argv);
- if (strncmp(name, "busybox", 7) == 0) - if (is_prefixed_with(name, "busybox"))
+ if (strstr(name, "busybox") != 0) + if (strstr(name, "busybox") != 0)
exit(busybox_main(argv)); exit(busybox_main(argv));
} }

4
pkgs/os-specific/linux/busybox/default.nix
View file

@ -26,11 +26,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "busybox-1.23.2"; name = "busybox-1.24.2";
src = fetchurl { src = fetchurl {
url = "http://busybox.net/downloads/${name}.tar.bz2"; url = "http://busybox.net/downloads/${name}.tar.bz2";
sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5"; sha256 = "0mf8f6ly8yi1fbr15jkyv6hxwh2x800x661rcd11rwsnqqzga7p7";
}; };
hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ];