Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2020-02-15 22:21:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox" Sat Feb 15 22:21:44 2020 rev:54 rq:772655 version:1.31.1 Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2019-10-25 18:42:15.867905077 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new.26092/busybox.changes 2020-02-15 22:21:49.959193339 +0100 @@ -1,0 +2,16 @@ +Mon Feb 10 11:46:10 UTC 2020 - Thorsten Kukuk <ku...@suse.com> + +- Eanble FEATURE_TFTP_HPA_COMPAT and SH_MATH_BASE + +------------------------------------------------------------------- +Sat Feb 8 14:38:51 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org> + +- Update to version 1.31.1: + + Bug fix release. 1.30.1 has fixes for dc, ash (PS1 expansion + fix), hush, dpkg-deb, telnet and wget. +- Changes from version 1.31.0: + + many bugfixes and new features. +- Add busybox-no-stime.patch: stime() has been deprecated in glibc + 2.31 and replaced with clock_settime(). + +------------------------------------------------------------------- Old: ---- busybox-1.30.1.tar.bz2 New: ---- busybox-1.31.1.tar.bz2 busybox-no-stime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.iPgX4J/_old 2020-02-15 22:21:51.591194221 +0100 +++ /var/tmp/diff_new_pack.iPgX4J/_new 2020-02-15 22:21:51.591194221 +0100 @@ -1,7 +1,7 @@ # # spec file for package busybox # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,22 @@ Name: busybox -Version: 1.30.1 +Version: 1.31.1 Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later Group: System/Base -Url: http://www.busybox.net/ +URL: http://www.busybox.net/ Source: http://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox.config Source3: busybox-static.config Source4: busybox-container.config Source5: man.conf +# Upstream patches +Patch0: busybox-no-stime.patch # other patches -Patch: busybox.install.patch +Patch100: busybox.install.patch Provides: useradd_or_adduser_dep BuildRequires: glibc-devel-static BuildRequires: libtirpc-devel @@ -64,7 +66,8 @@ %prep %setup -q -%patch -p0 +%patch0 -p1 +%patch100 -p0 cp -a %{SOURCE1} docs/ find "(" -name CVS -o -name .cvsignore -o -name .svn -o -name .gitignore ")" \ -exec rm -Rf {} + ++++++ busybox-1.30.1.tar.bz2 -> busybox-1.31.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/busybox/busybox-1.30.1.tar.bz2 /work/SRC/openSUSE:Factory/.busybox.new.26092/busybox-1.31.1.tar.bz2 differ: char 11, line 1 ++++++ busybox-container.config ++++++ --- /var/tmp/diff_new_pack.iPgX4J/_old 2020-02-15 22:21:51.643194249 +0100 +++ /var/tmp/diff_new_pack.iPgX4J/_new 2020-02-15 22:21:51.643194249 +0100 @@ -1175,3 +1175,10 @@ # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 # CONFIG_FEATURE_KMSG_SYSLOG is not set + +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_TS is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y +CONFIG_FEATURE_SH_MATH_BASE=y ++++++ busybox-no-stime.patch ++++++ >From d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001 From: Alistair Francis <alistair.fran...@wdc.com> 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 <alistair.fran...@wdc.com> Signed-off-by: Denys Vlasenko <vda.li...@googlemail.com> --- 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 */ ++++++ busybox-static.config ++++++ --- /var/tmp/diff_new_pack.iPgX4J/_old 2020-02-15 22:21:51.655194256 +0100 +++ /var/tmp/diff_new_pack.iPgX4J/_new 2020-02-15 22:21:51.655194256 +0100 @@ -1182,3 +1182,11 @@ # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 CONFIG_FEATURE_KMSG_SYSLOG=y + +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_TS is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y +CONFIG_FEATURE_SH_MATH_BASE=y + ++++++ busybox.config ++++++ --- /var/tmp/diff_new_pack.iPgX4J/_old 2020-02-15 22:21:51.671194265 +0100 +++ /var/tmp/diff_new_pack.iPgX4J/_new 2020-02-15 22:21:51.671194265 +0100 @@ -1182,3 +1182,11 @@ # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 CONFIG_FEATURE_KMSG_SYSLOG=y + +# CONFIG_FEATURE_SYSLOG_INFO is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set +# CONFIG_I2CTRANSFER is not set +# CONFIG_TS is not set +CONFIG_FEATURE_TFTP_HPA_COMPAT=y +CONFIG_FEATURE_SH_MATH_BASE=y +
