Author: arekm Date: Fri Mar 30 18:46:02 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- up to 1.5.0
---- Files affected:
SOURCES:
busybox-ash_exec.patch (1.1 -> 1.2) , busybox.config (1.21 -> 1.22) ,
busybox-dhcp.patch (1.2 -> 1.3) , busybox-initrd.config (1.31 -> 1.32) ,
busybox-logconsole.patch (1.6 -> 1.7) , busybox-printf-gettext.patch (1.6 ->
1.7) , busybox-noerror.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/busybox-ash_exec.patch
diff -u SOURCES/busybox-ash_exec.patch:1.1 SOURCES/busybox-ash_exec.patch:1.2
--- SOURCES/busybox-ash_exec.patch:1.1 Sun Aug 24 12:49:11 2003
+++ SOURCES/busybox-ash_exec.patch Fri Mar 30 20:45:57 2007
@@ -1,11 +1,11 @@
--- busybox-1.00-pre2/shell/ash.c~ 2003-08-24 12:47:36.000000000 +0200
+++ busybox-1.00-pre2/shell/ash.c 2003-08-24 12:47:43.000000000 +0200
-@@ -3739,7 +3739,7 @@
+@@ -6600,7 +6600,7 @@
#endif
if (repeated++) {
- ckfree(argv);
+ free(argv);
- } else if (errno == ENOEXEC) {
+ } else if (errno == ENOEXEC || errno == ENOENT) {
char **ap;
char **new;
-
+
================================================================
Index: SOURCES/busybox.config
diff -u SOURCES/busybox.config:1.21 SOURCES/busybox.config:1.22
--- SOURCES/busybox.config:1.21 Tue Jan 23 14:59:22 2007
+++ SOURCES/busybox.config Fri Mar 30 20:45:57 2007
@@ -29,6 +29,7 @@
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
#
@@ -47,6 +48,7 @@
# Debugging Options
#
# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_NO_DEBUG_LIB is not set
# CONFIG_DMALLOC is not set
@@ -67,6 +69,14 @@
#
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+CONFIG_FEATURE_USERNAME_COMPLETION=y
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
#
# Applets
@@ -452,6 +462,7 @@
#
CONFIG_ADJTIMEX=y
# CONFIG_BBCONFIG is not set
+CONFIG_CHRT=y
CONFIG_CROND=y
# CONFIG_DEBUG_CROND_OPTION is not set
CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
@@ -499,6 +510,7 @@
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
+CONFIG_VERBOSE_RESOLUTION_ERRORS=y
# CONFIG_ARP is not set
CONFIG_ARPING=y
CONFIG_DNSD=y
================================================================
Index: SOURCES/busybox-dhcp.patch
diff -u SOURCES/busybox-dhcp.patch:1.2 SOURCES/busybox-dhcp.patch:1.3
--- SOURCES/busybox-dhcp.patch:1.2 Sat Dec 30 14:26:42 2006
+++ SOURCES/busybox-dhcp.patch Fri Mar 30 20:45:57 2007
@@ -3,7 +3,7 @@
@@ -24,8 +24,8 @@
{"hostname", OPTION_STRING | OPTION_REQ, 0x0c},
{"bootsize", OPTION_U16, 0x0d},
- {"domain", OPTION_STRING | OPTION_REQ, 0x0f},
+ {"domain", OPTION_STRING | OPTION_LIST | OPTION_REQ, 0x0f},
- {"swapsvr", OPTION_IP, 0x10},
- {"rootpath", OPTION_STRING, 0x11},
+ {"swapsvr", OPTION_IP | OPTION_REQ, 0x10},
@@ -11,14 +11,4 @@
{"ipttl", OPTION_U8, 0x17},
{"mtu", OPTION_U16, 0x1a},
{"broadcast", OPTION_IP | OPTION_REQ, 0x1c},
-@@ -40,8 +40,8 @@
- {"message", OPTION_STRING, 0x38},
- {"vendorclass", OPTION_STRING, 0x3C},
- {"clientid", OPTION_STRING, 0x3D},
-- {"tftp", OPTION_STRING, 0x42},
-- {"bootfile", OPTION_STRING, 0x43},
-+ {"tftp", OPTION_STRING | OPTION_REQ, 0x42},
-+ {"bootfile", OPTION_STRING | OPTION_REQ, 0x43},
- {"userclass", OPTION_STRING, 0x4D},
- /* MSIE's "Web Proxy Autodiscovery Protocol" support */
- {"wpad", OPTION_STRING, 0xfc},
+
================================================================
Index: SOURCES/busybox-initrd.config
diff -u SOURCES/busybox-initrd.config:1.31 SOURCES/busybox-initrd.config:1.32
--- SOURCES/busybox-initrd.config:1.31 Sat Mar 17 19:26:34 2007
+++ SOURCES/busybox-initrd.config Fri Mar 30 20:45:57 2007
@@ -29,6 +29,7 @@
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_SELINUX is not set
+# CONFIG_FEATURE_EXEC_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/bin/initrd-busybox"
#
@@ -47,6 +48,7 @@
# Debugging Options
#
# CONFIG_DEBUG is not set
+# CONFIG_WERROR is not set
# CONFIG_DEBUG_PESSIMIZE is not set
# CONFIG_NO_DEBUG_LIB is not set
# CONFIG_DMALLOC is not set
@@ -67,6 +69,7 @@
#
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
+# CONFIG_FEATURE_EDITING is not set
#
# Applets
@@ -432,6 +435,7 @@
#
# CONFIG_ADJTIMEX is not set
# CONFIG_BBCONFIG is not set
+# CONFIG_CHRT is not set
# CONFIG_CROND is not set
# CONFIG_DEBUG_CROND_OPTION is not set
# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
@@ -479,6 +483,7 @@
# Networking Utilities
#
CONFIG_FEATURE_IPV6=y
+CONFIG_VERBOSE_RESOLUTION_ERRORS=y
# CONFIG_ARP is not set
# CONFIG_ARPING is not set
# CONFIG_DNSD is not set
================================================================
Index: SOURCES/busybox-logconsole.patch
diff -u SOURCES/busybox-logconsole.patch:1.6
SOURCES/busybox-logconsole.patch:1.7
--- SOURCES/busybox-logconsole.patch:1.6 Tue Jan 23 14:48:03 2007
+++ SOURCES/busybox-logconsole.patch Fri Mar 30 20:45:57 2007
@@ -22,12 +22,13 @@
diff -urN busybox-1.00-pre2/init/init.c busybox-1.00-pre2.org/init/init.c
--- busybox-1.00-pre2/init/init.c 2003-08-02 23:40:57.000000000 +0200
+++ busybox-1.00-pre2.org/init/init.c 2003-08-02 23:45:30.000000000 +0200
-@@ -155,7 +155,7 @@
- static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
+@@ -85,7 +85,7 @@
+ static struct init_action *init_action_list = NULL;
- #if !ENABLE_SYSLOGD
--static char *log_console = VC_5;
-+static char *log_console = VC_12;
+ #if !ENABLE_FEATURE_INIT_SYSLOG
+-static const char *log_console = VC_5;
++static const char *log_console = VC_12;
#endif
#if !ENABLE_DEBUG_INIT
static sig_atomic_t got_cont = 0;
+
================================================================
Index: SOURCES/busybox-printf-gettext.patch
diff -u SOURCES/busybox-printf-gettext.patch:1.6
SOURCES/busybox-printf-gettext.patch:1.7
--- SOURCES/busybox-printf-gettext.patch:1.6 Sat Dec 30 14:26:42 2006
+++ SOURCES/busybox-printf-gettext.patch Fri Mar 30 20:45:57 2007
@@ -10,8 +10,8 @@
#include "busybox.h"
static int print_formatted(char *format, int argc, char **argv);
-@@ -109,18 +112,137 @@
- }
+@@ -288,19 +288,135 @@
+ return save_argc - argc;
}
+/*
@@ -53,10 +53,9 @@
+
+static u_int32_t swap(u_int32_t i)
+{
-+ return (i << 24) | ((i & 0xff00) << 8) |
-+ ((i >> 8) & 0xff00) | (i >> 24);
++ return (i << 24) | ((i & 0xff00) << 8) |
++ ((i >> 8) & 0xff00) | (i >> 24);
+}
-+
+#define swap_if(a) ((has_to_swap) ? swap(a) : (a))
+
+static char *getmsg(const char *filename, const char *msgid)
@@ -69,7 +68,7 @@
+ struct string_desc *orig_tab, *trans_tab = NULL;
+ int act = -1;
+ char *ret = (char*)msgid;
-+
++
+ if (filename == NULL || stat(filename, &st))
+ return ret;
+
@@ -78,7 +77,7 @@
+ return ret;
+
+ ptr = (struct mo_file_header *) mmap(NULL, st.st_size, PROT_READ,
-+ MAP_PRIVATE, fd, 0);
++ MAP_PRIVATE, fd, 0);
+ close(fd);
+
+ if (ptr == (void*)-1)
@@ -92,19 +91,18 @@
+ /* FIXME: use hash table */
+
+ orig_tab = (struct string_desc *)
-+ ((char *) ptr + swap_if(ptr->orig_tab_offset));
++ ((char *) ptr + swap_if(ptr->orig_tab_offset));
+ trans_tab = (struct string_desc *)
-+ ((char *) ptr + swap_if(ptr->trans_tab_offset));
++ ((char *) ptr + swap_if(ptr->trans_tab_offset));
+
+ bottom = 0;
+ top = swap_if(ptr->nstrings);
+ while (bottom < top) {
+ int cmp_val;
-+
+ act = (bottom + top) / 2;
+ cmp_val =
-+ strcmp(msgid,
-+ ((char *) ptr + swap_if(orig_tab[act].offset)));
++ strcmp(msgid,
++ ((char *) ptr +
swap_if(orig_tab[act].offset)));
+ if (cmp_val < 0)
+ top = act;
+ else if (cmp_val > 0)
@@ -114,7 +112,7 @@
+ act = -1;
+ }
+
-+ oops:
++oops:
+ if (act != -1)
+ ret = strdup(((char *) ptr + swap_if(trans_tab[act].offset)));
+ munmap(ptr, st.st_size);
@@ -124,11 +122,12 @@
+# define getmsg(a,b) (b)
+#endif
+
+ int printf_main(int argc, char **argv);
int printf_main(int argc, char **argv)
{
char *format;
- int args_used;
-+ int opt;
+- int args_used;
++ int args_used, opt;
+ const char *nls_file = NULL;
- if (argc <= 1 || argv[1][0] == '-') {
@@ -136,12 +135,12 @@
- }
+ while ((opt = getopt(argc, argv, "n:")) != -1)
+ switch (opt) {
-+ case 'n':
-+ nls_file = optarg;
-+ break;
-+ default:
-+ bb_show_usage();
-+ break;
++ case 'n':
++ nls_file = optarg;
++ break;
++ default:
++ bb_show_usage();
++ break;
+ }
+
+ format = getmsg(nls_file, argv[optind++]);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/busybox-ash_exec.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/busybox.config?r1=1.21&r2=1.22&f=u
http://cvs.pld-linux.org/SOURCES/busybox-dhcp.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/busybox-initrd.config?r1=1.31&r2=1.32&f=u
http://cvs.pld-linux.org/SOURCES/busybox-logconsole.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/busybox-printf-gettext.patch?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
