- 1.01

Changed files:
    busybox-LFS.patch -> 1.8
    busybox-force-dietlibc.patch -> 1.2
    busybox-logconsole.patch -> 1.5
    busybox.config -> 1.14
    busybox.spec -> 1.105

diff --git a/busybox-LFS.patch b/busybox-LFS.patch
index ac23354964e4a58069b50a1e5c55a1aa1adc25a8..e599d217e9ee81eb6ae6410376ccfef2382670bc 100644 (file)
--- a/busybox-LFS.patch
+++ b/busybox-LFS.patch
@@ -2,9 +2,9 @@ diff -Nur busybox-1.00/include/libbb.h.orig busybox-1.00/include/libbb.h
 --- busybox-1.00/include/libbb.h.orig  2005-02-15 16:48:07.491412688 +0100
 +++ busybox-1.00/include/libbb.h       2005-02-15 16:40:15.000000000 +0100
 @@ -138,8 +138,8 @@
+ extern char *find_real_root_device_name(void);
  extern char *bb_get_line_from_file(FILE *file);
  extern char *bb_get_chomped_line_from_file(FILE *file);
- extern char *bb_get_chunk_from_file(FILE *file);
 -extern int bb_copyfd_size(int fd1, int fd2, const off_t size);
 -extern int bb_copyfd_eof(int fd1, int fd2);
 +extern off_t bb_copyfd_size(int fd1, int fd2, const off_t size);

diff --git a/busybox-force-dietlibc.patch b/busybox-force-dietlibc.patch
index 028397f57fc24956a286e31f4c64dd9809092efd..3c51bcfd8f5228a67c24e6ed6a67f78a8c946399 100644 (file)
--- a/busybox-force-dietlibc.patch
+++ b/busybox-force-dietlibc.patch
@@ -1,15 +1,15 @@
 diff -urN busybox-1.00-pre2.org/libbb/printf.c busybox-1.00-pre2/libbb/printf.c
 --- busybox-1.00-pre2.org/libbb/printf.c       2003-08-02 23:46:49.000000000 +0200
 +++ busybox-1.00-pre2/libbb/printf.c   2003-08-05 00:19:57.000000000 +0200
-@@ -116,7 +116,10 @@
+@@ -120,7 +120,10 @@
   * you can extract the information you need from dietstdio.h.  See the
   * other library implementations for examples.
   */
--#error dietlibc is currently not supported.  Please see the commented source.
+-# error dietlibc is currently not supported.  Please see the commented source.
 +#warning dietlibc is currently not supported.  Please see the commented source.
 +#warning FORCED BUILD BY PLD PATCH.
 +
 +#define SET_FERROR_UNLOCKED(S) //    ((S)->flags |= 1)
  
  #else /* some other lib */
- /* Please see the comments for the above supported libaries for examples
+ /* Please see the comments for the above supported libraries for examples

diff --git a/busybox-logconsole.patch b/busybox-logconsole.patch
index 5e330abf6768cf00600c3d3585bd2605b3f3bc5a..9c47d375c211a12e51f0d67fdaabb196e201a0bc 100644 (file)
--- a/busybox-logconsole.patch
+++ b/busybox-logconsole.patch
@@ -22,12 +22,12 @@ diff -urN busybox-1.00-pre2/include/libbb.h busybox-1.00-pre2.org/include/libbb.
 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
-@@ -157,7 +157,7 @@
+@@ -155,7 +155,7 @@
  static char console[CONSOLE_BUFF_SIZE] = _PATH_CONSOLE;
  
  #ifndef CONFIG_SYSLOGD
--static char *log = VC_5;
-+static char *log = VC_12;
+-static char *log_console = VC_5;
++static char *log_console = VC_12;
  #endif
  static sig_atomic_t got_cont = 0;
  static const int LOG = 0x1;

diff --git a/busybox.config b/busybox.config
index 4629a845b56c110be5b20118fd9a59787cdcb9b9..bdd30f990e712ecdf8b647c3bef665641e9025d6 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -275,6 +275,7 @@ CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_INITRD=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INIT_SWAPON is not set
 # CONFIG_FEATURE_EXTRA_QUIET is not set
 CONFIG_HALT=y
 CONFIG_POWEROFF=y

diff --git a/busybox.spec b/busybox.spec
index 4491023fc007951038d69f68e279d2063e6be6d2..a4dfb33e9cb272712fd5c97523f38741d08abd37 100644 (file)
--- a/busybox.spec
+++ b/busybox.spec
@@ -33,12 +33,12 @@ Summary:    Set of common unix utils for embeded systems
 Summary(pl):   Zestaw narzêdzi uniksowych dla systemów wbudowanych
 Summary(pt_BR):        BusyBox é um conjunto de utilitários UNIX em um único binário
 Name:          busybox
-Version:       1.00
-Release:       3
+Version:       1.01
+Release:       1
 License:       GPL
 Group:         Applications
 Source0:       http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
-# Source0-md5: 5c7ea9b5d3b3677dfcdcec38b281a756
+# Source0-md5: f250842dae2854a38470ed16a46bba66
 Source1:       %{name}.config
 Source2:       %{name}-initrd.config
 %{?with_altconfig:Source3:     %{cfgfile}}
@@ -58,7 +58,6 @@ Patch12:      %{name}-LFS.patch
 Patch13:       %{name}-ftpput.patch
 #http://www.zelow.no/floppyfw/download/Development/Patches/busybox-snapshot/busybox-lzmacat.diff
 Patch14:       %{name}-lzmacat.diff
-Patch15:       %{name}-cvs-20050604.patch
 URL:           http://www.busybox.net/
 BuildRequires: gcc >= 3.2
 %{?with_static:BuildRequires:  glibc-static}
@@ -142,7 +141,6 @@ Statycznie skonsolidowany busybox dla initrd.
 
 %prep
 %setup -q
-%patch15 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -228,7 +226,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS Changelog README .config
+%doc AUTHORS README .config
 
 %if %{with linkfl}
 %attr(755,root,root) /bin/*