From e7bdf94241b031ed1308a915e9a58b949d52f31f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 31 May 2008 12:58:22 +0000 Subject: [PATCH] busybox: additional 1.10.2 fixes --- package/busybox/busybox-1.10.2-fuser.patch | 29 ++++++++++++++++++++++ package/busybox/busybox-1.10.2-ip.patch | 11 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 package/busybox/busybox-1.10.2-fuser.patch create mode 100644 package/busybox/busybox-1.10.2-ip.patch diff --git a/package/busybox/busybox-1.10.2-fuser.patch b/package/busybox/busybox-1.10.2-fuser.patch new file mode 100644 index 0000000000..02a22e0af7 --- /dev/null +++ b/package/busybox/busybox-1.10.2-fuser.patch @@ -0,0 +1,29 @@ +--- busybox-1.10.2/procps/fuser.c Sat Apr 19 06:03:13 2008 ++++ busybox-1.10.2-fuser/procps/fuser.c Wed May 28 16:53:35 2008 +@@ -208,6 +208,7 @@ + return plist; + } + ++/* NB: does chdir internally */ + static pid_list *scan_proc_pids(inode_list *ilist) + { + DIR *d; +@@ -215,7 +216,8 @@ + pid_t pid; + pid_list *plist; + +- d = opendir("."); ++ xchdir("/proc"); ++ d = opendir("/proc"); + if (!d) + return NULL; + +@@ -329,7 +331,7 @@ + pp++; + } + +- plist = scan_proc_pids(ilist); ++ plist = scan_proc_pids(ilist); /* changes dir to "/proc" */ + + if (!plist) + return EXIT_FAILURE; diff --git a/package/busybox/busybox-1.10.2-ip.patch b/package/busybox/busybox-1.10.2-ip.patch new file mode 100644 index 0000000000..ad5569a1fc --- /dev/null +++ b/package/busybox/busybox-1.10.2-ip.patch @@ -0,0 +1,11 @@ +--- busybox-1.10.2/networking/libiproute/ip_parse_common_args.c Sat Apr 19 05:50:26 2008 ++++ busybox-1.10.2-ip/networking/libiproute/ip_parse_common_args.c Sat May 31 09:32:09 2008 +@@ -54,7 +54,7 @@ + break; + } + } +- arg = index_in_strings(ip_common_commands, opt); ++ arg = index_in_substrings(ip_common_commands, opt); + if (arg < 0) + bb_show_usage(); + if (arg == ARG_oneline) { -- 2.30.2