shell-term-fm/busybox: version 1.31.1

7 files changed, 104 insertions, 15 deletions

diff --git a/shell-term-fm/busybox/BUILD b/shell-term-fm/busybox/BUILD
index 6dfecc1f8a..2af791db38 100755
--- a/shell-term-fm/busybox/BUILD
+++ b/shell-term-fm/busybox/BUILD
@@ -1 +1,2 @@
+CFLAGS="${CFLAGS} -isystem /usr/include/tirpc" && 
 default_build_make
diff --git a/shell-term-fm/busybox/DEPENDS b/shell-term-fm/busybox/DEPENDS
index 61448ce0b9..417de0ad49 100755
--- a/shell-term-fm/busybox/DEPENDS
+++ b/shell-term-fm/busybox/DEPENDS
@@ -1 +1,3 @@
+depends libtirpc &&
+
 suggest_depends linux-pam "" "" "for PAM support"
diff --git a/shell-term-fm/busybox/DETAILS b/shell-term-fm/busybox/DETAILS
index a199de0b7a..98a7d4f68b 100755
--- a/shell-term-fm/busybox/DETAILS
+++ b/shell-term-fm/busybox/DETAILS
@@ -1,5 +1,5 @@
            SPELL=busybox
-         VERSION=1.30.1
+         VERSION=1.31.1
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 
           SOURCE=$SPELL-$VERSION.tar.bz2
diff --git a/shell-term-fm/busybox/HISTORY b/shell-term-fm/busybox/HISTORY
index 2d3484e639..891990c677 100644
--- a/shell-term-fm/busybox/HISTORY
+++ b/shell-term-fm/busybox/HISTORY
@@ -1,3 +1,11 @@
+2020-08-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* DETAILS: version 1.31.1
+	* PRE_BUILD: run make oldconfig after restoring a configuration
+	* PRE_BUILD, patches/busybox-stime.patch: apply patch from gentoo to
+	  fix compilation
+	* busybox.config: refresh
+	* DEPENDS: depend on tirpc
+
 2019-02-16 Treeve Jelbert <treeve@sourcemage.org>
 	* DETAILS: version 1.30.1
 	* DETAILS: add gpg checking
diff --git a/shell-term-fm/busybox/PRE_BUILD b/shell-term-fm/busybox/PRE_BUILD
index 12f3f01d20..ac703f3763 100755
--- a/shell-term-fm/busybox/PRE_BUILD
+++ b/shell-term-fm/busybox/PRE_BUILD
@@ -1,10 +1,16 @@
 default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
+apply_patch_dir patches &&
+
 if  [  -f  $CONFIG_CACHE/busybox.config  ];  then
-  cp  ${CONFIG_CACHE}/busybox.config  .config
+  message "${MESSAGE_COLOR}restoring configuration from ${FILE_COLOR}${CONFIG_CACHE}/busybox.config${DEFAULT_COLOR}" &&
+  cp  ${CONFIG_CACHE}/busybox.config  .config &&
+  make oldconfig
 else
-  cp  ${SCRIPT_DIRECTORY}/busybox.config  .config
+  message "${MESSAGE_COLOR}using ${FILE_COLOR}${SCRIPT_DIRECTOY}/busybox.config as default configuration${DEFAULT_COLOR}" &&
+  cp  ${SCRIPT_DIRECTORY}/busybox.config  .config &&
+  make oldconfig
 fi  &&
 
 if [[  "$BB_CONFIG"  =  "y" ]] && [[ $RECONFIGURE ]] ;  then
@@ -12,4 +18,5 @@ if [[  "$BB_CONFIG"  =  "y" ]] && [[ $RECONFIGURE ]] ;  then
   make  "menuconfig"
 fi  &&
 
+
 cp  .config  ${CONFIG_CACHE}/busybox.config
diff --git a/shell-term-fm/busybox/busybox.config b/shell-term-fm/busybox/busybox.config
index 1a27508aef..3df9cf8914 100644
--- a/shell-term-fm/busybox/busybox.config
+++ b/shell-term-fm/busybox/busybox.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.30.1
-# Sat Feb 16 18:41:06 2019
+# Busybox version: 1.31.1
+# Sat Aug 22 15:50:58 2020
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 # CONFIG_SELINUX is not set
 # CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_SYSLOG_INFO=y
 CONFIG_FEATURE_SYSLOG=y
 CONFIG_PLATFORM_LINUX=y
 
@@ -49,9 +50,9 @@ CONFIG_STATIC=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_CROSS_COMPILER_PREFIX=""
 CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS=""
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
+CONFIG_EXTRA_CFLAGS="-pthread"
+CONFIG_EXTRA_LDFLAGS="-pthread"
+CONFIG_EXTRA_LDLIBS="tirpc"
 # CONFIG_USE_PORTABLE_CODE is not set
 CONFIG_STACK_OPTIMIZATION_386=y
 
@@ -236,7 +237,6 @@ CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FACTOR=y
 CONFIG_FALSE=y
 CONFIG_FOLD=y
-CONFIG_FSYNC=y
 CONFIG_HEAD=y
 CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
@@ -303,6 +303,7 @@ CONFIG_STTY=y
 CONFIG_SUM=y
 CONFIG_SYNC=y
 CONFIG_FEATURE_SYNC_FANCY=y
+CONFIG_FSYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -333,10 +334,10 @@ CONFIG_BASE64=y
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHOAMI=y
 CONFIG_WHO=y
 CONFIG_W=y
 CONFIG_USERS=y
+CONFIG_WHOAMI=y
 CONFIG_YES=y
 
 #
@@ -510,10 +511,10 @@ CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_CRYPT=y
 CONFIG_USE_BB_CRYPT_SHA=y
-CONFIG_ADDGROUP=y
-CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADD_SHELL=y
 CONFIG_REMOVE_SHELL=y
+CONFIG_ADDGROUP=y
+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_ADDUSER=y
 # CONFIG_FEATURE_CHECK_NAMES is not set
 CONFIG_LAST_ID=60000
@@ -537,7 +538,7 @@ CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
 CONFIG_SU=y
 CONFIG_FEATURE_SU_SYSLOG=y
 CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
+CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY=y
 CONFIG_SULOGIN=y
 CONFIG_VLOCK=y
 
@@ -639,6 +640,7 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_FEATURE_MDEV_DAEMON=y
 CONFIG_MESG=y
 CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
 CONFIG_MKE2FS=y
@@ -770,10 +772,10 @@ CONFIG_CRONTAB=y
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_DEVMEM=y
 CONFIG_FBSPLASH=y
-# CONFIG_FLASHCP is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASHCP is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -786,6 +788,7 @@ CONFIG_I2CGET=y
 CONFIG_I2CSET=y
 CONFIG_I2CDUMP=y
 CONFIG_I2CDETECT=y
+CONFIG_I2CTRANSFER=y
 # CONFIG_INOTIFYD is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
@@ -819,14 +822,15 @@ CONFIG_SETFATTR=y
 CONFIG_SETSERIAL=y
 CONFIG_STRINGS=y
 CONFIG_TIME=y
+CONFIG_TS=y
 CONFIG_TTYSIZE=y
-CONFIG_UBIRENAME=y
 CONFIG_UBIATTACH=y
 CONFIG_UBIDETACH=y
 CONFIG_UBIMKVOL=y
 CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
+CONFIG_UBIRENAME=y
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
@@ -946,6 +950,7 @@ CONFIG_FEATURE_TELNETD_STANDALONE=y
 CONFIG_FEATURE_TELNETD_INETD_WAIT=y
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
+CONFIG_FEATURE_TFTP_HPA_COMPAT=y
 CONFIG_TFTPD=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
@@ -1155,6 +1160,7 @@ CONFIG_HUSH_GETOPTS=y
 #
 CONFIG_FEATURE_SH_MATH=y
 CONFIG_FEATURE_SH_MATH_64=y
+CONFIG_FEATURE_SH_MATH_BASE=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
diff --git a/shell-term-fm/busybox/patches/busybox-stime.patch b/shell-term-fm/busybox/patches/busybox-stime.patch
new file mode 100644
index 0000000000..1cef320b28
--- /dev/null
+++ b/shell-term-fm/busybox/patches/busybox-stime.patch
@@ -0,0 +1,65 @@
+diff --git a/coreutils/date.c b/coreutils/date.c
+index 3414d38ae..4ade6abb4 100644
+--- a/coreutils/date.c
++++ b/coreutils/date.c
+@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		time(&ts.tv_sec);
+ #endif
+ 	}
++#if !ENABLE_FEATURE_DATE_NANO
++	ts.tv_nsec = 0;
++#endif
+ 	localtime_r(&ts.tv_sec, &tm_time);
+ 
+ 	/* If date string is given, update tm_time, and maybe set date */
+@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv)
+ 		if (date_str[0] != '@')
+ 			tm_time.tm_isdst = -1;
+ 		ts.tv_sec = validate_tm_time(date_str, &tm_time);
++		ts.tv_nsec = 0;
+ 
+ 		/* if setting time, set it */
+-		if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++		if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ 			bb_perror_msg("can't set date");
+ 		}
+ 	}
+diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c
+index 87cf59b3d..dc40d9155 100644
+--- a/libbb/missing_syscalls.c
++++ b/libbb/missing_syscalls.c
+@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid)
+ 	return syscall(__NR_getsid, pid);
+ }
+ 
+-int stime(const time_t *t)
+-{
+-	struct timeval tv;
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-	return settimeofday(&tv, NULL);
+-}
+-
+ int sethostname(const char *name, size_t len)
+ {
+ 	return syscall(__NR_sethostname, name, len);
+diff --git a/util-linux/rdate.c b/util-linux/rdate.c
+index 70f829e7f..878375d78 100644
+--- a/util-linux/rdate.c
++++ b/util-linux/rdate.c
+@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ 	if (!(flags & 2)) { /* no -p (-s may be present) */
+ 		if (time(NULL) == remote_time)
+ 			bb_error_msg("current time matches remote time");
+-		else
+-			if (stime(&remote_time) < 0)
++		else {
++			struct timespec ts;
++			ts.tv_sec = remote_time;
++			ts.tv_nsec = 0;
++			if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+ 				bb_perror_msg_and_die("can't set time of day");
++		}
+ 	}
+ 
+ 	if (flags != 1) /* not lone -s */