Author: pebender
Date: Fri Jul 17 10:15:12 2009
New Revision: 5181
Added:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-test.patch
Modified:
trunk/gar-minimyth/script/utils/busybox/Makefile
trunk/gar-minimyth/script/utils/busybox/checksums
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-df.patch
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
Log:
- Updated busybox fixes.
Modified: trunk/gar-minimyth/script/utils/busybox/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/Makefile (original)
+++ trunk/gar-minimyth/script/utils/busybox/Makefile Fri Jul 17 10:15:12
2009
@@ -7,6 +7,7 @@
PATCHFILES = \
$(DISTNAME)-df.patch \
$(DISTNAME)-ls.patch \
+ $(DISTNAME)-test.patch \
$(DISTNAME)-udhcpd.patch
PATCHFILES += $(DISTNAME)-dhcp_options.patch
$(DISTNAME)-dhcp_timezone.patch $(DISTNAME)-tftp_timeout.patch
LICENSE = GPL2
Modified: trunk/gar-minimyth/script/utils/busybox/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/checksums (original)
+++ trunk/gar-minimyth/script/utils/busybox/checksums Fri Jul 17 10:15:12
2009
@@ -1,6 +1,7 @@
c13b09b4125688d5fca5c95a79bf814a download/busybox-1.14.2.tar.bz2
-a34c5e72c3f5308838ddc3bf70642136 download/busybox-1.14.2-df.patch
-b261df2f193bb97d8e3e59e02c957780 download/busybox-1.14.2-ls.patch
+6e9ece9447d945c08386acb5f109329e download/busybox-1.14.2-df.patch
+9d3a93f81d3303eaddff0431120a3ce1 download/busybox-1.14.2-ls.patch
+9975397a9ac27b978897962d78084fe3 download/busybox-1.14.2-test.patch
ca9a77bd4f6000d2b031a2cee555fcd6 download/busybox-1.14.2-udhcpd.patch
7a3d426ddd7306d8797a9baca09d0cc4
download/busybox-1.14.2-dhcp_options.patch
1f85acff0a8f831b3c86282d70a44fc5
download/busybox-1.14.2-dhcp_timezone.patch
Modified:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-df.patch
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-df.patch
(original)
+++ trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-df.patch
Fri Jul 17 10:15:12 2009
@@ -1,6 +1,7 @@
---- busybox-1.14.2/coreutils/df.c Sun Jul 5 22:59:28 2009
-+++ busybox-1.14.2-df/coreutils/df.c Sun Jul 5 23:00:09 2009
-@@ -44,7 +44,6 @@
+diff -urpN busybox-1.14.2/coreutils/df.c busybox-1.14.2-df/coreutils/df.c
+--- busybox-1.14.2/coreutils/df.c 2009-07-05 22:59:28.000000000 +0200
++++ busybox-1.14.2-df/coreutils/df.c 2009-07-05 23:00:09.000000000 +0200
+@@ -44,7 +44,6 @@ int df_main(int argc, char **argv)
FILE *mount_table;
struct mntent *mount_entry;
struct statfs s;
@@ -8,7 +9,7 @@
enum {
OPT_KILO = (1 << 0),
-@@ -120,7 +119,7 @@
+@@ -120,7 +119,7 @@ int df_main(int argc, char **argv)
mount_point = *argv++;
if (!mount_point)
break;
@@ -17,7 +18,7 @@
if (!mount_entry) {
bb_error_msg("%s: can't find mount point",
mount_point);
set_error:
-@@ -154,8 +153,8 @@
+@@ -154,8 +153,8 @@ int df_main(int argc, char **argv)
) / (blocks_used + s.f_bavail);
}
@@ -28,9 +29,10 @@
continue;
#ifdef WHY_WE_DO_IT_FOR_DEV_ROOT_ONLY
---- busybox-1.14.2/include/libbb.h Sun Jul 5 22:59:31 2009
-+++ busybox-1.14.2-df/include/libbb.h Sun Jul 5 23:00:09 2009
-@@ -1025,7 +1025,7 @@
+diff -urpN busybox-1.14.2/include/libbb.h busybox-1.14.2-df/include/libbb.h
+--- busybox-1.14.2/include/libbb.h 2009-07-05 22:59:31.000000000 +0200
++++ busybox-1.14.2-df/include/libbb.h 2009-07-05 23:00:09.000000000 +0200
+@@ -1025,7 +1025,7 @@ extern void run_applet_no_and_exit(int a
#ifdef HAVE_MNTENT_H
extern int match_fstype(const struct mntent *mt, const char *fstypes)
FAST_FUNC;
@@ -39,8 +41,9 @@
#endif
extern void erase_mtab(const char * name) FAST_FUNC;
extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC;
---- busybox-1.14.2/libbb/find_mount_point.c Sun Jul 5 22:59:24 2009
-+++ busybox-1.14.2-df/libbb/find_mount_point.c Sun Jul 5 23:00:09 2009
+diff -urpN busybox-1.14.2/libbb/find_mount_point.c
busybox-1.14.2-df/libbb/find_mount_point.c
+--- busybox-1.14.2/libbb/find_mount_point.c 2009-07-05 22:59:24.000000000
+0200
++++ busybox-1.14.2-df/libbb/find_mount_point.c 2009-07-05
23:00:09.000000000 +0200
@@ -17,7 +17,7 @@
* Given any other file (or directory), find the mount table entry for its
* filesystem.
@@ -50,7 +53,7 @@
{
struct stat s;
dev_t mountDevice;
-@@ -25,27 +25,35 @@
+@@ -25,27 +25,35 @@ struct mntent* FAST_FUNC find_mount_poin
struct mntent *mountEntry;
if (stat(name, &s) != 0)
@@ -92,9 +95,10 @@
break;
}
endmntent(mountTable);
---- busybox-1.14.2/util-linux/mkfs_minix.c Sun Jul 5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_minix.c Sun Jul 5 23:00:09 2009
-@@ -624,7 +624,6 @@
+diff -urpN busybox-1.14.2/util-linux/mkfs_minix.c
busybox-1.14.2-df/util-linux/mkfs_minix.c
+--- busybox-1.14.2/util-linux/mkfs_minix.c 2009-07-05 22:59:30.000000000
+0200
++++ busybox-1.14.2-df/util-linux/mkfs_minix.c 2009-07-05
23:00:09.000000000 +0200
+@@ -624,7 +624,6 @@ static void setup_tables(void)
int mkfs_minix_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
{
@@ -102,7 +106,7 @@
unsigned opt;
char *tmp;
struct stat statbuf;
-@@ -683,11 +682,8 @@
+@@ -683,11 +682,8 @@ int mkfs_minix_main(int argc UNUSED_PARA
G.total_blocks = 65535;
/* Check if it is mounted */
@@ -116,9 +120,10 @@
xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
if (fstat(dev_fd, &statbuf) < 0)
---- busybox-1.14.2/util-linux/mkfs_vfat.c Sun Jul 5 22:59:30 2009
-+++ busybox-1.14.2-df/util-linux/mkfs_vfat.c Sun Jul 5 23:00:35 2009
-@@ -273,10 +273,10 @@
+diff -urpN busybox-1.14.2/util-linux/mkfs_vfat.c
busybox-1.14.2-df/util-linux/mkfs_vfat.c
+--- busybox-1.14.2/util-linux/mkfs_vfat.c 2009-07-05 22:59:30.000000000
+0200
++++ busybox-1.14.2-df/util-linux/mkfs_vfat.c 2009-07-05 23:00:35.000000000
+0200
+@@ -273,10 +273,10 @@ int mkfs_vfat_main(int argc UNUSED_PARAM
device_num == 0x0d00 || // xd
device_num == 0x1600 ) // hdc, hdd
)
Modified:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
==============================================================================
--- trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
(original)
+++ trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-ls.patch
Fri Jul 17 10:15:12 2009
@@ -1,6 +1,6 @@
diff -urpN busybox-1.14.2/coreutils/ls.c busybox-1.14.2-ls/coreutils/ls.c
---- busybox-1.14.2/coreutils/ls.c 2009-06-22 00:40:29.000000000 +0200
-+++ busybox-1.14.2-ls/coreutils/ls.c 2009-07-03 12:46:16.000000000 +0200
+--- busybox-1.14.2/coreutils/ls.c 2009-07-05 22:59:28.000000000 +0200
++++ busybox-1.14.2-ls/coreutils/ls.c 2009-07-05 22:59:14.000000000 +0200
@@ -144,8 +144,7 @@ static const char ls_options[] ALIGN1 =
USE_FEATURE_LS_FOLLOWLINKS("L") /* 1, 24 */
USE_FEATURE_LS_RECURSIVE("R") /* 1, 25 */
@@ -109,8 +109,8 @@
#endif
diff -urpN busybox-1.14.2/testsuite/ls/ls-1-works
busybox-1.14.2-ls/testsuite/ls/ls-1-works
---- busybox-1.14.2/testsuite/ls/ls-1-works 2009-06-22 00:32:00.000000000
+0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-1-works 2009-07-02
14:28:45.000000000 +0200
+--- busybox-1.14.2/testsuite/ls/ls-1-works 2009-07-05 22:59:21.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-1-works 2009-07-05
22:59:09.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
-ls -1 "$d" > logfile.gnu
@@ -120,8 +120,8 @@
+LC_ALL=C busybox ls -1 "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff -urpN busybox-1.14.2/testsuite/ls/ls-h-works
busybox-1.14.2-ls/testsuite/ls/ls-h-works
---- busybox-1.14.2/testsuite/ls/ls-h-works 2009-06-22 00:32:00.000000000
+0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-h-works 2009-07-02
14:28:45.000000000 +0200
+--- busybox-1.14.2/testsuite/ls/ls-h-works 2009-07-05 22:59:21.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-h-works 2009-07-05
22:59:09.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
-ls -h "$d" > logfile.gnu
@@ -131,8 +131,8 @@
+LC_ALL=C busybox ls -h "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff -urpN busybox-1.14.2/testsuite/ls/ls-l-works
busybox-1.14.2-ls/testsuite/ls/ls-l-works
---- busybox-1.14.2/testsuite/ls/ls-l-works 2009-06-22 00:32:00.000000000
+0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-l-works 2009-07-02
14:28:45.000000000 +0200
+--- busybox-1.14.2/testsuite/ls/ls-l-works 2009-07-05 22:59:21.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-l-works 2009-07-05
22:59:09.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
LC_ALL=C ls -l "$d" > logfile.gnu
@@ -141,8 +141,8 @@
+LC_ALL=C busybox ls -l "$d" > logfile.bb
+diff -ubw logfile.gnu logfile.bb
diff -urpN busybox-1.14.2/testsuite/ls/ls-s-works
busybox-1.14.2-ls/testsuite/ls/ls-s-works
---- busybox-1.14.2/testsuite/ls/ls-s-works 2009-06-22 00:32:00.000000000
+0200
-+++ busybox-1.14.2-ls/testsuite/ls/ls-s-works 2009-07-02
14:28:45.000000000 +0200
+--- busybox-1.14.2/testsuite/ls/ls-s-works 2009-07-05 22:59:21.000000000
+0200
++++ busybox-1.14.2-ls/testsuite/ls/ls-s-works 2009-07-05
22:59:09.000000000 +0200
@@ -1,4 +1,4 @@
[ -n "$d" ] || d=..
LC_ALL=C ls -1s "$d" > logfile.gnu
Added:
trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-test.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/busybox/files/busybox-1.14.2-test.patch
Fri Jul 17 10:15:12 2009
@@ -0,0 +1,64 @@
+diff -urpN busybox-1.14.2/coreutils/test.c
busybox-1.14.2-test/coreutils/test.c
+--- busybox-1.14.2/coreutils/test.c 2009-07-05 22:59:28.000000000 +0200
++++ busybox-1.14.2-test/coreutils/test.c 2009-07-17 01:46:28.000000000
+0200
+@@ -571,7 +571,14 @@ static number_t nexpr(enum token n)
+
+ nest_msg(">nexpr(%s)\n", TOKSTR[n]);
+ if (n == UNOT) {
+- res = !nexpr(check_operator(*++args));
++ n = check_operator(*++args);
++ if (n == EOI) {
++ /* special case: [ ! ], [ a -a ! ] are valid */
++ /* IOW, "! ARG" may miss ARG */
++ unnest_msg("<nexpr:1 (!EOI)\n");
++ return 1;
++ }
++ res = !nexpr(n);
+ unnest_msg("<nexpr:%lld\n", res);
+ return res;
+ }
+@@ -742,7 +749,7 @@ int test_main(int argc, char **argv)
+ check_operator(argv[1]);
+ if (last_operator->op_type == BINOP) {
+ /* "test [!] arg1 <binary_op> arg2" */
+- args = &argv[0];
++ args = argv;
+ res = (binop() == 0);
+ goto ret;
+ }
+@@ -755,7 +762,7 @@ int test_main(int argc, char **argv)
+ argv--;
+ }
+ #endif
+- args = &argv[0];
++ args = argv;
+ res = !oexpr(check_operator(*args));
+
+ if (*args != NULL && *++args != NULL) {
+diff -urpN busybox-1.14.2/testsuite/test.tests
busybox-1.14.2-test/testsuite/test.tests
+--- busybox-1.14.2/testsuite/test.tests 2009-07-05 22:59:22.000000000
+0200
++++ busybox-1.14.2-test/testsuite/test.tests 2009-07-17 01:46:28.000000000
+0200
+@@ -21,6 +21,11 @@ testing "test '': should be false (1)" \
+ "1\n" \
+ "" ""
+
++testing "test !: should be true (0)" \
++ "busybox test !; echo \$?" \
++ "0\n" \
++ "" ""
++
+ testing "test a: should be true (0)" \
+ "busybox test a; echo \$?" \
+ "0\n" \
+@@ -51,6 +56,11 @@ testing "test -lt = -gt: should be false
+ "1\n" \
+ "" ""
+
++testing "test a -a !: should be true (0)" \
++ "busybox test a -a !; echo \$?" \
++ "0\n" \
++ "" ""
++
+ testing "test -f = a -o b: should be true (0)" \
+ "busybox test -f = a -o b; echo \$?" \
+ "0\n" \
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
