--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: busybox FTBFS with glibc 2.31 (references to obsolete 'stime')
- From: Steve Langasek <steve.langasek@canonical.com>
- Date: Mon, 30 Mar 2020 09:17:29 -0700
- Message-id: <158558504996.4703.11045564714176889674.reportbug@homer.dodds.net>
Package: busybox
Version: 1:1.30.1-4
Severity: important
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu focal ubuntu-patch
Dear maintainers,
In Ubuntu, the busybox package has begun to FTBFS because Ubuntu has moved
to glibc 2.31, which has obsoleted the stime() function and busybox still
calls this function.
The attached patch has been uploaded to Ubuntu, replacing the calls to
stime() with clock_settime(), per the glibc upstream documentation.
This is not a serious bug today in Debian because glibc 2.31 is only in
experimental, but at some point it will become a serious FTBFS.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer https://www.debian.org/
slangasek@ubuntu.com vorlon@debian.org
diff -Nru busybox-1.30.1/debian/patches/series busybox-1.30.1/debian/patches/series
--- busybox-1.30.1/debian/patches/series 2019-05-23 06:37:05.000000000 -0700
+++ busybox-1.30.1/debian/patches/series 2020-03-30 07:43:36.000000000 -0700
@@ -14,3 +14,4 @@
temp-deb-installer-hack.patch
install-readlink-in-bin.patch
ignore-ip-valid_lft.patch
+stime-is-clock_settime.patch
diff -Nru busybox-1.30.1/debian/patches/stime-is-clock_settime.patch busybox-1.30.1/debian/patches/stime-is-clock_settime.patch
--- busybox-1.30.1/debian/patches/stime-is-clock_settime.patch 1969-12-31 16:00:00.000000000 -0800
+++ busybox-1.30.1/debian/patches/stime-is-clock_settime.patch 2020-03-30 08:37:00.000000000 -0700
@@ -0,0 +1,46 @@
+Description: stime is obsolete, use clock_settime instead
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Last-Update: 2020-03-30
+
+Index: busybox-1.30.1/util-linux/rdate.c
+===================================================================
+--- busybox-1.30.1.orig/util-linux/rdate.c
++++ busybox-1.30.1/util-linux/rdate.c
+@@ -79,11 +79,13 @@
+ int rdate_main(int argc UNUSED_PARAM, char **argv)
+ {
+ time_t remote_time;
++ struct timespec remote_timespec = { 0, 0 };
+ unsigned flags;
+
+ flags = getopt32(argv, "^" "sp" "\0" "-1");
+
+ remote_time = askremotedate(argv[optind]);
++ remote_timespec.tv_sec = remote_time;
+
+ /* Manpages of various Unixes are confusing. What happens is:
+ * (no opts) set and print time
+@@ -96,7 +98,7 @@
+ if (time(NULL) == remote_time)
+ bb_error_msg("current time matches remote time");
+ else
+- if (stime(&remote_time) < 0)
++ if (clock_settime(CLOCK_REALTIME, &remote_timespec) < 0)
+ bb_perror_msg_and_die("can't set time of day");
+ }
+
+Index: busybox-1.30.1/coreutils/date.c
+===================================================================
+--- busybox-1.30.1.orig/coreutils/date.c
++++ busybox-1.30.1/coreutils/date.c
+@@ -303,7 +303,9 @@
+ ts.tv_sec = validate_tm_time(date_str, &tm_time);
+
+ /* if setting time, set it */
+- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
++ if ((opt & OPT_SET)
++ && clock_settime(CLOCK_REALTIME, &ts.tv_sec) < 0)
++ {
+ bb_perror_msg("can't set date");
+ }
+ }
--- End Message ---
--- Begin Message ---
Source: busybox
Source-Version: 1:1.30.1-5
Done: Aurelien Jarno <aurel32@debian.org>
We believe that the bug you reported is fixed in the latest version of
busybox, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 955368@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Aurelien Jarno <aurel32@debian.org> (supplier of updated busybox package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Mon, 13 Jul 2020 22:15:51 +0200
Source: busybox
Architecture: source
Version: 1:1.30.1-5
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Aurelien Jarno <aurel32@debian.org>
Closes: 955368
Changes:
busybox (1:1.30.1-5) unstable; urgency=medium
.
[ Aurelien Jarno ]
* Team upload.
* cherry-pick glibc 2.31 compatibility fix from upstream. Closes: #955368.
Checksums-Sha1:
78cbb8c48334cae9cfc2f0b58b7e1ce1ba20a0a0 2241 busybox_1.30.1-5.dsc
ad588da98d543b388f026a121fcb59f15c146919 50484 busybox_1.30.1-5.debian.tar.xz
066664d06196e5e50329aec11cc8c3e39f4989d1 5190 busybox_1.30.1-5_source.buildinfo
Checksums-Sha256:
ff763083dbc0238634b59b035466511e33d184f2af68303b25ce55e6c0a17070 2241 busybox_1.30.1-5.dsc
7ed2fdb1d9afed4cd921e314deca2347f4db3d3335f36a5248631371198f7fc7 50484 busybox_1.30.1-5.debian.tar.xz
c17b3fc7d4727c74ec5efacea557c6520de2b91159876701765af69ebfde3332 5190 busybox_1.30.1-5_source.buildinfo
Files:
0375fb003b5a2840d25119ee8e92f3f4 2241 utils optional busybox_1.30.1-5.dsc
ee7aef311f800f2ac015e02de2d8bbbe 50484 utils optional busybox_1.30.1-5.debian.tar.xz
6bacb9dca6b8051ebfa7bf1af23c94f6 5190 utils optional busybox_1.30.1-5_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEUryGlb40+QrX1Ay4E4jA+JnoM2sFAl8Mzt4ACgkQE4jA+Jno
M2sgJA/+JOOQn5eejHDn8uJEGJi1f6q3z1o7rDtMIyFHT9cz5t5uLMBIWtUaIAjZ
XjXFzQoUZgXUg9lOn7ecAPSNLOeb0I6URNxddUgnpKKardmyX6kvH79VXB5q28tt
gzcZLwM7YeEEsoGRR6xNWPiZQAdJq3Z5+LPLEFjn1wxcdH6rgZXcxLUJhEIgWsb0
3/y3fQjrD84OeoX15h3CPDSuSEzT0JjImO4rXyC0VCMqPH91Fx48yXQzZhEYzkn+
n8c5Qb6PEEpIh//Mgbk8u/hm7AFnU05LeAIzUOq2ebo+jDS8PcKFlc/WaqzkhiLD
EhPgSlx1aDVBy6XTK+bSbaspSZ3VBEzEgyY4KSV8QWLYnajEC+P974Ac1DpraCBT
HRC3Nv0IhLNEgtNKmdct6wqE1TNnveZ/7Ey3J1IfI8TubIb4B654qLWdBdcnsln+
SR+d8S1L1aABAbfw+PL94voOfILMh7nNRAM5hON4G1mO7mthyetQqVcKPCyyMgVL
4LmNnlhrD5c3zVrsybte9sZWR71HLT9lSSNwBQVZ8kpKtv46TTLhkQ/l8kVRm8iH
90NZLm+6MUCrmCFhVfYlIwuosDQBVnjg7RKQVB89UTntIf8e360tQlDOQoGHwbho
e5GraZ8wVG5+MbVzUGJ8rj06cefEtfy/dXYt75KTlHLR+ZrdBYU=
=xgzp
-----END PGP SIGNATURE-----
--- End Message ---