main/busybox: upgrade to 1.18.2

4 files changed, 44 insertions, 87 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 8f71a6cad9..d49911917b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.17.4
-pkgrel=2
+pkgver=1.18.2
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -11,9 +11,7 @@ install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-static"
 triggers="busybox.trigger:/bin /usr/bin /sbin /usr/sbin /lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
-	ifupdown-ipv6.patch
 	$pkgname-1.11.1-bb.patch
-	$pkgname-1.17.4-crond.patch
 	busyboxconfig"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -70,8 +68,6 @@ static() {
 	
 }
 
-md5sums="b3254232e9919007ca803d3a4fe81f3c  busybox-1.17.4.tar.bz2
-08af7b8b4e41f86a34a16270a8691e31  ifupdown-ipv6.patch
+md5sums="69a82091e5710b72db5ce0e14e7c0cd7  busybox-1.18.2.tar.bz2
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
-fd451b1e8e6e976c99869dc2d149ccc9  busybox-1.17.4-crond.patch
-55a292423b87893a4ecb44e47c4c79f6  busyboxconfig"
+181310149cad8fce22aba96220cbbd38  busyboxconfig"
diff --git a/main/busybox/busybox-1.17.4-crond.patch b/main/busybox/busybox-1.17.4-crond.patch
deleted file mode 100644
index 79c6b16653..0000000000
--- a/main/busybox/busybox-1.17.4-crond.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/miscutils/crond.c b/miscutils/crond.c
-index 4a3103c..7ba8bab 100644
---- a/miscutils/crond.c
-+++ b/miscutils/crond.c
-@@ -827,7 +827,7 @@ ForkJob(const char *user, CronLine *line, int mailFd,
- 
- static void RunJob(const char *user, CronLine *line)
- {
--	char mailFile[128];
-+	char mailFile[128], *mail_filename = NULL;
- 	int mailFd = -1;
- 
- 	line->cl_Pid = 0;
-@@ -836,6 +836,7 @@ static void RunJob(const char *user, CronLine *line)
- 	if (line->cl_MailTo) {
- 		/* open mail file - owner root so nobody can screw with it. */
- 		snprintf(mailFile, sizeof(mailFile), "%s/cron.%s.%d", TMPDIR, user, getpid());
-+		mail_filename = mailFile;
- 		mailFd = open(mailFile, O_CREAT | O_TRUNC | O_WRONLY | O_EXCL | O_APPEND, 0600);
- 
- 		if (mailFd >= 0) {
-@@ -849,7 +850,7 @@ static void RunJob(const char *user, CronLine *line)
- 		}
- 	}
- 
--	ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mailFile);
-+	ForkJob(user, line, mailFd, DEFAULT_SHELL, "-c", line->cl_Shell, mail_filename);
- }
- 
- /*
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 89f5e7bf24..e03b8715c3 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.17.1
-# Thu Aug  5 13:41:36 2010
+# Busybox version: 1.18.2
+# Fri Feb  4 18:18:10 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -16,6 +16,7 @@ CONFIG_DESKTOP=y
 CONFIG_EXTRA_COMPAT=y
 # CONFIG_INCLUDE_SUSv2 is not set
 # CONFIG_USE_PORTABLE_CODE is not set
+CONFIG_PLATFORM_LINUX=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -23,6 +24,7 @@ CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 CONFIG_FEATURE_COMPRESS_USAGE=y
 CONFIG_FEATURE_INSTALLER=y
+# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_LOCALE_SUPPORT is not set
 CONFIG_UNICODE_SUPPORT=y
 # CONFIG_UNICODE_USING_LOCALE is not set
@@ -37,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
+CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
@@ -73,9 +75,8 @@ CONFIG_NO_DEBUG_LIB=y
 # CONFIG_EFENCE is not set
 
 #
-# Installation Options
+# Installation Options ("make install" behavior)
 #
-# CONFIG_INSTALL_NO_USR is not set
 # CONFIG_INSTALL_APPLET_SYMLINKS is not set
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
@@ -92,6 +93,7 @@ CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=0
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 CONFIG_FEATURE_EDITING_VI=y
@@ -172,6 +174,7 @@ CONFIG_FEATURE_TEST_64=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_BASE64=y
 CONFIG_CAL=y
 CONFIG_CATV=y
 CONFIG_CHGRP=y
@@ -342,6 +345,7 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+# CONFIG_PATCH is not set
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
@@ -349,7 +353,6 @@ CONFIG_DIFF=y
 # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
 CONFIG_FEATURE_DIFF_DIR=y
 CONFIG_ED=y
-# CONFIG_PATCH is not set
 CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
@@ -409,6 +412,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 # CONFIG_BOOTCHARTD is not set
 # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
 # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
+CONFIG_HALT=y
+# CONFIG_FEATURE_CALL_TELINIT is not set
+CONFIG_TELINIT_PATH=""
 CONFIG_INIT=y
 CONFIG_FEATURE_USE_INITTAB=y
 CONFIG_FEATURE_KILL_REMOVED=y
@@ -418,30 +424,30 @@ CONFIG_FEATURE_INIT_SYSLOG=y
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
+CONFIG_INIT_TERMINAL_TYPE="linux"
 CONFIG_MESG=y
 
 #
 # Login/Password Management Utilities
 #
+CONFIG_ADD_SHELL=y
+CONFIG_REMOVE_SHELL=y
 CONFIG_FEATURE_SHADOWPASSWDS=y
 CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 # CONFIG_USE_BB_CRYPT is not set
 # CONFIG_USE_BB_CRYPT_SHA is not set
-CONFIG_ADDGROUP=y
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-CONFIG_DELGROUP=y
-CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-CONFIG_FEATURE_CHECK_NAMES=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
+CONFIG_FEATURE_CHECK_NAMES=y
 CONFIG_FIRST_SYSTEM_ID=100
 CONFIG_LAST_SYSTEM_ID=999
+CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELUSER=y
+CONFIG_DELGROUP=y
+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
 CONFIG_GETTY=y
 CONFIG_LOGIN=y
 # CONFIG_PAM is not set
@@ -500,6 +506,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 #
 # Linux System Utilities
 #
+CONFIG_BLOCKDEV=y
 CONFIG_REV=y
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
@@ -518,6 +525,7 @@ CONFIG_FEATURE_AIX_LABEL=y
 CONFIG_FEATURE_SGI_LABEL=y
 CONFIG_FEATURE_SUN_LABEL=y
 CONFIG_FEATURE_OSF_LABEL=y
+CONFIG_FEATURE_GPT_LABEL=y
 CONFIG_FEATURE_FDISK_ADVANCED=y
 CONFIG_FINDFS=y
 CONFIG_FLOCK=y
@@ -550,7 +558,6 @@ CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
-CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
 CONFIG_FEATURE_MOUNT_FAKE=y
 CONFIG_FEATURE_MOUNT_VERBOSE=y
@@ -607,10 +614,13 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 CONFIG_CONSPY=y
+CONFIG_NANDWRITE=y
+CONFIG_NANDDUMP=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
 CONFIG_ADJTIMEX=y
 CONFIG_BBCONFIG=y
+CONFIG_FEATURE_COMPRESS_BBCONFIG=y
 CONFIG_BEEP=y
 CONFIG_FEATURE_BEEP_FREQ=440
 CONFIG_FEATURE_BEEP_LENGTH_MS=30
@@ -690,6 +700,7 @@ CONFIG_WATCHDOG=y
 #
 # Networking Utilities
 #
+CONFIG_NBDCLIENT=y
 CONFIG_NC=y
 CONFIG_NC_SERVER=y
 CONFIG_NC_EXTRA=y
@@ -725,6 +736,7 @@ CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
 CONFIG_FEATURE_HTTPD_PROXY=y
+CONFIG_FEATURE_HTTPD_GZIP=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -823,6 +835,7 @@ CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 
 #
@@ -846,6 +859,10 @@ CONFIG_SENDMAIL=y
 #
 # Process Utilities
 #
+CONFIG_IOSTAT=y
+CONFIG_MPSTAT=y
+CONFIG_PMAP=y
+CONFIG_POWERTOP=y
 CONFIG_SMEMCAP=y
 CONFIG_FREE=y
 CONFIG_FUSER=y
@@ -922,10 +939,13 @@ CONFIG_ASH_MAIL=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
+# CONFIG_HUSH_BRACE_EXPANSION is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
+# CONFIG_HUSH_SAVEHISTORY is not set
 # CONFIG_HUSH_JOB is not set
 # CONFIG_HUSH_TICK is not set
 # CONFIG_HUSH_IF is not set
@@ -933,22 +953,21 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_CASE is not set
 # CONFIG_HUSH_FUNCTIONS is not set
 # CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_MODE_X is not set
+# CONFIG_MSH is not set
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
 # CONFIG_FEATURE_BASH_IS_ASH is not set
 # CONFIG_FEATURE_BASH_IS_HUSH is not set
 CONFIG_FEATURE_BASH_IS_NONE=y
-# CONFIG_LASH is not set
-# CONFIG_MSH is not set
 CONFIG_SH_MATH_SUPPORT=y
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_CTTYHACK is not set
 
 #
 # System Logging Utilities
@@ -963,4 +982,5 @@ CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
 CONFIG_KLOGD=y
+CONFIG_FEATURE_KLOGD_KLOGCTL=y
 CONFIG_LOGGER=y
diff --git a/main/busybox/ifupdown-ipv6.patch b/main/busybox/ifupdown-ipv6.patch
deleted file mode 100644
index 6d46034aae..0000000000
--- a/main/busybox/ifupdown-ipv6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- busybox-1.17.1-updated/networking/ifupdown.c
-+++ busybox-1.17.1/networking/ifupdown.c
-@@ -353,6 +353,11 @@
- #endif
- }
- 
-+static int FAST_FUNC manual_up_down6(struct interface_defn_t *ifd UNUSED_PARAM, execfn *exec UNUSED_PARAM)
-+{
-+	return 1;
-+}
-+
- static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
- {
- 	int result;
-@@ -398,10 +403,11 @@
- 
- static const struct method_t methods6[] = {
- #if ENABLE_FEATURE_IFUPDOWN_IP
--	{ "v4tunnel", v4tunnel_up, v4tunnel_down, },
-+	{ "v4tunnel" , v4tunnel_up     , v4tunnel_down   , },
- #endif
--	{ "static", static_up6, static_down6, },
--	{ "loopback", loopback_up6, loopback_down6, },
-+	{ "static"   , static_up6      , static_down6    , },
-+	{ "manual"   , manual_up_down6 , manual_up_down6 , },
-+	{ "loopback" , loopback_up6    , loopback_down6  , },
- };
- 
- static const struct address_family_t addr_inet6 = {