- outdated

Changed files:
    busybox-1.8.1-inetd.patch -> 1.2
    busybox-1.8.1-tar_z.patch -> 1.2
    busybox-1.8.1-tr.patch -> 1.2
    busybox-1.8.1-trylink.patch -> 1.2

diff --git a/busybox-1.8.1-inetd.patch b/busybox-1.8.1-inetd.patch
deleted file mode 100644 (file)
index 8c50dc1..0000000
--- a/busybox-1.8.1-inetd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN busybox-1.8.1/networking/inetd.c busybox-1.8.1-inetd/networking/inetd.c
---- busybox-1.8.1/networking/inetd.c   2007-11-09 18:40:47.000000000 -0700
-+++ busybox-1.8.1-inetd/networking/inetd.c     2007-11-12 12:51:58.000000000 -0700
-@@ -813,7 +813,7 @@
-               sep->se_bi = NULL;
- #endif
-       argc = 0;
--      for (; cp; arg = skip(&cp)) {
-+      for (arg = skip(&cp); cp; arg = skip(&cp)) {
-               if (argc < MAXARGV)
-                       sep->se_argv[argc++] = xxstrdup(arg);
-       }

diff --git a/busybox-1.8.1-tar_z.patch b/busybox-1.8.1-tar_z.patch
deleted file mode 100644 (file)
index 5c4207e..0000000
--- a/busybox-1.8.1-tar_z.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN busybox-1.8.1/archival/libunarchive/decompress_unzip.c busybox-1.8.1-tar_z/archival/libunarchive/decompress_unzip.c
---- busybox-1.8.1/archival/libunarchive/decompress_unzip.c     2007-11-09 18:40:48.000000000 -0700
-+++ busybox-1.8.1-tar_z/archival/libunarchive/decompress_unzip.c       2007-11-11 18:35:13.000000000 -0700
-@@ -1178,6 +1178,7 @@
-       ALLOC_STATE;
-       bytebuffer_max = 0x8000;
-       bytebuffer = xmalloc(bytebuffer_max);
-+      gunzip_src_fd = in;
- 
-  again:
-       if (!check_header_gzip(PASS_STATE_ONLY)) {

diff --git a/busybox-1.8.1-tr.patch b/busybox-1.8.1-tr.patch
deleted file mode 100644 (file)
index e34be37..0000000
--- a/busybox-1.8.1-tr.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN busybox-1.8.1/coreutils/tr.c busybox-1.8.1-tr/coreutils/tr.c
---- busybox-1.8.1/coreutils/tr.c       2007-11-09 18:40:51.000000000 -0700
-+++ busybox-1.8.1-tr/coreutils/tr.c    2007-11-13 13:27:45.000000000 -0700
-@@ -173,7 +173,8 @@
-       int idx = 1;
-       int i;
-       smalluint flags = 0;
--      size_t read_chars = 0, in_index = 0, out_index = 0, c, coded, last = -1;
-+      ssize_t read_chars = 0;
-+      size_t in_index = 0, out_index = 0, c, coded, last = -1;
-       RESERVE_CONFIG_UBUFFER(output, BUFSIZ);
-       RESERVE_CONFIG_BUFFER(vector, ASCII+1);
-       RESERVE_CONFIG_BUFFER(invec,  ASCII+1);
-@@ -223,8 +224,9 @@
-                       }
-                       read_chars = read(STDIN_FILENO, tr_buf, BUFSIZ);
-                       if (read_chars <= 0) {
--                              if (write(STDOUT_FILENO, (char *)output, out_index) != out_index)
--                                      bb_perror_msg(bb_msg_write_error);
-+                              xwrite(STDOUT_FILENO, (char *)output, out_index);
-+                              if (read_chars < 0)
-+                                      bb_perror_msg_and_die(bb_msg_read_error);
-                               exit(EXIT_SUCCESS);
-                       }
-                       in_index = 0;

diff --git a/busybox-1.8.1-trylink.patch b/busybox-1.8.1-trylink.patch
deleted file mode 100644 (file)
index ac0f44d..0000000
--- a/busybox-1.8.1-trylink.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -urN busybox-1.8.1/scripts/trylink busybox-1.8.1-trylink/scripts/trylink
---- busybox-1.8.1/scripts/trylink      2007-11-09 18:40:48.000000000 -0700
-+++ busybox-1.8.1-trylink/scripts/trylink      2007-11-13 11:13:30.000000000 -0700
-@@ -46,6 +46,14 @@
-     return $exitcode
- }
- 
-+check_cc() {
-+    if $CC $1 -shared -o /dev/null -xc /dev/null > /dev/null 2>&1; then
-+        echo "$1";
-+    else
-+        echo "$2";
-+    fi
-+}
-+
- EXE="$1"
- CC="$2"
- LDFLAGS="$3"
-@@ -53,6 +61,9 @@
- A_FILES="$5"
- LDLIBS="$6"
- 
-+# The -Wl,--sort-section option is not supported by older versions of ld
-+SORT_SECTION=`check_cc "-Wl,--sort-section -Wl,alignment" ""`
-+
- # Sanitize lib list (dups, extra spaces etc)
- LDLIBS=`echo "$LDLIBS" | xargs -n1 | sort | uniq | xargs`
- 
-@@ -64,7 +75,7 @@
- try $CC $LDFLAGS \
-       -o $EXE \
-       -Wl,--sort-common \
--      -Wl,--sort-section -Wl,alignment \
-+      $SORT_SECTION \
-       -Wl,--gc-sections \
-       -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
-       $l_list \
-@@ -88,7 +99,7 @@
-       try $CC $LDFLAGS \
-               -o $EXE \
-               -Wl,--sort-common \
--              -Wl,--sort-section -Wl,alignment \
-+              $SORT_SECTION \
-               -Wl,--gc-sections \
-               -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
-               $l_list
-@@ -117,7 +128,7 @@
-     try $CC $LDFLAGS \
-           -o $EXE \
-           -Wl,--sort-common \
--          -Wl,--sort-section -Wl,alignment \
-+          $SORT_SECTION \
-           -Wl,--gc-sections \
-           -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
-           $l_list \
-@@ -139,7 +150,7 @@
-     try $CC $LDFLAGS \
-           -o $EXE \
-           -Wl,--sort-common \
--          -Wl,--sort-section -Wl,alignment \
-+          $SORT_SECTION \
-           -Wl,--gc-sections \
-           -Wl,-T -Wl,busybox_ldscript \
-           -Wl,--start-group $O_FILES $A_FILES -Wl,--end-group \
-@@ -174,7 +185,7 @@
-           -Wl,-soname="libbusybox.so.$BB_VER" \
-           -Wl,--undefined=lbb_main \
-           -Wl,--sort-common \
--          -Wl,--sort-section -Wl,alignment \
-+          $SORT_SECTION \
-           -Wl,--start-group $A_FILES -Wl,--end-group \
-           $l_list \
-           -Wl,--warn-common \
-@@ -195,7 +206,7 @@
-     try $CC $LDFLAGS \
-           -o $EXE \
-           -Wl,--sort-common \
--          -Wl,--sort-section -Wl,alignment \
-+          $SORT_SECTION \
-           -Wl,--gc-sections \
-           -Wl,--start-group $O_FILES -Wl,--end-group \
-           -L"$sharedlib_dir" -lbusybox \
-@@ -234,7 +245,7 @@
-       try $CC $LDFLAGS "$sharedlib_dir/applet.c" \
-               -o $EXE \
-               -Wl,--sort-common \
--              -Wl,--sort-section -Wl,alignment \
-+              $SORT_SECTION \
-               -Wl,--gc-sections \
-               -L"$sharedlib_dir" -lbusybox \
-               -Wl,--warn-common \