01/02: gnu: busybox: Update to 1.32.0.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 8f330aebee504269d4d7188daa85e95503f71888
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Fri Dec 11 12:04:15 2020 +0200

    gnu: busybox: Update to 1.32.0.
    
    * gnu/packages/busybox.scm (busybox): Update to 1.32.0.
    [source]: Remove patch.
    * gnu/packates/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch:
    Remove file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                       |  1 -
 gnu/packages/busybox.scm                           | 11 ++--
 .../busybox-1.31.1-fix-build-with-glibc-2.31.patch | 68 ----------------------
 3 files changed, 4 insertions(+), 76 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 67482b8..b32ebf4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -857,7 +857,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/blender-2.79-python-3.7-fix.patch       \
   %D%/packages/patches/blender-2.79-python-3.8-fix.patch       \
   %D%/packages/patches/bpftrace-disable-bfd-disasm.patch       \
-  %D%/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-remove-test-sqlite.patch                \
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
index 0a93c64..c931a2f 100644
--- a/gnu/packages/busybox.scm
+++ b/gnu/packages/busybox.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner 
<efraim@flashner.co.il>
 ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -32,7 +32,7 @@
 (define-public busybox
   (package
     (name "busybox")
-    (version "1.31.1")
+    (version "1.32.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -40,10 +40,7 @@
                     version ".tar.bz2"))
               (sha256
                (base32
-                "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh"))
-              (patches
-               (search-patches
-                "busybox-1.31.1-fix-build-with-glibc-2.31.patch"))))
+                "12g63zsvzfz04wbyga8riyl8ils05riw4xf26cyiaasbs3qqfpf3"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
@@ -90,7 +87,7 @@
              ;; true in guix build environment
              (substitute* "testsuite/pidof.tests"
                (("-s init") "-s $(cat /proc/1/comm)"))
-  
+
              ;; This test cannot possibly pass.
              ;; It is trying to test that "which ls" returns "/bin/ls" when 
PATH is not set.
              ;; However, this relies on /bin/ls existing.  Which it does not 
in guix.
diff --git 
a/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch 
b/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch
deleted file mode 100644
index 1518df0..0000000
--- a/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-See: https://bugs.gentoo.org/708350
-Author: Patrick McLean <patrick.mclean@sony.com>
-Date: 2020-02-06 23:06:22 +0000
-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 */