diff --git a/base/busybox/busybox.desc b/base/busybox/busybox.desc index a4c0953b6..f7b5170a5 100644 --- a/base/busybox/busybox.desc +++ b/base/busybox/busybox.desc @@ -30,7 +30,7 @@ [L] GPL [S] Stable -[V] 1.10.4 +[V] 1.11.1 [P] X -?---5---9 102.001 -[D] 1992813016 busybox-1.10.4.tar.bz2 http://busybox.net/downloads/ +[D] 584933224 busybox-1.11.1.tar.bz2 http://busybox.net/downloads/ diff --git a/base/busybox/dietlibc.patch b/base/busybox/dietlibc.patch deleted file mode 100644 index c8bbd8745..000000000 --- a/base/busybox/dietlibc.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../busybox/dietlibc.patch -# Copyright (C) 2007 - 2008 The OpenSDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./shell/ash.c.orig 2007-07-17 11:01:59.000000000 -0400 -+++ ./shell/ash.c 2007-07-17 11:02:57.000000000 -0400 -@@ -66,6 +66,9 @@ - #error "Do not even bother, ash will not run on uClinux" - #endif - -+#ifdef __dietlibc__ -+#define dprintf fdprintf -+#endif - - /* ============ Misc helpers */ - ---- ./libbb/pw_encrypt.c.orig 2007-07-21 19:35:23.000000000 -0400 -+++ ./libbb/pw_encrypt.c 2007-07-21 19:35:36.000000000 -0400 -@@ -8,7 +8,7 @@ - */ - - #include "libbb.h" --#include -+#include - - char *pw_encrypt(const char *clear, const char *salt) - { ---- ./util-linux/umount.c.orig 2008-02-14 14:44:01.000000000 +0000 -+++ ./util-linux/umount.c 2008-02-14 14:44:29.000000000 +0000 -@@ -21,6 +21,17 @@ - #define OPT_REMOUNT (1 << 4) - #define OPT_ALL (ENABLE_FEATURE_UMOUNT_ALL ? (1 << 5) : 0) - -+#if defined(__dietlibc__) -+/* 16.12.2006, Sampo Kellomaki (sampo@iki.fi) -+ * dietlibc-0.30 does not have implementation of getmntent_r() */ -+static struct mntent *getmntent_r(FILE* stream, struct mntent* result, char* buffer, int bufsize) -+{ -+ struct mntent* ment = getmntent(stream); -+ memcpy(result, ment, sizeof(struct mntent)); -+ return result; -+} -+#endif -+ - int umount_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; - int umount_main(int argc, char **argv) - { diff --git a/base/busybox/linuxrc-location.patch b/base/busybox/linuxrc-location.patch index a480bad92..d3dd6b4f3 100644 --- a/base/busybox/linuxrc-location.patch +++ b/base/busybox/linuxrc-location.patch @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../busybox/linuxrc-location.patch -# Copyright (C) 2007 The OpenSDE Project +# Copyright (C) 2007 - 2008 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -15,14 +15,14 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./include/applets.h.orig 2007-06-01 07:48:39.000000000 -0400 -+++ ./include/applets.h 2007-06-09 18:40:38.000000000 -0400 -@@ -202,7 +202,7 @@ +--- ./include/applets.h.orig 2008-07-17 09:08:12.000000000 +0000 ++++ ./include/applets.h 2008-07-17 09:08:40.000000000 +0000 +@@ -215,7 +215,7 @@ USE_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) - USE_SETARCH(APPLET_NOUSAGE(linux32, setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) - USE_SETARCH(APPLET_NOUSAGE(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER)) --USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER)) -+USE_FEATURE_INITRD(APPLET_NOUSAGE(linuxrc, init, _BB_DIR_SBIN, _BB_SUID_NEVER)) + USE_SETARCH(APPLET_ODDNAME(linux32, setarch, _BB_DIR_BIN, _BB_SUID_NEVER, linux32)) + USE_SETARCH(APPLET_ODDNAME(linux64, setarch, _BB_DIR_BIN, _BB_SUID_NEVER, linux64)) +-USE_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_NEVER, linuxrc)) ++USE_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_SBIN, _BB_SUID_NEVER, linuxrc)) USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_NEVER, ln)) USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_BIN, _BB_SUID_NEVER))