From b03a0022ed21a5df9633aa78f117ca6536f8c84a Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Sun, 13 Feb 2011 13:52:36 +0100 Subject: [PATCH] busybox: Updated (1.17.4 -> 1.18.3) --- base/busybox/busybox.desc | 8 +++++--- base/busybox/linuxrc-location.patch | 28 ---------------------------- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 base/busybox/linuxrc-location.patch diff --git a/base/busybox/busybox.desc b/base/busybox/busybox.desc index 28ca11a4e..681c6dfeb 100644 --- a/base/busybox/busybox.desc +++ b/base/busybox/busybox.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../busybox/busybox.desc -[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -29,7 +29,9 @@ [L] GPL [S] Stable -[V] 1.17.4 +[V] 1.18.3 [P] X -?---5---9 102.001 -[D] 3198836449 busybox-1.17.4.tar.bz2 http://busybox.net/downloads/ +[D] 2179714866 busybox-1.18.3.tar.bz2 http://busybox.net/downloads/ +[D] 1665646922 busybox-1.18.3-buildsys.patch http://busybox.net/downloads/fixes-1.18.3/ +[D] 3561935220 busybox-1.18.3-wget.patch http://busybox.net/downloads/fixes-1.18.3/ diff --git a/base/busybox/linuxrc-location.patch b/base/busybox/linuxrc-location.patch deleted file mode 100644 index 73271da3e..000000000 --- a/base/busybox/linuxrc-location.patch +++ /dev/null @@ -1,28 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../busybox/linuxrc-location.patch -# Copyright (C) 2007 - 2010 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE 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 --- - ---- busybox-1.17.2/include/applets.src.h.orig 2010-09-07 17:39:58.838205654 +0200 -+++ busybox-1.17.2/include/applets.src.h 2010-09-07 17:41:29.910279139 +0200 -@@ -224,7 +224,7 @@ - IF_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_DROP)) - IF_SETARCH(APPLET_ODDNAME(linux32, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux32)) - IF_SETARCH(APPLET_ODDNAME(linux64, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux64)) --IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc)) -+IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_SBIN, _BB_SUID_DROP, linuxrc)) - IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_DROP, ln)) - IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) - IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP))