diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2016-09-25 08:35:12 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@higgsboson.tk> | 2016-09-25 13:21:29 +0200 |
| commit | 74876b0cad109eca1a94f96abba068042aa7e4ea (patch) | |
| tree | eef32502e2f07a7dc099018b330c48657832f1a0 /pkgs/os-specific/linux/busybox/busybox-in-store.patch | |
| parent | cdec20ac58325af1f606a59413d5a31fc839c8d4 (diff) | |
| download | nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar.gz nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar.bz2 nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar.lz nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar.xz nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.tar.zst nixpkgs-74876b0cad109eca1a94f96abba068042aa7e4ea.zip | |
busybox: 1.23.2 -> 1.24.2
fixes https://lwn.net/Vulnerabilities/696815/
Diffstat (limited to 'pkgs/os-specific/linux/busybox/busybox-in-store.patch')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/busybox-in-store.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch index ea245a49259..ab072efd930 100644 --- a/pkgs/os-specific/linux/busybox/busybox-in-store.patch +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -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 stdenv bootstrap. -diff -ru -x '*~' busybox-1.22.1-orig/libbb/appletlib.c busybox-1.22.1/libbb/appletlib.c ---- busybox-1.22.1-orig/libbb/appletlib.c 2014-01-09 19:15:44.000000000 +0100 -+++ busybox-1.22.1/libbb/appletlib.c 2014-10-29 09:53:01.232052068 +0100 -@@ -764,7 +764,7 @@ +--- busybox-1.24.2-orig/libbb/appletlib.c 2016-03-17 21:35:49.000000000 +0100 ++++ busybox-1.24.2/libbb/appletlib.c 2016-09-25 08:48:18.293104041 +0200 +@@ -779,7 +779,7 @@ int applet = find_applet_by_name(name); if (applet >= 0) run_applet_no_and_exit(applet, argv); -- if (strncmp(name, "busybox", 7) == 0) +- if (is_prefixed_with(name, "busybox")) + if (strstr(name, "busybox") != 0) exit(busybox_main(argv)); } |