busybox: bump version
This commit is contained in:
Peter Korsgaard
parent
12ea7146cb
commit
7581683ef8
@ -50,7 +50,7 @@ config BR2_BUSYBOX_VERSION
|
||||
default "1.7.5" if BR2_BUSYBOX_VERSION_1_7_X
|
||||
default "1.8.3" if BR2_BUSYBOX_VERSION_1_8_X
|
||||
default "1.9.2" if BR2_BUSYBOX_VERSION_1_9_X
|
||||
default "1.10.0" if BR2_BUSYBOX_VERSION_1_10_X
|
||||
default "1.10.1" if BR2_BUSYBOX_VERSION_1_10_X
|
||||
|
||||
|
||||
config BR2_PACKAGE_BUSYBOX_FULLINSTALL
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
--- busybox-1.10.0/procps/fuser.c Thu Mar 20 12:47:05 2008
|
||||
+++ busybox-1.10.0-fuser/procps/fuser.c Sat Mar 29 18:55:23 2008
|
||||
@@ -57,11 +57,11 @@
|
||||
|
||||
static char *parse_net_arg(const char *arg, unsigned *port)
|
||||
{
|
||||
- char path[12], tproto[5];
|
||||
+ char path[20], tproto[5];
|
||||
|
||||
if (sscanf(arg, "%u/%4s", port, tproto) != 2)
|
||||
return NULL;
|
||||
- sprintf(path, "net/%s", tproto);
|
||||
+ sprintf(path, "/proc/net/%s", tproto);
|
||||
if (access(path, R_OK) != 0)
|
||||
return NULL;
|
||||
return xstrdup(tproto);
|
||||
@@ -99,7 +99,7 @@
|
||||
static inode_list *scan_proc_net(const char *proto,
|
||||
unsigned port, inode_list *ilist)
|
||||
{
|
||||
- char path[12], line[MAX_LINE + 1];
|
||||
+ char path[20], line[MAX_LINE + 1];
|
||||
char addr[128];
|
||||
ino_t tmp_inode;
|
||||
dev_t tmp_dev;
|
||||
@@ -109,7 +109,7 @@
|
||||
|
||||
tmp_dev = find_socket_dev();
|
||||
|
||||
- sprintf(path, "net/%s", proto);
|
||||
+ sprintf(path, "/proc/net/%s", proto);
|
||||
f = fopen(path, "r");
|
||||
if (!f)
|
||||
return ilist;
|
||||
@@ -313,8 +313,6 @@
|
||||
|
||||
opt = getopt32(argv, OPTION_STRING);
|
||||
argv += optind;
|
||||
-
|
||||
- xchdir("/proc");
|
||||
|
||||
ilist = NULL;
|
||||
pp = argv;
|
||||
@ -1,62 +0,0 @@
|
||||
--- busybox-1.10.0/coreutils/tail.c Thu Mar 20 12:46:51 2008
|
||||
+++ busybox-1.10.0-tail/coreutils/tail.c Sun Mar 23 04:25:12 2008
|
||||
@@ -163,8 +163,6 @@
|
||||
fmt = header_fmt + 1; /* Skip header leading newline on first output. */
|
||||
i = 0;
|
||||
do {
|
||||
- off_t current;
|
||||
-
|
||||
if (nfiles > header_threshhold) {
|
||||
tail_xprint_header(fmt, argv[i]);
|
||||
fmt = header_fmt;
|
||||
@@ -173,19 +171,17 @@
|
||||
/* Optimizing count-bytes case if the file is seekable.
|
||||
* Beware of backing up too far.
|
||||
* Also we exclude files with size 0 (because of /proc/xxx) */
|
||||
- current = lseek(fds[i], 0, SEEK_END);
|
||||
- if (current > 0) {
|
||||
- if (!from_top) {
|
||||
+ if (COUNT_BYTES && !from_top) {
|
||||
+ off_t current = lseek(fds[i], 0, SEEK_END);
|
||||
+ if (current > 0) {
|
||||
if (count == 0)
|
||||
continue; /* showing zero lines is easy :) */
|
||||
- if (COUNT_BYTES) {
|
||||
- current -= count;
|
||||
- if (current < 0)
|
||||
- current = 0;
|
||||
- xlseek(fds[i], current, SEEK_SET);
|
||||
- bb_copyfd_size(fds[i], STDOUT_FILENO, count);
|
||||
- continue;
|
||||
- }
|
||||
+ current -= count;
|
||||
+ if (current < 0)
|
||||
+ current = 0;
|
||||
+ xlseek(fds[i], current, SEEK_SET);
|
||||
+ bb_copyfd_size(fds[i], STDOUT_FILENO, count);
|
||||
+ continue;
|
||||
}
|
||||
}
|
||||
|
||||
--- busybox-1.10.0/testsuite/tail/tail-n-works Thu Mar 20 12:46:57 2008
|
||||
+++ busybox-1.10.0-tail/testsuite/tail/tail-n-works Sun Mar 23 04:25:12 2008
|
||||
@@ -1,4 +1,4 @@
|
||||
-[ -n "$d" ] || d=..
|
||||
-tail -n 2 "$d/README" > logfile.gnu
|
||||
-busybox tail -n 2 "$d/README" > logfile.bb
|
||||
-cmp logfile.gnu logfile.bb
|
||||
+echo -ne "abc\ndef\n123\n" >input
|
||||
+echo -ne "def\n123\n" >logfile.ok
|
||||
+busybox tail -n 2 input > logfile.bb
|
||||
+cmp logfile.ok logfile.bb
|
||||
--- busybox-1.10.0/testsuite/tail/tail-works Thu Mar 20 12:46:57 2008
|
||||
+++ busybox-1.10.0-tail/testsuite/tail/tail-works Sun Mar 23 04:25:12 2008
|
||||
@@ -1,4 +1,4 @@
|
||||
-[ -n "$d" ] || d=..
|
||||
-tail -n 2 "$d/README" > logfile.gnu
|
||||
-busybox tail -n 2 "$d/README" > logfile.bb
|
||||
-cmp logfile.gnu logfile.bb
|
||||
+echo -ne "abc\ndef\n123\n" >input
|
||||
+echo -ne "def\n123\n" >logfile.ok
|
||||
+busybox tail -2 input > logfile.bb
|
||||
+cmp logfile.ok logfile.bb
|
||||
@ -1,27 +0,0 @@
|
||||
--- busybox-1.10.0/miscutils/taskset.c Thu Mar 20 12:46:55 2008
|
||||
+++ busybox-1.10.0-taskset/miscutils/taskset.c Sat Mar 22 18:46:21 2008
|
||||
@@ -50,6 +50,11 @@
|
||||
char *pid_str;
|
||||
char *aff = aff; /* for compiler */
|
||||
|
||||
+ /* NB: we mimic util-linux's taskset: -p does not take
|
||||
+ * an argument, i.e., "-pN" is NOT valid, only "-p N"!
|
||||
+ * Indeed, util-linux-2.13-pre7 uses:
|
||||
+ * getopt_long(argc, argv, "+pchV", ...), not "...p:..." */
|
||||
+
|
||||
opt_complementary = "-1"; /* at least 1 arg */
|
||||
opt_p = getopt32(argv, "+p");
|
||||
argv += optind;
|
||||
--- busybox-1.10.0/testsuite/taskset.tests Thu Mar 20 12:47:04 2008
|
||||
+++ busybox-1.10.0-taskset/testsuite/taskset.tests Sat Mar 22 18:46:21 2008
|
||||
@@ -7,8 +7,8 @@
|
||||
a="taskset"
|
||||
|
||||
# testing "test name" "opts" "expected result" "file inp" "stdin"
|
||||
-testing "taskset (get from pid 1)" "$a -p1 >/dev/null;echo \$?" "0\n" "" ""
|
||||
-testing "taskset (invalid pid)" "$a -p0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
|
||||
+testing "taskset (get from pid 1)" "$a -p 1 >/dev/null;echo \$?" "0\n" "" ""
|
||||
+testing "taskset (invalid pid)" "$a -p 0 >/dev/null 2>&1;echo \$?" "1\n" "" ""
|
||||
testing "taskset (set_aff, needs CAP_SYS_NICE)" \
|
||||
"$a 0x1 $SHELL -c $a\ -p\ \$$\|grep\ \"current\ affinity\ mask:\ 1\" >/dev/null;echo \$?" \
|
||||
"0\n" "" ""
|
||||
@ -1,16 +0,0 @@
|
||||
--- busybox-1.10.0/networking/tcpudp.c Thu Mar 20 12:46:42 2008
|
||||
+++ busybox-1.10.0-tcpudp/networking/tcpudp.c Mon Mar 31 21:27:38 2008
|
||||
@@ -29,10 +29,10 @@
|
||||
* - don't know how to retrieve ORIGDST for udp.
|
||||
*/
|
||||
|
||||
-#include <limits.h>
|
||||
-#include <linux/netfilter_ipv4.h> /* wants <limits.h> */
|
||||
-
|
||||
#include "libbb.h"
|
||||
+/* Wants <limits.h> etc, thus included after libbb.h: */
|
||||
+#include <linux/netfilter_ipv4.h>
|
||||
+
|
||||
// TODO: move into this file:
|
||||
#include "tcpudp_perhost.h"
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- busybox-1.10.0/networking/udhcp/clientsocket.c Thu Mar 20 12:46:42 2008
|
||||
+++ busybox-1.10.0-udhcp/networking/udhcp/clientsocket.c Tue Mar 25 07:04:32 2008
|
||||
@@ -22,11 +22,11 @@
|
||||
*/
|
||||
|
||||
#include <features.h>
|
||||
+#include <asm/types.h>
|
||||
#if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined(_NEWLIB_VERSION)
|
||||
#include <netpacket/packet.h>
|
||||
#include <net/ethernet.h>
|
||||
#else
|
||||
-#include <asm/types.h>
|
||||
#include <linux/if_packet.h>
|
||||
#include <linux/if_ether.h>
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user