Update busybox to new stable release 1.24.1, and withdraw busybox-unstable.

Changes: https://busybox.net/

5 files changed, 44 insertions, 42 deletions

diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 7173e6212b2a..0623ab2b1a17 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	busybox
-PORTVERSION=	1.23.2
+PORTVERSION=	1.24.1
 CATEGORIES=	sysutils misc shells
-MASTER_SITES=	http://www.busybox.net/downloads/
+MASTER_SITES=	http://www.busybox.net/downloads/ LOCAL/mandree
 
 PATCH_SITES=	http://www.busybox.net/downloads/fixes-${PORTVERSION}/
 PATCH_DIST_STRIP=	-p1
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
 CONFLICTS_INSTALL=	busybox-unstable-*
 
-PORTSCOUT=	skipv:1.24.0
+PORTSCOUT=	skipv:1.25.0
 
 CFLAGS+=	-fno-builtin-mempcpy	# avoid -Wshadow warnings
 MAKE_ARGS+=	SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index 06f30a24a62f..0443925e015c 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (busybox-1.23.2.tar.bz2) = 05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
-SIZE (busybox-1.23.2.tar.bz2) = 2252786
+SHA256 (busybox-1.24.1.tar.bz2) = 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d
+SIZE (busybox-1.24.1.tar.bz2) = 2068803
diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config
index cd02d07fb3b2..8627889eb77b 100644
--- a/sysutils/busybox/files/data-.config
+++ b/sysutils/busybox/files/data-.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.23.0
-# Tue Jan  6 21:43:28 2015
+# Busybox version: 1.24.1
+# Sun Dec 20 16:49:59 2015
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -156,6 +156,7 @@ CONFIG_CPIO=y
 CONFIG_GZIP=y
 CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
 CONFIG_GZIP_FAST=0
+# CONFIG_FEATURE_GZIP_LEVELS is not set
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
 CONFIG_RPM=y
@@ -183,10 +184,17 @@ CONFIG_CAT=y
 # CONFIG_FEATURE_DATE_ISOFMT is not set
 # CONFIG_FEATURE_DATE_NANO is not set
 # CONFIG_FEATURE_DATE_COMPAT is not set
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_FEATURE_DD_STATUS=y
 CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_SHUF=y
+CONFIG_SYNC=y
+# CONFIG_FEATURE_SYNC_FANCY is not set
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
@@ -195,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUNCATE=y
 CONFIG_UNLINK=y
 # CONFIG_BASE64 is not set
 # CONFIG_WHO is not set
@@ -211,10 +220,6 @@ CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-CONFIG_FEATURE_DD_THIRD_STATUS_LINE=y
-CONFIG_FEATURE_DD_IBS_OBS=y
 # CONFIG_DF is not set
 # CONFIG_FEATURE_DF_FANCY is not set
 CONFIG_DIRNAME=y
@@ -283,7 +288,6 @@ CONFIG_FEATURE_SPLIT_FANCY=y
 # CONFIG_FEATURE_STAT_FORMAT is not set
 # CONFIG_STTY is not set
 CONFIG_SUM=y
-CONFIG_SYNC=y
 # CONFIG_TAC is not set
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -292,6 +296,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
+CONFIG_UNAME_OSNAME="FreeBSD"
 CONFIG_UNEXPAND=y
 CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
 CONFIG_UNIQ=y
@@ -549,7 +554,18 @@ CONFIG_FATATTR=y
 # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
 # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_MOUNT is not set
+# CONFIG_FEATURE_MOUNT_FAKE is not set
+# CONFIG_FEATURE_MOUNT_VERBOSE is not set
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
+# CONFIG_FEATURE_MOUNT_LABEL is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
+# CONFIG_FEATURE_MOUNT_CIFS is not set
+# CONFIG_FEATURE_MOUNT_FLAGS is not set
+# CONFIG_FEATURE_MOUNT_FSTAB is not set
+# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
 CONFIG_REV=y
