From 44c8a0162b88b6708313c6e57ef8a161c117fdf6 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Tue, 17 Jul 2007 01:28:46 +0000 Subject: [PATCH] Updated busybox (1.5.1 -> 1.6.1) --- base/busybox/busybox.desc | 4 ++-- base/busybox/linuxrc-location.patch | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/base/busybox/busybox.desc b/base/busybox/busybox.desc index 6ef5eff1a..4b947ef38 100644 --- a/base/busybox/busybox.desc +++ b/base/busybox/busybox.desc @@ -30,7 +30,7 @@ [L] GPL [S] Stable -[V] 1.5.1 +[V] 1.6.1 [P] X -1---5---9 102.000 -[D] 3077479039 busybox-1.5.1.tar.bz2 http://busybox.net/downloads/ +[D] 3511620770 busybox-1.6.1.tar.bz2 http://busybox.net/downloads/ diff --git a/base/busybox/linuxrc-location.patch b/base/busybox/linuxrc-location.patch index ece887b49..6ec6bc0ea 100644 --- a/base/busybox/linuxrc-location.patch +++ b/base/busybox/linuxrc-location.patch @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../busybox/linuxrc-location.patch +# Filename: package/.../busybox/linuxrc-location.patch +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -12,16 +13,16 @@ # 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. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- ---- ./include/applets.h.orig 2006-06-30 22:42:10.000000000 +0000 -+++ ./include/applets.h 2006-07-02 20:32:32.000000000 +0000 -@@ -164,7 +164,7 @@ +--- ./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 @@ 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_LN(APPLET(ln, _BB_DIR_BIN, _BB_SUID_NEVER)) + 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)) - USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))