Merge with the stable branch

diff --git a/Changelog b/Changelog
index c9b72f6bfd48e2588204677c59d1145446bd5ab5..dc1fdd1fb608a8dc4bf9e51f4fd27ff2ab5aa68a 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -11,15 +11,66 @@
 
     Other Changes:
 
+       * Vladimir Oleynik, Manuel Novoa III, Aaron Lehmann
+           -- a whole bunch of ash size optimizations
        * Rodney Brown  <RDBrown@mira.net> 
            -- Optimized gzip.c, shrinking it be ~1.5k
-       * Shu-Hao Chang <shuhao_chang@trend.com.tw>
-           -- Fixed sed handling of multiple -e commands
+
 
         -Erik Andersen, --not yet released--
 
 
 
+0.60.1
+
+    Stable Release
+
+
+    New Applets & New Features:
+       none.  :)
+
+    Known Problems (to be fixed in 0.60.2)
+       * msh can segfault on constructs such as
+               for i in `ls *.c` ; do echo $i ; done
+         due to a memory allocation problem.  This only seems to cause
+         problems when the backtick expands to be several k in size.
+
+
+    Bugfixes:
+       * Matt Kraai
+           -- Fixed msh to support underscores in variable names.
+           -- Fixed a sed problem with unsatisfied backrefs (the problem was
+               noted by Martin Bene).
+           -- Removed BB_SH define entirely.  Now one simply picks the shell
+               or shells they want as BB_<foo> in Config.h
+           -- Fixed head to use ferror(3) to check for errors, not errno.
+       * Shu-Hao Chang <shuhao_chang@trend.com.tw>
+           -- Fixed sed handling of multiple -e commands
+       * Magick <magick@linux-fan.com>
+           -- Fixed an init bug with AskFirst and /dev/null
+       * Jaspreet Singh <jsingh@somanetworks.com>
+           -- Fixed both a segfault and cosmetic bug in route
+       * Erik Andersen
+           -- Made the insmod options BB_FEATURE_NEW_MODULE_INTERFACE and 
+               BB_FEATURE_OLD_MODULE_INTERFACE mutually exclusive
+           -- xgetcwd.c now includes sys/param.h to ensure PATH_MAX is defined
+           -- Fixed a potential segfault with lash + BB_FEATURE_CLEAN_UP
+           -- Removed uint64_t from dos2unix, avoiding C lib compat. problems.
+       * Glenn McGrath
+           -- Rewrite of tftp (commands match atftp, accepts -b, can use 
+               non-standard ports, and is smaller).
+           -- Fixed unarchive exclude list handling
+       * Manuel Novoa III
+           -- rewrite of simplify_path so it behaves itself (fixing some
+               problems with mount and other applets).
+           -- Fixed ifconfig 'broadcast +' handling and disabled it by default
+       * Matthias ? <matthias@corelatus.com>
+           -- Fixed syslogd to log all messages from a single connection, not
+               just the first.
+        
+        
+        -Erik Andersen, 23 August 2001
+
 
 0.60.0
 

diff --git a/docs/busybox.net/index.html b/docs/busybox.net/index.html
index 753b21265a69006843d0853c7117e29f8759cb68..e606238d4362e0d1924d6e6f53e15a635a37f01e 100644 (file)
--- a/docs/busybox.net/index.html
+++ b/docs/busybox.net/index.html
@@ -81,6 +81,24 @@ To subscribe, go and visit <a href="http://opensource.lineo.com/mailman/listinfo
 
 <ul>
 
+    <li> <b>23 August 2001 -- BusyBox 0.60.1 released</b>
+    <br>
+
+            This is a relatively minor bug fixing release that fixes
+            up the bugs that have shown up in the stable release in
+            the last few weeks.  Fortunately, nothing <em>too</em>
+            serious has shown up.  This release only fixes bugs -- no
+            new features, no new applets.  So without further ado,
+            here it is.  Come and get it.
+            <p>
+            The 
+            <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> has all
+            the details.  As usual BusyBox 0.60.1 can be downloaded from 
+            <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+            <p>Have Fun!
+            <p>
+
+
     <li> <b>2 August 2001 -- BusyBox 0.60.0 released</b>
     <br>
             I am very pleased to announce the immediate availability of