wok-6.x rev 8275

busybox: fix ris patch
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jan 30 18:10:30 2011 +0100 (2011-01-30)
parents ddd17bb7154c
children c172de93d659
files busybox/stuff/busybox-1.18-ris.u
line diff
     1.1 --- a/busybox/stuff/busybox-1.18-ris.u	Sun Jan 30 11:55:11 2011 +0100
     1.2 +++ b/busybox/stuff/busybox-1.18-ris.u	Sun Jan 30 18:10:30 2011 +0100
     1.3 @@ -18,9 +18,9 @@
     1.4   	bool "Enable 'tftp get' and/or tftpd upload code"
     1.5   	default y
     1.6  
     1.7 ---- busybox-1.17.1/networking/tftp.c
     1.8 -+++ busybox-1.17.1/networking/tftp.c
     1.9 -@@ -656,6 +656,59 @@
    1.10 +--- busybox-1.18.2/networking/tftp.c
    1.11 ++++ busybox-1.18.2/networking/tftp.c
    1.12 +@@ -641,6 +641,59 @@
    1.13   #undef remote_file
    1.14   }
    1.15   
    1.16 @@ -80,7 +80,7 @@
    1.17   #if ENABLE_TFTP
    1.18   
    1.19   int tftp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
    1.20 -@@ -785,6 +838,10 @@
    1.21 +@@ -770,6 +823,10 @@
    1.22   		goto err;
    1.23   	}
    1.24   	local_file = block_buf + 2;