diff --git a/busybox-1.31.1.tar.bz2 b/busybox-1.31.1.tar.bz2 deleted file mode 100644 index 278d331..0000000 --- a/busybox-1.31.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998 -size 2430221 diff --git a/busybox-1.32.0.tar.bz2 b/busybox-1.32.0.tar.bz2 new file mode 100644 index 0000000..cfc6c5e --- /dev/null +++ b/busybox-1.32.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 +size 2439463 diff --git a/busybox-no-stime.patch b/busybox-no-stime.patch deleted file mode 100644 index b55f70d..0000000 --- a/busybox-no-stime.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Tue, 19 Nov 2019 13:06:40 +0100 -Subject: Remove stime() function calls - -stime() has been deprecated in glibc 2.31 and replaced with -clock_settime(). Let's replace the stime() function calls with -clock_settime() in preperation. - -function old new delta -rdate_main 197 224 +27 -clock_settime - 27 +27 -date_main 926 941 +15 -stime 37 - -37 ------------------------------------------------------------------------------- -(add/remove: 2/2 grow/shrink: 2/0 up/down: 69/-37) Total: 32 bytes - -Signed-off-by: Alistair Francis -Signed-off-by: Denys Vlasenko ---- - coreutils/date.c | 6 +++++- - libbb/missing_syscalls.c | 8 -------- - util-linux/rdate.c | 8 ++++++-- - 3 files changed, 11 insertions(+), 11 deletions(-) - -Index: busybox-1.31.1/coreutils/date.c -=================================================================== ---- busybox-1.31.1.orig/coreutils/date.c -+++ busybox-1.31.1/coreutils/date.c -@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, cha - 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, cha - 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"); - } - } -Index: busybox-1.31.1/libbb/missing_syscalls.c -=================================================================== ---- busybox-1.31.1.orig/libbb/missing_syscalls.c -+++ busybox-1.31.1/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); -Index: busybox-1.31.1/util-linux/rdate.c -=================================================================== ---- busybox-1.31.1.orig/util-linux/rdate.c -+++ busybox-1.31.1/util-linux/rdate.c -@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, ch - 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 */ diff --git a/busybox-static.config b/busybox-static.config index 5d7208d..4b2e89e 100644 --- a/busybox-static.config +++ b/busybox-static.config @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 +# Busybox version: 1.32.0 +# Wed Jul 22 15:14:27 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -41,7 +42,7 @@ CONFIG_PLATFORM_LINUX=y # Build Options # CONFIG_STATIC=y -CONFIG_PIE=y +# CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set # CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set @@ -75,6 +76,7 @@ CONFIG_PREFIX="/usr" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -333,10 +335,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 # @@ -402,7 +404,7 @@ CONFIG_WHICH=y # CONFIG_MINIPS is not set # CONFIG_NUKE is not set # CONFIG_RESUME is not set -CONFIG_RUN_INIT=y +# CONFIG_RUN_INIT is not set # # Editors @@ -461,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -510,10 +513,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y CONFIG_FEATURE_ADDUSER_TO_GROUP=y +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=65535 @@ -691,6 +694,7 @@ CONFIG_SETSID=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -771,10 +775,10 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set +# 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 is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -808,6 +812,7 @@ CONFIG_LSSCSI=y # CONFIG_FEATURE_MAKEDEVS_TABLE is not set CONFIG_MAN=y # CONFIG_MICROCOM is not set +# CONFIG_MIM is not set # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -823,13 +828,13 @@ CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TS is not set CONFIG_TTYSIZE=y +# CONFIG_UBIRENAME 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 -# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set @@ -846,14 +851,14 @@ CONFIG_ARPING=y CONFIG_BRCTL=y CONFIG_FEATURE_BRCTL_FANCY=y CONFIG_FEATURE_BRCTL_SHOW=y -CONFIG_DNSD=y +# CONFIG_DNSD is not set CONFIG_ETHER_WAKE=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTPD_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set # CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -CONFIG_FTPGET=y -CONFIG_FTPPUT=y +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y @@ -907,9 +912,9 @@ CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y CONFIG_FEATURE_IP_NEIGH=y # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FAKEIDENTD is not set CONFIG_NAMEIF=y CONFIG_FEATURE_NAMEIF_EXTENDED=y @@ -1094,6 +1099,7 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1112,8 +1118,9 @@ CONFIG_ASH_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y -CONFIG_CTTYHACK=y +# CONFIG_CTTYHACK is not set CONFIG_HUSH=y +CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y CONFIG_HUSH_LINENO_VAR=y @@ -1176,6 +1183,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_SYSLOGD_CFG=y +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/busybox.changes b/busybox.changes index acd20ac..31ee276 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Jul 22 15:10:41 UTC 2020 - Thorsten Kukuk + +- Update to busybox 1.32.0 + - many bugfixes and new features + - Obsoletes busybox-no-stime.patch + +------------------------------------------------------------------- +Wed Jul 22 09:24:42 UTC 2020 - Thorsten Kukuk + +- Disable ftpget/ftpput, non-standard, ftp is outdated +- Disable run-init, we don't use that +- Disable cttyhack, we don't provide the calling tools +- Disable dnsd + ------------------------------------------------------------------- Sat Jul 11 06:05:40 UTC 2020 - Thorsten Kukuk diff --git a/busybox.config b/busybox.config index 0ed24e7..835a57d 100644 --- a/busybox.config +++ b/busybox.config @@ -1,6 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.31.1 +# Busybox version: 1.32.0 +# Wed Jul 22 15:14:27 2020 # CONFIG_HAVE_DOT_CONFIG=y @@ -75,6 +76,7 @@ CONFIG_PREFIX="/usr" # CONFIG_DEBUG_SANITIZE is not set # CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set +# CONFIG_WARN_SIMPLE_MSG is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set @@ -333,10 +335,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 # @@ -402,7 +404,7 @@ CONFIG_WHICH=y # CONFIG_MINIPS is not set # CONFIG_NUKE is not set # CONFIG_RESUME is not set -CONFIG_RUN_INIT=y +# CONFIG_RUN_INIT is not set # # Editors @@ -461,6 +463,7 @@ CONFIG_FEATURE_FIND_SIZE=y CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_QUIT=y CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_EMPTY=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set @@ -510,10 +513,10 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_SHADOW is not set # CONFIG_USE_BB_CRYPT is not set # CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set CONFIG_ADDGROUP=y CONFIG_FEATURE_ADDUSER_TO_GROUP=y +# CONFIG_ADD_SHELL is not set +# CONFIG_REMOVE_SHELL is not set CONFIG_ADDUSER=y # CONFIG_FEATURE_CHECK_NAMES is not set CONFIG_LAST_ID=65535 @@ -691,6 +694,7 @@ CONFIG_SETSID=y # CONFIG_SWITCH_ROOT is not set # CONFIG_TASKSET is not set # CONFIG_FEATURE_TASKSET_FANCY is not set +# CONFIG_FEATURE_TASKSET_CPULIST is not set CONFIG_UEVENT=y CONFIG_UMOUNT=y CONFIG_FEATURE_UMOUNT_ALL=y @@ -771,10 +775,10 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FEATURE_DEVFS is not set # CONFIG_DEVMEM is not set # CONFIG_FBSPLASH is not set +# 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 is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -808,6 +812,7 @@ CONFIG_LSSCSI=y # CONFIG_FEATURE_MAKEDEVS_TABLE is not set CONFIG_MAN=y # CONFIG_MICROCOM is not set +# CONFIG_MIM is not set # CONFIG_MT is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set @@ -823,13 +828,13 @@ CONFIG_STRINGS=y CONFIG_TIME=y # CONFIG_TS is not set CONFIG_TTYSIZE=y +# CONFIG_UBIRENAME 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 -# CONFIG_UBIRENAME is not set # CONFIG_VOLNAME is not set # CONFIG_WATCHDOG is not set @@ -846,14 +851,14 @@ CONFIG_ARPING=y CONFIG_BRCTL=y CONFIG_FEATURE_BRCTL_FANCY=y CONFIG_FEATURE_BRCTL_SHOW=y -CONFIG_DNSD=y +# CONFIG_DNSD is not set CONFIG_ETHER_WAKE=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTPD_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set # CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -CONFIG_FTPGET=y -CONFIG_FTPPUT=y +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y CONFIG_DNSDOMAINNAME=y @@ -907,9 +912,9 @@ CONFIG_FEATURE_IP_TUNNEL=y CONFIG_FEATURE_IP_RULE=y CONFIG_FEATURE_IP_NEIGH=y # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FAKEIDENTD is not set CONFIG_NAMEIF=y CONFIG_FEATURE_NAMEIF_EXTENDED=y @@ -1094,6 +1099,7 @@ CONFIG_SH_IS_ASH=y # CONFIG_BASH_IS_ASH is not set # CONFIG_BASH_IS_HUSH is not set CONFIG_BASH_IS_NONE=y +CONFIG_SHELL_ASH=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_INTERNAL_GLOB=y @@ -1112,8 +1118,9 @@ CONFIG_ASH_TEST=y CONFIG_ASH_HELP=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y -CONFIG_CTTYHACK=y +# CONFIG_CTTYHACK is not set CONFIG_HUSH=y +CONFIG_SHELL_HUSH=y CONFIG_HUSH_BASH_COMPAT=y CONFIG_HUSH_BRACE_EXPANSION=y CONFIG_HUSH_LINENO_VAR=y @@ -1176,6 +1183,7 @@ CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_SYSLOGD_DUP=y CONFIG_FEATURE_SYSLOGD_CFG=y +# CONFIG_FEATURE_SYSLOGD_PRECISE_TIMESTAMPS is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 diff --git a/busybox.spec b/busybox.spec index 9142dab..98dbff4 100644 --- a/busybox.spec +++ b/busybox.spec @@ -17,7 +17,7 @@ Name: busybox -Version: 1.31.1 +Version: 1.32.0 Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later @@ -28,8 +28,6 @@ Source1: BusyBox.1 Source2: busybox.config Source3: busybox-static.config Source4: man.conf -# Upstream patches -Patch0: busybox-no-stime.patch # other patches Patch100: busybox.install.patch Provides: useradd_or_adduser_dep @@ -71,7 +69,6 @@ PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %prep %setup -q -%patch0 -p1 %patch100 -p0 cp -a %{SOURCE1} docs/ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \