Thread: [Commits] : Tuxbox-GIT: cdk branch master updated. CVS-Final-8-gb6cf0c2
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
tuxbox-cvs-commits
|
From: Thilo G. <tux...@ne...> - 2013-09-18 06:30:47
|
Project "Tuxbox-GIT: cdk":
The branch, master has been updated
via b6cf0c29568bf560ce0308ce2d3fdaec9df8c878 (commit)
from cc0b185ccc4070d75255c7b08bec767e5af4a519 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b6cf0c29568bf560ce0308ce2d3fdaec9df8c878
Author: GetAway <get...@t-...>
Date: Wed Apr 17 04:30:18 2013 +0200
version bump busybox-1.20.2
diff --git a/Patches/busybox-1.17.1.diff b/Patches/busybox-1.17.1.diff
index 1a26fe4..3ad3045 100644
--- a/Patches/busybox-1.17.1.diff
+++ b/Patches/busybox-1.17.1.diff
@@ -1,7 +1,7 @@
-diff -uNr busybox-1.17.1.org//init/init.c busybox-1.17.1/init/init.c
---- busybox-1.17.1.org//init/init.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/init/init.c 2010-08-01 11:42:45.000000000 +0200
-@@ -194,8 +194,10 @@
+diff -u -pr busybox-1.17.1.org/init/init.c busybox-1.17.1/init/init.c
+--- busybox-1.17.1.org/init/init.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/init/init.c 2013-04-16 20:19:23.000000000 +0200
+@@ -306,8 +306,10 @@ static void console_init(void)
/* Not a linux terminal, probably serial console.
* Force the TERM setting to vt102
* if TERM is set to linux (the default) */
@@ -11,11 +11,11 @@ diff -uNr busybox-1.17.1.org//init/init.c busybox-1.17.1/init/init.c
+*/
if (!ENABLE_FEATURE_INIT_SYSLOG)
log_console = NULL;
- } else if (!s)
-diff -uNr busybox-1.17.1.org//libbb/procps.c busybox-1.17.1/libbb/procps.c
---- busybox-1.17.1.org//libbb/procps.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/libbb/procps.c 2010-08-01 11:42:45.000000000 +0200
-@@ -364,6 +364,20 @@
+ } else
+diff -u -pr busybox-1.17.1.org/libbb/procps.c busybox-1.17.1/libbb/procps.c
+--- busybox-1.17.1.org/libbb/procps.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/libbb/procps.c 2013-04-16 20:19:23.000000000 +0200
+@@ -483,6 +483,20 @@ procps_status_t* FAST_FUNC procps_scan(p
sp->state[2] = ' ';
}
@@ -34,12 +34,23 @@ diff -uNr busybox-1.17.1.org//libbb/procps.c busybox-1.17.1/libbb/procps.c
+ }
+
#if ENABLE_FEATURE_TOPMEM
- if (flags & (PSSCAN_SMAPS)) {
- FILE *file;
-diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm.c
---- busybox-1.17.1.org//miscutils/hdparm.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/miscutils/hdparm.c 2010-08-01 11:42:45.000000000 +0200
-@@ -288,6 +288,7 @@
+ if (flags & PSSCAN_SMAPS)
+ procps_read_smaps(pid, &sp->smaps, NULL, NULL);
+diff -u -pr busybox-1.17.1.org/loginutils/passwd.c busybox-1.17.1/loginutils/passwd.c
+--- busybox-1.17.1.org/loginutils/passwd.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/loginutils/passwd.c 2013-04-16 20:19:23.000000000 +0200
+@@ -15,6 +15,7 @@
+
+ #include "libbb.h"
+ #include <syslog.h>
++#include <sys/resource.h>
+
+ static void nuke_str(char *str)
+ {
+diff -u -pr busybox-1.17.1.org/miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm.c
+--- busybox-1.17.1.org/miscutils/hdparm.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/miscutils/hdparm.c 2013-04-16 20:19:23.000000000 +0200
+@@ -339,6 +339,7 @@ struct globals {
smallint set_sleepnow;
smallint get_powermode;
smallint getset_apmmode;
@@ -47,7 +58,7 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
int xfermode_requested;
unsigned long dkeep;
unsigned long standby_requested; /* 0..255 */
-@@ -297,6 +298,7 @@
+@@ -348,6 +349,7 @@ struct globals {
unsigned long wcache;
unsigned long doorlock;
unsigned long apmmode;
@@ -55,7 +66,7 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
#endif
IF_FEATURE_HDPARM_GET_IDENTITY( smallint get_IDentity;)
IF_FEATURE_HDPARM_HDIO_TRISTATE_HWIF( smallint getset_busstate;)
-@@ -361,6 +363,8 @@
+@@ -412,6 +414,8 @@ struct BUG_G_too_big {
#define set_sleepnow (G.set_sleepnow )
#define get_powermode (G.get_powermode )
#define getset_apmmode (G.getset_apmmode )
@@ -64,7 +75,7 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
#define xfermode_requested (G.xfermode_requested )
#define dkeep (G.dkeep )
#define standby_requested (G.standby_requested )
-@@ -1680,6 +1684,10 @@
+@@ -1732,6 +1736,10 @@ static void process_dev(char *devname)
ioctl_or_warn(fd, HDIO_DRIVE_CMD, &args);
args[1] = 0;
}
@@ -75,7 +86,7 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
if (getset_wcache == IS_SET) {
#ifdef DO_FLUSHCACHE
#ifndef WIN_FLUSHCACHE
-@@ -1986,7 +1994,7 @@
+@@ -2038,7 +2046,7 @@ static const char hdparm_options[] ALIGN
IF_FEATURE_HDPARM_GET_IDENTITY("iI")
IF_FEATURE_HDPARM_HDIO_GETSET_DMA("d::")
#ifdef HDIO_DRIVE_CMD
@@ -84,7 +95,7 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
#endif
IF_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF("U:")
#ifdef HDIO_GET_QDMA
-@@ -2026,6 +2034,7 @@
+@@ -2080,6 +2088,7 @@ int hdparm_main(int argc, char **argv)
if (c == 'k') getset_keep = parse_opts_0_1(&keep);
if (c == 'a') getset_readahead = parse_opts_0_INTMAX(&Xreadahead);
if (c == 'B') getset_apmmode = parse_opts(&apmmode, 1, 255);
@@ -92,10 +103,21 @@ diff -uNr busybox-1.17.1.org//miscutils/hdparm.c busybox-1.17.1/miscutils/hdparm
do_flush |= do_timings |= (c == 't');
do_flush |= do_ctimings |= (c == 'T');
#ifdef HDIO_DRIVE_CMD
-diff -uNr busybox-1.17.1.org//modutils/Config.src busybox-1.17.1/modutils/Config.src
---- busybox-1.17.1.org//modutils/Config.src 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/modutils/Config.src 2010-08-01 11:42:45.000000000 +0200
-@@ -139,6 +139,13 @@
+diff -u -pr busybox-1.17.1.org/miscutils/time.c busybox-1.17.1/miscutils/time.c
+--- busybox-1.17.1.org/miscutils/time.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/miscutils/time.c 2013-04-16 20:19:23.000000000 +0200
+@@ -16,6 +16,7 @@
+ //usage: "\n -v Verbose"
+
+ #include "libbb.h"
++#include <sys/resource.h>
+
+ /* Information on the resources used by a child process. */
+ typedef struct {
+diff -u -pr busybox-1.17.1.org/modutils/Config.src busybox-1.17.1/modutils/Config.src
+--- busybox-1.17.1.org/modutils/Config.src 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/modutils/Config.src 2013-04-16 20:19:23.000000000 +0200
+@@ -150,6 +150,13 @@ config FEATURE_INSMOD_TRY_MMAP
Choosing N saves about 250 bytes of code (on 32-bit x86).
@@ -109,7 +131,7 @@ diff -uNr busybox-1.17.1.org//modutils/Config.src busybox-1.17.1/modutils/Config
config FEATURE_INSMOD_VERSION_CHECKING
bool "Enable module version checking"
default n
-@@ -228,7 +235,7 @@
+@@ -247,7 +254,7 @@ config FEATURE_MODUTILS_SYMBOLS
config DEFAULT_MODULES_DIR
string "Default directory containing modules"
default "/lib/modules"
@@ -118,12 +140,12 @@ diff -uNr busybox-1.17.1.org//modutils/Config.src busybox-1.17.1/modutils/Config
help
Directory that contains kernel modules.
Defaults to "/lib/modules"
-diff -uNr busybox-1.17.1.org//modutils/insmod.c busybox-1.17.1/modutils/insmod.c
---- busybox-1.17.1.org//modutils/insmod.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/modutils/insmod.c 2010-08-01 11:42:45.000000000 +0200
-@@ -32,11 +32,42 @@
- //usage: "\n -x Don't export externs"
+diff -u -pr busybox-1.17.1.org/modutils/insmod.c busybox-1.17.1/modutils/insmod.c
+--- busybox-1.17.1.org/modutils/insmod.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/modutils/insmod.c 2013-04-16 21:58:24.000000000 +0200
+@@ -35,11 +35,42 @@
//usage: )
+ //usage:#endif
+#include <sys/utsname.h>
+static char *m_filename;
@@ -164,11 +186,11 @@ diff -uNr busybox-1.17.1.org//modutils/insmod.c busybox-1.17.1/modutils/insmod.c
/* Compat note:
* 2.6 style insmod has no options and required filename
-@@ -55,9 +86,107 @@
+@@ -58,9 +89,107 @@ int insmod_main(int argc UNUSED_PARAM, c
if (!filename)
bb_show_usage();
-- rc = bb_init_module(filename, parse_cmdline_module_options(argv));
+- rc = bb_init_module(filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0));
+ /* Grab the module name */
+ tmp = xstrdup(filename);
+ len = strlen(filename);
@@ -267,17 +289,17 @@ diff -uNr busybox-1.17.1.org//modutils/insmod.c busybox-1.17.1/modutils/insmod.c
+
+
+
-+ rc = bb_init_module(m_filename, parse_cmdline_module_options(argv));
++ rc = bb_init_module(m_filename, parse_cmdline_module_options(argv, /*quote_spaces:*/ 0));
if (rc)
- bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
+ bb_error_msg("can't insert '%s': %s", m_filename, moderror(rc));
return rc;
}
-diff -uNr busybox-1.17.1.org//networking/ifupdown.c busybox-1.17.1/networking/ifupdown.c
---- busybox-1.17.1.org//networking/ifupdown.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/networking/ifupdown.c 2010-08-01 11:42:45.000000000 +0200
-@@ -990,7 +990,7 @@
+diff -u -pr busybox-1.17.1.org/networking/ifupdown.c busybox-1.17.1/networking/ifupdown.c
+--- busybox-1.17.1.org/networking/ifupdown.c 2012-07-02 16:19:22.000000000 +0200
++++ busybox-1.17.1/networking/ifupdown.c 2013-04-16 20:19:23.000000000 +0200
+@@ -1025,7 +1025,7 @@ static int doit(char *str)
static int execute_all(struct interface_defn_t *ifd, const char *opt)
{
@@ -286,7 +308,7 @@ diff -uNr busybox-1.17.1.org//networking/ifupdown.c busybox-1.17.1/networking/if
char *buf;
for (i = 0; i < ifd->n_options; i++) {
if (strcmp(ifd->option[i].name, opt) == 0) {
-@@ -1000,9 +1000,15 @@
+@@ -1035,9 +1035,15 @@ static int execute_all(struct interface_
}
}
@@ -305,29 +327,40 @@ diff -uNr busybox-1.17.1.org//networking/ifupdown.c busybox-1.17.1/networking/if
}
static int check(char *str)
-diff -uNr busybox-1.17.1.org//networking/libiproute/ipaddress.c busybox-1.17.1/networking/libiproute/ipaddress.c
---- busybox-1.17.1.org//networking/libiproute/ipaddress.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/networking/libiproute/ipaddress.c 2010-08-01 11:43:20.000000000 +0200
-@@ -164,6 +164,7 @@
+diff -u -pr busybox-1.17.1.org/networking/inetd.c busybox-1.17.1/networking/inetd.c
+--- busybox-1.17.1.org/networking/inetd.c 2012-07-02 16:08:25.000000000 +0200
++++ busybox-1.17.1/networking/inetd.c 2013-04-16 20:19:23.000000000 +0200
+@@ -166,6 +166,7 @@
+
+ #include <syslog.h>
+ #include <sys/un.h>
++#include <sys/resource.h>
+
+ #include "libbb.h"
+
+diff -u -pr busybox-1.17.1.org/networking/libiproute/ipaddress.c busybox-1.17.1/networking/libiproute/ipaddress.c
+--- busybox-1.17.1.org/networking/libiproute/ipaddress.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/networking/libiproute/ipaddress.c 2013-04-16 20:19:23.000000000 +0200
+@@ -162,6 +162,7 @@ static NOINLINE int print_linkinfo(const
printf("master %s ", ll_idx_n2a(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
}
#endif
+#if 0
+ /* IFLA_OPERSTATE was added to kernel with the same commit as IFF_DORMANT */
+ #ifdef IFF_DORMANT
if (tb[IFLA_OPERSTATE]) {
- static const char operstate_labels[] ALIGN1 =
- "UNKNOWN\0""NOTPRESENT\0""DOWN\0""LOWERLAYERDOWN\0"
-@@ -171,6 +172,7 @@
- printf("state %s ", nth_string(operstate_labels,
+@@ -172,6 +173,7 @@ static NOINLINE int print_linkinfo(const
*(uint8_t *)RTA_DATA(tb[IFLA_OPERSTATE])));
}
+ #endif
+#endif
if (G_filter.showqueue)
print_queuelen((char*)RTA_DATA(tb[IFLA_IFNAME]));
-diff -uNr busybox-1.17.1.org//networking/libiproute/iplink.c busybox-1.17.1/networking/libiproute/iplink.c
---- busybox-1.17.1.org//networking/libiproute/iplink.c 2010-07-25 00:12:43.000000000 +0200
-+++ busybox-1.17.1/networking/libiproute/iplink.c 2010-08-01 11:55:39.000000000 +0200
-@@ -274,6 +274,7 @@
+diff -u -pr busybox-1.17.1.org/networking/libiproute/iplink.c busybox-1.17.1/networking/libiproute/iplink.c
+--- busybox-1.17.1.org/networking/libiproute/iplink.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/networking/libiproute/iplink.c 2013-04-16 20:19:23.000000000 +0200
+@@ -277,6 +277,7 @@ static int ipaddr_list_link(char **argv)
return ipaddr_list_or_flush(argv, 0);
}
@@ -335,7 +368,7 @@ diff -uNr busybox-1.17.1.org//networking/libiproute/iplink.c busybox-1.17.1/netw
#ifndef NLMSG_TAIL
#define NLMSG_TAIL(nmsg) \
((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
-@@ -360,20 +361,22 @@
+@@ -363,20 +364,22 @@ static int do_change(char **argv, const
return 2;
return 0;
}
@@ -362,10 +395,32 @@ diff -uNr busybox-1.17.1.org//networking/libiproute/iplink.c busybox-1.17.1/netw
return do_set(argv);
}
/* show, lst, list */
-diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount.c
---- busybox-1.17.1.org//util-linux/mount.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/util-linux/mount.c 2010-08-01 11:42:45.000000000 +0200
-@@ -418,6 +418,24 @@
+diff -u -pr busybox-1.17.1.org/networking/udhcp/dhcpc.c busybox-1.17.1/networking/udhcp/dhcpc.c
+--- busybox-1.17.1.org/networking/udhcp/dhcpc.c 2012-07-02 16:08:25.000000000 +0200
++++ busybox-1.17.1/networking/udhcp/dhcpc.c 2013-04-16 20:26:27.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "dhcpd.h"
+ #include "dhcpc.h"
+
++#include <asm/types.h>
+ #include <netinet/if_ether.h>
+ #include <netpacket/packet.h>
+ #include <linux/filter.h>
+diff -u -pr busybox-1.17.1.org/shell/shell_common.c busybox-1.17.1/shell/shell_common.c
+--- busybox-1.17.1.org/shell/shell_common.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/shell/shell_common.c 2013-04-16 20:19:23.000000000 +0200
+@@ -18,6 +18,7 @@
+ */
+ #include "libbb.h"
+ #include "shell_common.h"
++#include <sys/resource.h>
+
+ const char defifsvar[] ALIGN1 = "IFS= \t\n";
+
+diff -u -pr busybox-1.17.1.org/util-linux/mount.c busybox-1.17.1/util-linux/mount.c
+--- busybox-1.17.1.org/util-linux/mount.c 2012-07-02 16:08:25.000000000 +0200
++++ busybox-1.17.1/util-linux/mount.c 2013-04-16 22:05:02.000000000 +0200
+@@ -546,6 +546,24 @@ static void delete_block_backed_filesyst
void delete_block_backed_filesystems(void);
#endif
@@ -390,7 +445,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
// Perform actual mount of specific filesystem at specific location.
// NB: mp->xxx fields may be trashed on exit
static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts)
-@@ -875,7 +893,11 @@
+@@ -981,7 +999,11 @@ find_kernel_nfs_mount_version(void)
kernel_version = get_linux_version_code();
if (kernel_version) {
@@ -403,7 +458,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
nfs_mount_version = 3;
/* else v4 since 2.3.99pre4 */
}
-@@ -1608,8 +1630,6 @@
+@@ -1758,8 +1780,6 @@ static int singlemount(struct mntent *mp
llist_t *fl = NULL;
struct stat st;
@@ -412,7 +467,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
vfsflags = parse_mount_options(mp->mnt_opts, &filteropts);
// Treat fstype "auto" as unspecified
-@@ -1651,41 +1671,52 @@
+@@ -1801,40 +1821,51 @@ static int singlemount(struct mntent *mp
&& (mp->mnt_fsname[0] == '/' || mp->mnt_fsname[0] == '\\')
&& mp->mnt_fsname[0] == mp->mnt_fsname[1]
) {
@@ -476,22 +531,21 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
}
// Might this be an NFS filesystem?
- if (ENABLE_FEATURE_MOUNT_NFS
-- && (!mp->mnt_type || strcmp(mp->mnt_type, "nfs") == 0)
-+ && (!mp->mnt_type || !strcmp(mp->mnt_type, "nfs"))
+- if ((!mp->mnt_type || strncmp(mp->mnt_type, "nfs", 3) == 0)
++ if ((!mp->mnt_type || !strcmp(mp->mnt_type, "nfs"))
&& strchr(mp->mnt_fsname, ':') != NULL
) {
- rc = nfsmount(mp, vfsflags, filteropts);
-@@ -1703,7 +1734,7 @@
+ if (!mp->mnt_type)
+@@ -1854,7 +1885,7 @@ static int singlemount(struct mntent *mp
if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
loopFile = bb_simplify_path(mp->mnt_fsname);
mp->mnt_fsname = NULL; // will receive malloced loop dev name
-- if (set_loop(&mp->mnt_fsname, loopFile, 0) < 0) {
-+ if (set_loop(&(mp->mnt_fsname), loopFile, 0) < 0) {
+- if (set_loop(&mp->mnt_fsname, loopFile, 0, /*ro:*/ 0) < 0) {
++ if (set_loop(&(mp->mnt_fsname), loopFile, 0, /*ro:*/ 0) < 0) {
if (errno == EPERM || errno == EACCES)
bb_error_msg(bb_msg_perm_denied_are_you_root);
else
-@@ -1830,8 +1861,7 @@
+@@ -1990,8 +2021,7 @@ int mount_main(int argc UNUSED_PARAM, ch
llist_t *lst_o = NULL;
const char *fstabname;
FILE *fstab;
@@ -501,7 +555,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
unsigned opt;
struct mntent mtpair[2], *mtcur = mtpair;
IF_NOT_DESKTOP(const int nonroot = 0;)
-@@ -1871,9 +1901,9 @@
+@@ -2033,9 +2063,9 @@ int mount_main(int argc UNUSED_PARAM, ch
{
// Don't show rootfs. FIXME: why??
// util-linux 2.12a happily shows rootfs...
@@ -513,7 +567,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
printf("%s on %s type %s (%s)\n", mtpair->mnt_fsname,
mtpair->mnt_dir, mtpair->mnt_type,
mtpair->mnt_opts);
-@@ -1919,14 +1949,14 @@
+@@ -2081,14 +2111,14 @@ int mount_main(int argc UNUSED_PARAM, ch
return rc;
}
@@ -533,7 +587,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
fstab = setmntent(fstabname, "r");
if (!fstab)
bb_perror_msg_and_die("can't read '%s'", fstabname);
-@@ -1951,13 +1981,10 @@
+@@ -2113,13 +2143,10 @@ int mount_main(int argc UNUSED_PARAM, ch
if (argv[0]) {
// Is this what we're looking for?
@@ -551,7 +605,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
// Remember this entry. Something later may have
// overmounted it, and we want the _last_ match.
-@@ -1965,7 +1992,6 @@
+@@ -2127,7 +2154,6 @@ int mount_main(int argc UNUSED_PARAM, ch
// If we're mounting all
} else {
@@ -559,7 +613,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
// No, mount -a won't mount anything,
// even user mounts, for mere humans
if (nonroot)
-@@ -1993,25 +2019,10 @@
+@@ -2155,25 +2181,10 @@ int mount_main(int argc UNUSED_PARAM, ch
// NFS mounts want this to be xrealloc-able
mtcur->mnt_opts = xstrdup(mtcur->mnt_opts);
@@ -589,7 +643,7 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
}
free(mtcur->mnt_opts);
}
-@@ -2052,24 +2063,13 @@
+@@ -2214,24 +2225,13 @@ int mount_main(int argc UNUSED_PARAM, ch
bb_error_msg_and_die(bb_msg_you_must_be_root);
}
@@ -621,10 +675,10 @@ diff -uNr busybox-1.17.1.org//util-linux/mount.c busybox-1.17.1/util-linux/mount
}
//ret:
-diff -uNr busybox-1.17.1.org//util-linux/swaponoff.c busybox-1.17.1/util-linux/swaponoff.c
---- busybox-1.17.1.org//util-linux/swaponoff.c 2010-07-06 04:25:54.000000000 +0200
-+++ busybox-1.17.1/util-linux/swaponoff.c 2010-08-01 11:42:45.000000000 +0200
-@@ -55,15 +55,36 @@
+diff -u -pr busybox-1.17.1.org/util-linux/swaponoff.c busybox-1.17.1/util-linux/swaponoff.c
+--- busybox-1.17.1.org/util-linux/swaponoff.c 2012-06-26 15:35:45.000000000 +0200
++++ busybox-1.17.1/util-linux/swaponoff.c 2013-04-16 20:19:23.000000000 +0200
+@@ -77,15 +77,36 @@ static int swap_enable_disable(char *dev
return 0;
}
@@ -663,47 +717,3 @@ diff -uNr busybox-1.17.1.org//util-linux/swaponoff.c busybox-1.17.1/util-linux/s
err = 0;
while ((m = getmntent(f)) != NULL) {
-diff -uNr busybox-1.19.4.org/loginutils/passwd.c busybox-1.19.4/loginutils/passwd.c
---- busybox-1.19.4.org/loginutils/passwd.c 2012-02-04 20:34:24.000000000 +0100
-+++ busybox-1.19.4/loginutils/passwd.c 2012-04-08 15:03:50.000000000 +0200
-@@ -15,6 +15,7 @@
-
- #include "libbb.h"
- #include <syslog.h>
-+#include <sys/resource.h>
-
- static void nuke_str(char *str)
- {
-diff -uNr busybox-1.19.4.org/miscutils/time.c busybox-1.19.4/miscutils/time.c
---- busybox-1.19.4.org/miscutils/time.c 2012-02-04 20:24:55.000000000 +0100
-+++ busybox-1.19.4/miscutils/time.c 2012-04-08 15:04:49.000000000 +0200
-@@ -16,6 +16,7 @@
- //usage: "\n -v Verbose"
-
- #include "libbb.h"
-+#include <sys/resource.h>
-
- /* Information on the resources used by a child process. */
- typedef struct {
-diff -uNr busybox-1.19.4.org/networking/inetd.c busybox-1.19.4/networking/inetd.c
---- busybox-1.19.4.org/networking/inetd.c 2012-02-04 20:34:24.000000000 +0100
-+++ busybox-1.19.4/networking/inetd.c 2012-04-08 15:05:32.000000000 +0200
-@@ -166,6 +166,7 @@
-
- #include <syslog.h>
- #include <sys/un.h>
-+#include <sys/resource.h>
-
- #include "libbb.h"
-
-diff -uNr busybox-1.19.4.org/shell/shell_common.c busybox-1.19.4/shell/shell_common.c
---- busybox-1.19.4.org/shell/shell_common.c 2012-02-04 20:34:24.000000000 +0100
-+++ busybox-1.19.4/shell/shell_common.c 2012-04-08 15:06:29.000000000 +0200
-@@ -18,6 +18,7 @@
- */
- #include "libbb.h"
- #include "shell_common.h"
-+#include <sys/resource.h>
-
- const char defifsvar[] ALIGN1 = "IFS= \t\n";
-
diff --git a/config/busybox.config.m4 b/config/busybox.config.m4
index 7a435d9..7b77688 100644
--- a/config/busybox.config.m4
+++ b/config/busybox.config.m4
@@ -51,7 +51,10 @@ option(`CONFIG_BUILD_LIBBUSYBOX', `n', `n')
option(`CONFIG_FEATURE_SHARED_BUSYBOX', `n', `n')
option(`CONFIG_LFS', `y', `y')
CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_SYSROOT=""
CONFIG_EXTRA_CFLAGS=""
+CONFIG_EXTRA_LDFLAGS=""
+CONFIG_EXTRA_LDLIBS=""
#
# Debugging Options
@@ -83,8 +86,10 @@ CONFIG_PREFIX=PREFIX
#
# Busybox Library Tuning
#
+# CONFIG_FEATURE_SYSTEMD is not set
+# CONFIG_FEATURE_RTMINMAX is not set
CONFIG_PASSWORD_MINLEN=5
-CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_MD5_SMALL=1
option(`CONFIG_FEATURE_FAST_TOP', `n', `n')
option(`CONFIG_FEATURE_ETC_NETWORKS', `n', `n')
option(`CONFIG_FEATURE_EDITING', `y', `y')
@@ -99,6 +104,7 @@ option(`CONFIG_FEATURE_EDITING_FANCY_PROMPT', `y', `y')
# CONFIG_FEATURE_NON_POSIX_CP is not set
# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
CONFIG_FEATURE_COPYBUF_KB=4
+option(`CONFIG_FEATURE_SKIP_ROOTFS', `y', `y')
option(`CONFIG_MONOTONIC_SYSCALL', `n', `n')
option(`CONFIG_IOCTL_HEX2STR_ERROR', `y', `y')
# CONFIG_FEATURE_HWIB is not set
@@ -129,6 +135,7 @@ option(`CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY', `n', `n')
option(`CONFIG_GUNZIP', `y', `y')
option(`CONFIG_GZIP', `y', `y')
# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
+CONFIG_GZIP_FAST=0
option(`CONFIG_LZOP', `n', `n')
# CONFIG_LZOP_COMPR_HIGH is not set
option(`CONFIG_RPM2CPIO', `n', `n')
@@ -203,9 +210,9 @@ option(`CONFIG_HEAD', `y', `n')
option(`CONFIG_FEATURE_FANCY_HEAD', `n', `n')
option(`CONFIG_HOSTID', `n', `n')
option(`CONFIG_ID', `y', `n')
+option(`CONFIG_GROUPS', `n', `n')
option(`CONFIG_INSTALL', `n', `n')
option(`CONFIG_FEATURE_INSTALL_LONG_OPTIONS', `n', `n')
-option(`CONFIG_LENGTH', `n', `n')
option(`CONFIG_LN', `y', `y')
option(`CONFIG_LOGNAME', `n', `n')
option(`CONFIG_LS', `y', `y')
@@ -260,6 +267,7 @@ option(`CONFIG_FEATURE_TEE_USE_BLOCK_IO', `n', `n')
option(`CONFIG_TEST', `y', `y')
option(`CONFIG_FEATURE_TEST_64', `n', `n')
option(`CONFIG_TOUCH', `y', `y')
+option(`CONFIG_FEATURE_TOUCH_SUSV3', `n', `n')
option(`CONFIG_TR', `n', `n')
option(`CONFIG_FEATURE_TR_CLASSES', `n', `n')
option(`CONFIG_FEATURE_TR_EQUIV', `n', `n')
@@ -349,6 +357,7 @@ option(`CONFIG_FEATURE_VI_8BIT', `y', `y')
option(`CONFIG_FEATURE_VI_COLON', `y', `y')
option(`CONFIG_FEATURE_VI_YANKMARK', `y', `y')
option(`CONFIG_FEATURE_VI_SEARCH', `y', `y')
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
option(`CONFIG_FEATURE_VI_USE_SIGNALS', `y', `y')
option(`CONFIG_FEATURE_VI_DOT_CMD', `y', `y')
option(`CONFIG_FEATURE_VI_READONLY', `y', `y')
@@ -439,6 +448,7 @@ option(`CONFIG_GETTY', `n', `n')
option(`CONFIG_FEATURE_UTMP', `n', `n')
option(`CONFIG_FEATURE_WTMP', `n', `n')
option(`CONFIG_LOGIN', `y', `y')
+# CONFIG_LOGIN_SESSION_AS_CHILD is not set
option(`CONFIG_PAM', `n', `n')
option(`CONFIG_LOGIN_SCRIPTS', `y', `n')
option(`CONFIG_FEATURE_NOLOGIN', `n', `n')
@@ -447,6 +457,7 @@ option(`CONFIG_PASSWD', `y', `y')
option(`CONFIG_FEATURE_PASSWD_WEAK_CHECK', `n', `n')
option(`CONFIG_CRYPTPW', `n', `n')
option(`CONFIG_CHPASSWD', `n', `n')
+CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des"
option(`CONFIG_SU', `n', `n')
option(`CONFIG_FEATURE_SU_SYSLOG', `n', `n')
option(`CONFIG_FEATURE_SU_CHECKS_SHELLS', `n', `n')
@@ -634,8 +645,13 @@ option(`CONFIG_FEATURE_MTAB_SUPPORT', `n', `n')
# CONFIG_CONSPY is not set
# CONFIG_NANDWRITE is not set
# CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
# CONFIG_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
option(`CONFIG_ADJTIMEX', `n', `n')
option(`CONFIG_BBCONFIG', `n', `n')
option(`CONFIG_BEEP', `n', `n')
@@ -814,6 +830,7 @@ option(`CONFIG_FEATURE_NTPD_SERVER', `n', `n')
option(`CONFIG_PING', `y', `y')
option(`CONFIG_PING6', `n', `n')
option(`CONFIG_FEATURE_FANCY_PING', `y', `y')
+option(`CONFIG_WHOIS', `n', `n')
option(`CONFIG_PSCAN', `n', `n')
option(`CONFIG_ROUTE', `y', `y')
option(`CONFIG_SLATTACH', `n', `n')
@@ -845,6 +862,7 @@ option(`CONFIG_UDHCPC', `y', `y')
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
CONFIG_UDHCPC_DEFAULT_SCRIPT="/share/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b -R"
@@ -863,6 +881,7 @@ ifdef(`openvpn',
`# CONFIG_TUNCTL is not set'
)
# CONFIG_FEATURE_TUNCTL_UG is not set
+# CONFIG_UDHCPC6 is not set
# CONFIG_UDPSVD is not set
#
@@ -887,9 +906,12 @@ CONFIG_FEATURE_MIME_CHARSET=""
# Process Utilities
#
# CONFIG_IOSTAT is not set
+# CONFIG_LSOF is not set
# CONFIG_MPSTAT is not set
# CONFIG_PMAP is not set
# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
# CONFIG_SMEMCAP is not set
option(`CONFIG_FREE', `y', `y')
option(`CONFIG_FUSER', `n', `n')
@@ -970,6 +992,7 @@ option(`CONFIG_ASH', `y', `y')
# Ash Shell Options
#
# CONFIG_ASH_BASH_COMPAT is not set
+# CONFIG_ASH_IDLE_TIMEOUT is not set
option(`CONFIG_ASH_JOB_CONTROL', `y', `n')
option(`CONFIG_ASH_ALIAS', `y', `y')
option(`CONFIG_ASH_GETOPTS', `n', `n')
@@ -1004,6 +1027,7 @@ option(`CONFIG_MSH', `n', `n')
option(`CONFIG_FEATURE_SH_EXTRA_QUIET', `n', `n')
# CONFIG_FEATURE_SH_STANDALONE is not set
# CONFIG_FEATURE_SH_NOFORK is not set
+# CONFIG_FEATURE_SH_HISTFILESIZE is not set
option(`CONFIG_CTTYHACK', `n', `n')
#
@@ -1013,6 +1037,7 @@ option(`CONFIG_SYSLOGD', `y', `y')
option(`CONFIG_FEATURE_ROTATE_LOGFILE', `y', `y')
option(`CONFIG_FEATURE_REMOTE_LOG', `y', `y')
option(`CONFIG_FEATURE_SYSLOGD_DUP', `n', `n')
+option(`CONFIG_FEATURE_SYSLOGD_CFG', `n', `n')
option(`CONFIG_FEATURE_IPC_SYSLOG', `n', `n')
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
diff --git a/rules-archive b/rules-archive
index b6e7fb6..53ef1fd 100644
--- a/rules-archive
+++ b/rules-archive
@@ -50,7 +50,7 @@ ccache-3.1.4.tar.gz;http://samba.org/ftp/ccache
#
# root
#
-busybox-1.18.5.tar.bz2;http://www.busybox.net/downloads
+busybox-1.20.2.tar.bz2;http://www.busybox.net/downloads
autofs-4.1.4.tar.gz;http://www.kernel.org/pub/linux/daemons/autofs/v4
nfs-utils-1.1.1.tar.gz;http://prdownloads.sourceforge.net/sourceforge/nfs
fuse-2.5.3.tar.gz;http://prdownloads.sourceforge.net/sourceforge/fuse
diff --git a/rules-make b/rules-make
index 434bdc9..db35887 100644
--- a/rules-make
+++ b/rules-make
@@ -40,7 +40,7 @@ gcc47;4.7.2;gcc-4.7.2;gcc-4.7.2.tar.bz2;extract:gcc-4.7.2.tar.bz2;apatch:410-lib
#
# root
#
-busybox;1.18.5;busybox-1.18.5;busybox-1.18.5.tar.bz2:busybox-1.17.1.diff;extract:busybox-1.18.5.tar.bz2;patch:busybox-1.17.1.diff
+busybox;1.20.2;busybox-1.20.2;busybox-1.20.2.tar.bz2:busybox-1.17.1.diff;extract:busybox-1.20.2.tar.bz2;patch:busybox-1.17.1.diff
automount;4.1.4;autofs-4.1.4;autofs-4.1.4.tar.gz;extract:autofs-4.1.4.tar.gz;patch:autofs.diff
nfs_utils;1.1.1;nfs-utils-1.1.1;nfs-utils-1.1.1.tar.gz;extract:nfs-utils-1.1.1.tar.gz;patch:nfs-utils.diff
fusekernel;2.5.3;fuse-2.5.3;fuse-2.5.3.tar.gz;extract:fuse-2.5.3.tar.gz;patch:fuse.diff
-----------------------------------------------------------------------
Summary of changes:
Patches/busybox-1.17.1.diff | 250 ++++++++++++++++++++++---------------------
config/busybox.config.m4 | 29 +++++-
rules-archive | 2 +-
rules-make | 2 +-
4 files changed, 159 insertions(+), 124 deletions(-)
--
Tuxbox-GIT: cdk
|
Thanks for helping keep SourceForge clean.
X