|
[-]
[+]
|
Changed |
busybox.changes
|
|
|
|
[-]
[+]
|
Changed |
busybox.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
busybox-1.19.3-getty.patch
^
|
| @@ -1,12 +0,0 @@
---- busybox-1.19.3/loginutils/getty.c
-+++ busybox-1.19.3-getty/loginutils/getty.c
-@@ -271,7 +271,9 @@ static void termios_init(int speed)
- #ifdef CMSPAR
- | CMSPAR /* mark or space parity */
- #endif
-+#ifdef CBAUD
- | CBAUD /* (output) baud rate */
-+#endif
- #ifdef CBAUDEX
- | CBAUDEX /* (output) baud rate */
- #endif
|
|
[-]
[+]
|
Deleted |
busybox-1.19.3-install.patch
^
|
| @@ -1,13 +0,0 @@
---- busybox-1.19.0/applets/install.sh.orig 2011-08-11 02:23:58.000000000 +0200
-+++ busybox-1.19.0/applets/install.sh 2011-08-19 22:29:20.824991244 +0200
-@@ -9,7 +9,7 @@
- exit 1
- fi
-
--h=`sort busybox.links | uniq`
-+h=`sort /usr/share/busybox/busybox.links | uniq`
-
- linkopts=""
- scriptwrapper="n"
-
-
|
|
[-]
[+]
|
Deleted |
busybox-1.19.3-modinfo.patch
^
|
| @@ -1,10 +0,0 @@
---- busybox-1.19.3/modutils/modinfo.c
-+++ busybox-1.19.3-modinfo/modutils/modinfo.c
-@@ -13,6 +13,7 @@
- //config:config MODINFO
- //config: bool "modinfo"
- //config: default y
-+//config: select PLATFORM_LINUX
- //config: help
- //config: Show information about a Linux Kernel module
-
|
|
[-]
[+]
|
Deleted |
busybox-1.19.3-udhcp-services.patch
^
|
| @@ -1,24 +0,0 @@
---- networking/udhcp/common.c.orig 2010-08-23 02:44:35.000000000 +0200
-+++ networking/udhcp/common.c 2010-09-29 12:15:08.514367497 +0200
-@@ -49,6 +49,10 @@
- { OPTION_STRING , 0x43 }, /* DHCP_BOOT_FILE */
- //TODO: not a string, but a set of LASCII strings:
- // { OPTION_STRING , 0x4D }, /* DHCP_USER_CLASS */
-+ { OPTION_IP | OPTION_LIST , 0x45 }, /* DHCP_SMTP_SERVER */
-+ { OPTION_IP | OPTION_LIST , 0x46 }, /* DHCP_POP3_SERVER */
-+ { OPTION_IP | OPTION_LIST , 0x4a }, /* DHCP_IRC_SERVER */
-+ { OPTION_IP | OPTION_LIST , 0x48 }, /* DHCP_WWW_SERVER */
- #if ENABLE_FEATURE_UDHCP_RFC3397
- { OPTION_DNS_STRING | OPTION_LIST , 0x77 }, /* DHCP_DOMAIN_SEARCH */
- { OPTION_SIP_SERVERS , 0x78 }, /* DHCP_SIP_SERVERS */
-@@ -105,6 +109,10 @@
- "tftp" "\0" /* DHCP_TFTP_SERVER_NAME */
- "bootfile" "\0" /* DHCP_BOOT_FILE */
- // "userclass" "\0" /* DHCP_USER_CLASS */
-+ "smtpsrv" "\0" /* DHCP_SMTP_SERVER */
-+ "pop3srv" "\0" /* DHCP_POP3_SERVER */
-+ "ircsrv" "\0" /* DHCP_IRC_SERVER */
-+ "wwwsrv" "\0" /* DHCP_WWW_SERVER */
- #if ENABLE_FEATURE_UDHCP_RFC3397
- "search" "\0" /* DHCP_DOMAIN_SEARCH */
- // doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
|
|
[-]
[+]
|
Added |
busybox-1.19.4-install.patch
^
|
| @@ -0,0 +1,13 @@
+--- busybox-1.19.0/applets/install.sh.orig 2011-08-11 02:23:58.000000000 +0200
++++ busybox-1.19.0/applets/install.sh 2011-08-19 22:29:20.824991244 +0200
+@@ -9,7 +9,7 @@
+ exit 1
+ fi
+
+-h=`sort busybox.links | uniq`
++h=`sort /usr/share/busybox/busybox.links | uniq`
+
+ linkopts=""
+ scriptwrapper="n"
+
+
|
|
[-]
[+]
|
Added |
busybox-1.19.4-udhcp-services.patch
^
|
| @@ -0,0 +1,24 @@
+--- networking/udhcp/common.c.orig 2010-08-23 02:44:35.000000000 +0200
++++ networking/udhcp/common.c 2010-09-29 12:15:08.514367497 +0200
+@@ -49,6 +49,10 @@
+ { OPTION_STRING , 0x43 }, /* DHCP_BOOT_FILE */
+ //TODO: not a string, but a set of LASCII strings:
+ // { OPTION_STRING , 0x4D }, /* DHCP_USER_CLASS */
++ { OPTION_IP | OPTION_LIST , 0x45 }, /* DHCP_SMTP_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x46 }, /* DHCP_POP3_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x4a }, /* DHCP_IRC_SERVER */
++ { OPTION_IP | OPTION_LIST , 0x48 }, /* DHCP_WWW_SERVER */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ { OPTION_DNS_STRING | OPTION_LIST , 0x77 }, /* DHCP_DOMAIN_SEARCH */
+ { OPTION_SIP_SERVERS , 0x78 }, /* DHCP_SIP_SERVERS */
+@@ -105,6 +109,10 @@
+ "tftp" "\0" /* DHCP_TFTP_SERVER_NAME */
+ "bootfile" "\0" /* DHCP_BOOT_FILE */
+ // "userclass" "\0" /* DHCP_USER_CLASS */
++ "smtpsrv" "\0" /* DHCP_SMTP_SERVER */
++ "pop3srv" "\0" /* DHCP_POP3_SERVER */
++ "ircsrv" "\0" /* DHCP_IRC_SERVER */
++ "wwwsrv" "\0" /* DHCP_WWW_SERVER */
+ #if ENABLE_FEATURE_UDHCP_RFC3397
+ "search" "\0" /* DHCP_DOMAIN_SEARCH */
+ // doesn't work in udhcpd.conf since OPTION_SIP_SERVERS
|
|
[-]
[+]
|
Changed |
busybox-1.19.4.tar.bz2/Makefile
^
|
| @@ -1,6 +1,6 @@
VERSION = 1
PATCHLEVEL = 19
-SUBLEVEL = 3
+SUBLEVEL = 4
EXTRAVERSION =
NAME = Unnamed
|
|
[-]
[+]
|
Changed |
busybox-1.19.4.tar.bz2/loginutils/getty.c
^
|
| @@ -271,7 +271,9 @@
#ifdef CMSPAR
| CMSPAR /* mark or space parity */
#endif
+#ifdef CBAUD
| CBAUD /* (output) baud rate */
+#endif
#ifdef CBAUDEX
| CBAUDEX /* (output) baud rate */
#endif
|
|
[-]
[+]
|
Changed |
busybox-1.19.4.tar.bz2/modutils/modinfo.c
^
|
| @@ -13,6 +13,7 @@
//config:config MODINFO
//config: bool "modinfo"
//config: default y
+//config: select PLATFORM_LINUX
//config: help
//config: Show information about a Linux Kernel module
|
|
[-]
[+]
|
Changed |
busybox-1.19.4.tar.bz2/networking/wget.c
^
|
| @@ -552,6 +552,7 @@
FILE *dfp; /* socket to ftp server (data) */
char *proxy = NULL;
char *fname_out_alloc;
+ char *redirected_path = NULL;
struct host_info server;
struct host_info target;
@@ -794,8 +795,8 @@
bb_error_msg_and_die("too many redirections");
fclose(sfp);
if (str[0] == '/') {
- free(target.allocated);
- target.path = target.allocated = xstrdup(str+1);
+ free(redirected_path);
+ target.path = redirected_path = xstrdup(str+1);
/* lsa stays the same: it's on the same server */
} else {
parse_url(str, &target);
@@ -850,6 +851,7 @@
free(server.allocated);
free(target.allocated);
free(fname_out_alloc);
+ free(redirected_path);
}
int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
[-]
[+]
|
Changed |
busybox-1.19.4.tar.bz2/util-linux/mdev.c
^
|
| @@ -610,7 +610,7 @@
int seqlen;
char seqbuf[sizeof(int)*3 + 2];
- seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
+ seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
if (seqlen < 0) {
seq = NULL;
break;
|
