* [Buildroot] [git commit] package/busybox: bump version to 1.33.0
@ 2021-01-09 22:28 Yann E. MORIN
0 siblings, 0 replies; only message in thread
From: Yann E. MORIN @ 2021-01-09 22:28 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=160838abf8b0dc3291c75bdbbe2dbd5ae3af8685
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Rebased patch 0002.
Removed patch 0003 which was applied upstream:
https://git.busybox.net/busybox/commit/?h=1_33_stable&id=1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b
Switched _SITE to https.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
...-hwclock-Fix-settimeofday-for-glibc-v2.31.patch | 58 ----------------------
package/busybox/busybox.hash | 4 +-
package/busybox/busybox.mk | 4 +-
3 files changed, 4 insertions(+), 62 deletions(-)
diff --git a/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch b/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch
deleted file mode 100644
index cab346acf3..0000000000
--- a/package/busybox/0003-hwclock-Fix-settimeofday-for-glibc-v2.31.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b Mon Sep 17 00:00:00 2001
-From: Eddie James <eajames@linux.ibm.com>
-Date: Mon, 10 Aug 2020 09:59:02 -0500
-Subject: [PATCH] hwclock: Fix settimeofday for glibc v2.31+
-
-The glibc implementation changed for settimeofday, resulting in "invalid
-argument" error when attempting to set both timezone and time with a single
-call. Fix this by calling settimeofday twice
-
-Signed-off-by: Eddie James <eajames@linux.ibm.com>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- util-linux/hwclock.c | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
-index dc97d8fb4..2479e7416 100644
---- a/util-linux/hwclock.c
-+++ b/util-linux/hwclock.c
-@@ -122,16 +122,20 @@ static void to_sys_clock(const char **pp_rtcname, int utc)
- struct timeval tv;
- struct timezone tz;
-
-- tz.tz_minuteswest = timezone/60;
-+ tz.tz_minuteswest = timezone / 60;
- /* ^^^ used to also subtract 60*daylight, but it's wrong:
- * daylight!=0 means "this timezone has some DST
- * during the year", not "DST is in effect now".
- */
- tz.tz_dsttime = 0;
-
-+ /* glibc v2.31+ returns an error if both args are non-NULL */
-+ if (settimeofday(NULL, &tz))
-+ bb_simple_perror_msg_and_die("settimeofday");
-+
- tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
- tv.tv_usec = 0;
-- if (settimeofday(&tv, &tz))
-+ if (settimeofday(&tv, NULL))
- bb_simple_perror_msg_and_die("settimeofday");
- }
-
-@@ -283,7 +287,11 @@ static void set_system_clock_timezone(int utc)
- gettimeofday(&tv, NULL);
- if (!utc)
- tv.tv_sec += tz.tz_minuteswest * 60;
-- if (settimeofday(&tv, &tz))
-+
-+ /* glibc v2.31+ returns an error if both args are non-NULL */
-+ if (settimeofday(NULL, &tz))
-+ bb_simple_perror_msg_and_die("settimeofday");
-+ if (settimeofday(&tv, NULL))
- bb_simple_perror_msg_and_die("settimeofday");
- }
-
---
-2.17.1
-
diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash
index 2229379600..dffab21400 100644
--- a/package/busybox/busybox.hash
+++ b/package/busybox/busybox.hash
@@ -1,5 +1,5 @@
-# From https://busybox.net/downloads/busybox-1.32.0.tar.bz2.sha256
-sha256 c35d87f1d04b2b153d33c275c2632e40d388a88f19a9e71727e0bbbff51fe689 busybox-1.32.0.tar.bz2
+# From https://busybox.net/downloads/busybox-1.33.0.tar.bz2.sha256
+sha256 d568681c91a85edc6710770cebc1e80e042ad74d305b5c2e6d57a5f3de3b8fbd busybox-1.33.0.tar.bz2
# Locally computed
sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE
sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 38c40eeb15..67d2713669 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -4,8 +4,8 @@
#
################################################################################
-BUSYBOX_VERSION = 1.32.0
-BUSYBOX_SITE = http://www.busybox.net/downloads
+BUSYBOX_VERSION = 1.33.0
+BUSYBOX_SITE = https://www.busybox.net/downloads
BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4
BUSYBOX_LICENSE_FILES = LICENSE archival/libarchive/bz/LICENSE
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-09 22:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-09 22:28 [Buildroot] [git commit] package/busybox: bump version to 1.33.0 Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.