SOURCES: busybox.config, busybox-dhcp.patch, busybox-initrd.config...
qboosh
qboosh at pld-linux.org
Sat Dec 30 14:26:48 CET 2006
Author: qboosh Date: Sat Dec 30 13:26:47 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.3.1
---- Files affected:
SOURCES:
busybox.config (1.19 -> 1.20) , busybox-dhcp.patch (1.1 -> 1.2) , busybox-initrd.config (1.26 -> 1.27) , busybox-loadfont.patch (1.3 -> 1.4) , busybox-printf-gettext.patch (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SOURCES/busybox.config
diff -u SOURCES/busybox.config:1.19 SOURCES/busybox.config:1.20
--- SOURCES/busybox.config:1.19 Wed Oct 18 01:37:03 2006
+++ SOURCES/busybox.config Sat Dec 30 14:26:42 2006
@@ -11,6 +11,7 @@
# General Configuration
#
# CONFIG_NITPICK is not set
+CONFIG_DESKTOP=y
# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -25,6 +26,7 @@
CONFIG_FEATURE_SUID=y
CONFIG_FEATURE_SUID_CONFIG=y
CONFIG_FEATURE_SUID_CONFIG_QUIET=y
+CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_SELINUX is not set
CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
@@ -57,11 +59,12 @@
# CONFIG_INSTALL_APPLET_SYMLINKS is not set
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
CONFIG_INSTALL_APPLET_DONT=y
-PREFIX="./_install"
+CONFIG_PREFIX="./_install"
#
# Busybox Library Tuning
#
+CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
#
@@ -213,6 +216,7 @@
CONFIG_UUENCODE=y
CONFIG_WATCH=y
CONFIG_WC=y
+CONFIG_FEATURE_WC_LARGE=y
CONFIG_WHO=y
# CONFIG_WHOAMI is not set
CONFIG_YES=y
@@ -248,6 +252,8 @@
CONFIG_LOADKMAP=y
CONFIG_OPENVT=y
CONFIG_RESET=y
+CONFIG_RESIZE=y
+# CONFIG_FEATURE_RESIZE_PRINT is not set
CONFIG_SETCONSOLE=y
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
CONFIG_SETKEYCODES=y
@@ -337,9 +343,11 @@
CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
CONFIG_LOGIN=y
+# CONFIG_LOGIN_SCRIPTS is not set
CONFIG_FEATURE_SECURETTY=y
CONFIG_PASSWD=y
CONFIG_SU=y
+# CONFIG_SU_SYSLOG is not set
CONFIG_SULOGIN=y
CONFIG_VLOCK=y
@@ -382,6 +390,7 @@
# Linux System Utilities
#
CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
CONFIG_FEATURE_FBSET_READMODE=y
@@ -420,6 +429,9 @@
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
CONFIG_PIVOT_ROOT=y
CONFIG_RDATE=y
CONFIG_READPROFILE=y
@@ -470,11 +482,15 @@
CONFIG_FEATURE_MAKEDEVS_TABLE=y
CONFIG_MOUNTPOINT=y
CONFIG_MT=y
+CONFIG_NMETER=y
+CONFIG_RAIDAUTORUN=y
+CONFIG_READAHEAD=y
CONFIG_RUNLEVEL=y
CONFIG_RX=y
CONFIG_STRINGS=y
CONFIG_SETSID=y
CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
CONFIG_TIME=y
CONFIG_WATCHDOG=y
@@ -525,6 +541,7 @@
CONFIG_FEATURE_IP_ADDRESS=y
CONFIG_FEATURE_IP_LINK=y
CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_RULE=y
CONFIG_FEATURE_IP_TUNNEL=y
CONFIG_FEATURE_IP_SHORT_FORMS=y
CONFIG_IPADDR=y
@@ -536,7 +553,8 @@
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
CONFIG_NAMEIF=y
CONFIG_NC=y
-CONFIG_NC_GAPING_SECURITY_HOLE=y
+CONFIG_NC_SERVER=y
+# CONFIG_NC_EXTRA is not set
CONFIG_NETSTAT=y
CONFIG_NSLOOKUP=y
CONFIG_PING=y
@@ -548,7 +566,7 @@
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
+CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_TFTP=y
CONFIG_FEATURE_TFTP_GET=y
CONFIG_FEATURE_TFTP_PUT=y
@@ -563,6 +581,7 @@
# udhcp Server/Client
#
CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
CONFIG_APP_UDHCPC=y
CONFIG_APP_DUMPLEASES=y
# CONFIG_FEATURE_UDHCP_SYSLOG is not set
@@ -582,6 +601,7 @@
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
CONFIG_PIDOF=y
CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
@@ -649,3 +669,16 @@
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
CONFIG_KLOGD=y
CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+CONFIG_CHPST=y
+CONFIG_SETUIDGID=y
+CONFIG_ENVUIDGID=y
+CONFIG_ENVDIR=y
+CONFIG_SOFTLIMIT=y
================================================================
Index: SOURCES/busybox-dhcp.patch
diff -u SOURCES/busybox-dhcp.patch:1.1 SOURCES/busybox-dhcp.patch:1.2
--- SOURCES/busybox-dhcp.patch:1.1 Sat Jun 5 20:37:18 2004
+++ SOURCES/busybox-dhcp.patch Sat Dec 30 14:26:42 2006
@@ -1,25 +1,24 @@
-diff -urN busybox-1.00-pre10.org/networking/udhcp/options.c busybox-1.00-pre10/networking/udhcp/options.c
---- busybox-1.00-pre10.org/networking/udhcp/options.c 2004-06-05 20:24:43.698887752 +0200
-+++ busybox-1.00-pre10/networking/udhcp/options.c 2004-06-05 20:26:15.241971088 +0200
-@@ -27,8 +27,8 @@
- {"hostname", OPTION_STRING | OPTION_REQ, 0x0c},
- {"bootsize", OPTION_U16, 0x0d},
- {"domain", OPTION_STRING | OPTION_REQ, 0x0f},
-- {"swapsvr", OPTION_IP, 0x10},
-- {"rootpath", OPTION_STRING, 0x11},
-+ {"swapsvr", OPTION_IP | OPTION_REQ, 0x10},
-+ {"rootpath", OPTION_STRING | OPTION_REQ, 0x11},
- {"ipttl", OPTION_U8, 0x17},
- {"mtu", OPTION_U16, 0x1a},
- {"broadcast", OPTION_IP | OPTION_REQ, 0x1c},
-@@ -39,8 +39,8 @@
- {"dhcptype", OPTION_U8, 0x35},
- {"serverid", OPTION_IP, 0x36},
- {"message", OPTION_STRING, 0x38},
-- {"tftp", OPTION_STRING, 0x42},
-- {"bootfile", OPTION_STRING, 0x43},
-+ {"tftp", OPTION_STRING | OPTION_REQ, 0x42},
-+ {"bootfile", OPTION_STRING | OPTION_REQ, 0x43},
- {"", 0x00, 0x00}
- };
-
+--- busybox-1.3.1/networking/udhcp/options.c.orig 2006-12-27 05:52:33.000000000 +0100
++++ busybox-1.3.1/networking/udhcp/options.c 2006-12-30 12:31:57.305539547 +0100
+@@ -24,8 +24,8 @@
+ {"hostname", OPTION_STRING | OPTION_REQ, 0x0c},
+ {"bootsize", OPTION_U16, 0x0d},
+ {"domain", OPTION_STRING | OPTION_REQ, 0x0f},
+- {"swapsvr", OPTION_IP, 0x10},
+- {"rootpath", OPTION_STRING, 0x11},
++ {"swapsvr", OPTION_IP | OPTION_REQ, 0x10},
++ {"rootpath", OPTION_STRING | OPTION_REQ, 0x11},
+ {"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.26 SOURCES/busybox-initrd.config:1.27
--- SOURCES/busybox-initrd.config:1.26 Thu Oct 19 14:02:38 2006
+++ SOURCES/busybox-initrd.config Sat Dec 30 14:26:42 2006
@@ -11,6 +11,7 @@
# General Configuration
#
# CONFIG_NITPICK is not set
+# CONFIG_DESKTOP is not set
# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -25,6 +26,7 @@
# CONFIG_FEATURE_SUID is not set
# CONFIG_FEATURE_SUID_CONFIG is not set
# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
+CONFIG_FEATURE_HAVE_RPC=y
# CONFIG_SELINUX is not set
CONFIG_BUSYBOX_EXEC_PATH="/bin/initrd-busybox"
@@ -57,11 +59,12 @@
# CONFIG_INSTALL_APPLET_SYMLINKS is not set
# CONFIG_INSTALL_APPLET_HARDLINKS is not set
CONFIG_INSTALL_APPLET_DONT=y
-PREFIX="./_install"
+CONFIG_PREFIX="./_install"
#
# Busybox Library Tuning
#
+CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
#
@@ -232,6 +235,7 @@
# CONFIG_LOADKMAP is not set
# CONFIG_OPENVT is not set
# CONFIG_RESET is not set
+# CONFIG_RESIZE is not set
# CONFIG_SETCONSOLE is not set
# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
# CONFIG_SETKEYCODES is not set
@@ -400,6 +404,9 @@
# CONFIG_FEATURE_USE_TERMIOS is not set
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
+# CONFIG_FEATURE_MOUNT_FSTAB is not set
CONFIG_PIVOT_ROOT=y
# CONFIG_RDATE is not set
# CONFIG_READPROFILE is not set
@@ -450,6 +457,9 @@
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
+# CONFIG_NMETER is not set
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
# CONFIG_STRINGS is not set
@@ -516,7 +526,6 @@
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
# CONFIG_NAMEIF is not set
# CONFIG_NC is not set
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
# CONFIG_NETSTAT is not set
# CONFIG_NSLOOKUP is not set
# CONFIG_PING is not set
@@ -528,7 +537,6 @@
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_INETD is not set
# CONFIG_TFTP is not set
# CONFIG_FEATURE_TFTP_GET is not set
# CONFIG_FEATURE_TFTP_PUT is not set
@@ -629,3 +637,16 @@
# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
# CONFIG_KLOGD is not set
# CONFIG_LOGGER is not set
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
================================================================
Index: SOURCES/busybox-loadfont.patch
diff -u SOURCES/busybox-loadfont.patch:1.3 SOURCES/busybox-loadfont.patch:1.4
--- SOURCES/busybox-loadfont.patch:1.3 Sat Aug 2 23:45:48 2003
+++ SOURCES/busybox-loadfont.patch Sat Dec 30 14:26:42 2006
@@ -1,14 +1,13 @@
-diff -urN busybox-1.00-pre2.org/console-tools/loadfont.c busybox-1.00-pre2/console-tools/loadfont.c
---- busybox-1.00-pre2.org/console-tools/loadfont.c 2003-08-02 23:46:48.000000000 +0200
-+++ busybox-1.00-pre2/console-tools/loadfont.c 2003-08-02 23:47:38.000000000 +0200
-@@ -185,8 +185,10 @@
+--- busybox-1.3.1/console-tools/loadfont.c.orig 2006-12-27 05:54:01.000000000 +0100
++++ busybox-1.3.1/console-tools/loadfont.c 2006-12-30 12:29:56.698666552 +0100
+@@ -169,8 +169,10 @@
head0 = sizeof(struct psf_header);
head = head0 + fontsize * unit;
+ /*
if (head > inputlth || (!hastable && head != inputlth))
- bb_error_msg_and_die("Input file: bad length");
-+ */
+ bb_error_msg_and_die("input file: bad length");
++ */
do_loadfont(fd, inbuf + head0, unit, fontsize);
if (hastable)
do_loadtable(fd, inbuf + head, inputlth - head, fontsize);
================================================================
Index: SOURCES/busybox-printf-gettext.patch
diff -u SOURCES/busybox-printf-gettext.patch:1.5 SOURCES/busybox-printf-gettext.patch:1.6
--- SOURCES/busybox-printf-gettext.patch:1.5 Thu Feb 3 00:43:04 2005
+++ SOURCES/busybox-printf-gettext.patch Sat Dec 30 14:26:42 2006
@@ -1,23 +1,18 @@
-diff -ur busybox-1.00.orig/coreutils/printf.c busybox-1.00/coreutils/printf.c
---- busybox-1.00.orig/coreutils/printf.c 2004-09-15 02:05:23.000000000 +0000
-+++ busybox-1.00/coreutils/printf.c 2004-11-11 18:16:33.724386928 +0000
-@@ -47,8 +47,13 @@
+--- busybox-1.3.1/coreutils/printf.c.orig 2006-12-27 05:54:50.000000000 +0100
++++ busybox-1.3.1/coreutils/printf.c 2006-12-30 12:28:27.605589427 +0100
+@@ -38,6 +38,9 @@
// 19990508 Busy Boxed! Dave Cinege
+// on by default
+#define BB_FEATURE_PRINTF_GETTEXT
+
- #include <unistd.h>
- #include <stdio.h>
-+#include <sys/mman.h>
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <string.h>
- #include <errno.h>
-@@ -66,18 +71,137 @@
- static void print_direc __P( (char *start, size_t length,
- int field_width, int precision, char *argument));
+ #include "busybox.h"
+
+ static int print_formatted(char *format, int argc, char **argv);
+@@ -109,18 +112,137 @@
+ }
+ }
+/*
+ * Very pure gettext added by Michal Moskal <malekith at pld-linux.org>
@@ -136,7 +131,7 @@
+ int opt;
+ const char *nls_file = NULL;
-- if (argc <= 1 || **(argv + 1) == '-') {
+- if (argc <= 1 || argv[1][0] == '-') {
- bb_show_usage();
- }
+ while ((opt = getopt(argc, argv, "n:")) != -1)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/busybox.config?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/SOURCES/busybox-dhcp.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/busybox-initrd.config?r1=1.26&r2=1.27&f=u
http://cvs.pld-linux.org/SOURCES/busybox-loadfont.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/busybox-printf-gettext.patch?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list