MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #21614 from NeQuissimus/busybox_1_26_1

Browse source 
busybox: 1.25.1 -> 1.26.1
This commit is contained in:
Tim Steinbach 2017-01-03 13:09:35 -05:00 committed by GitHub
commit 92d0a977d9
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
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.
--- busybox-1.25.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
@@ -884,7 +884,7 @@
int applet;
# if ENABLE_BUSYBOX
--- busybox-1.26.1-orig/libbb/appletlib.orig 2016-10-26 19:54:20.510957575 -0400
+++ busybox-1.26.1/libbb/appletlib.c 2016-10-26 19:48:31.590862853 -0400
@@ -887,7 +887,7 @@
static NORETURN void run_applet_and_exit(const char *name, char **argv)
{
# if ENABLE_BUSYBOX
- if (is_prefixed_with(name, "busybox"))
+ if (strstr(name, "busybox") != 0)
exit(busybox_main(argv));
# endif
/* find_applet_by_name() search is more expensive, so goes second */
# endif
# if NUM_APPLETS > 0

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

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