+# CONFIG_UEVENT is not set
 # CONFIG_ACPID is not set
 # CONFIG_FEATURE_ACPID_COMPAT is not set
 # CONFIG_BLKID is not set
@@ -595,15 +611,6 @@ CONFIG_LSUSB=y
 # CONFIG_MKSWAP is not set
 # CONFIG_FEATURE_MKSWAP_UUID is not set
 CONFIG_MORE=y
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
 # CONFIG_PIVOT_ROOT is not set
 # CONFIG_RDATE is not set
 # CONFIG_RDEV is not set
@@ -652,10 +659,15 @@ CONFIG_SCRIPTREPLAY=y
 # CONFIG_FEATURE_CROND_D is not set
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+# CONFIG_I2CGET is not set
+# CONFIG_I2CSET is not set
+# CONFIG_I2CDUMP is not set
+# CONFIG_I2CDETECT is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_TRUNCATE=y
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
 # CONFIG_FEATURE_LESS_WINCH is not set
@@ -750,6 +762,13 @@ CONFIG_NC=y
 # CONFIG_PING is not set
 # CONFIG_PING6 is not set
 # CONFIG_FEATURE_FANCY_PING is not set
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
+CONFIG_FEATURE_WGET_TIMEOUT=y
+CONFIG_FEATURE_WGET_OPENSSL=y
+CONFIG_FEATURE_WGET_SSL_HELPER=y
 # CONFIG_WHOIS is not set
 # CONFIG_FEATURE_IPV6 is not set
 # CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -811,6 +830,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_FEATURE_IP_ADDRESS is not set
 # CONFIG_FEATURE_IP_LINK is not set
 # CONFIG_FEATURE_IP_ROUTE is not set
+CONFIG_FEATURE_IP_ROUTE_DIR=""
 # CONFIG_FEATURE_IP_TUNNEL is not set
 # CONFIG_FEATURE_IP_RULE is not set
 # CONFIG_FEATURE_IP_SHORT_FORMS is not set
@@ -877,11 +897,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 # CONFIG_UDPSVD is not set
 # CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 
 #
diff --git a/sysutils/busybox/files/patch-include__libbb.h b/sysutils/busybox/files/patch-include__libbb.h
index 00372c5c3c38..167378682367 100644
--- a/sysutils/busybox/files/patch-include__libbb.h
+++ b/sysutils/busybox/files/patch-include__libbb.h
@@ -1,5 +1,5 @@
---- ./include/libbb.h.orig	2012-07-02 14:08:25.000000000 +0000
-+++ ./include/libbb.h	2012-07-17 02:08:37.000000000 +0000
+--- include/libbb.h.orig	2015-10-24 00:24:35 UTC
++++ include/libbb.h
 @@ -51,6 +51,9 @@
  #include <termios.h>
  #include <time.h>
@@ -10,7 +10,7 @@
  #include <pwd.h>
  #include <grp.h>
  #if ENABLE_FEATURE_SHADOWPASSWDS
-@@ -129,9 +132,6 @@
+@@ -152,9 +155,6 @@
  #ifndef HAVE_FDATASYNC
  # define fdatasync fsync
  #endif
diff --git a/sysutils/busybox/files/patch-include_platform.h b/sysutils/busybox/files/patch-include_platform.h
deleted file mode 100644
index 24f69d8314f4..000000000000
--- a/sysutils/busybox/files/patch-include_platform.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/platform.h.orig	2015-01-27 08:49:43 UTC
-+++ include/platform.h
-@@ -544,4 +544,10 @@ extern int vasprintf(char **string_ptr, 
- extern ssize_t getline(char **lineptr, size_t *n, FILE *stream) FAST_FUNC;
- #endif
- 
-+#include <string.h>
-+static ALWAYS_INLINE void *mempcpy(void *dest, const void *src, size_t len)
-+{
-+	return memcpy(dest, src, len) + len;
-+}
-+
- #endif