--- Begin Message ---
Package: busybox
Version: 1:1.27.2-2
Severity: minor
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch
Dear maintainers,
After updating Ubuntu to include isc-dhcp-client 4.4.1-2 from Debian
unstable, we found that initramfs-tools' autopkgtests were failing for us,
because we use isc-dhcp-client in the initramfs for more complete and
correct early networking support, and isc-dhcp-client's dhclient-script had
started passing arguments to busybox's ip that it didn't understand.
The attached patch changes busybox's 'ip addr add' implementation to accept
valid_lft and preferred_lft as recognized no-op options, which I think is
preferable to the current behavior of erroring out on options that are
allowed by the iproute2 implementation of the command.
Please consider applying this patch in Debian.
Cheers,
--
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.27.2/debian/patches/handle-ip-valid_lft.patch busybox-1.27.2/debian/patches/handle-ip-valid_lft.patch
--- busybox-1.27.2/debian/patches/handle-ip-valid_lft.patch 1969-12-31 16:00:00.000000000 -0800
+++ busybox-1.27.2/debian/patches/handle-ip-valid_lft.patch 2019-03-12 15:52:31.000000000 -0700
@@ -0,0 +1,31 @@
+Description: Don't choke on ip addr add [...] valid_lft [...] preferred_lft
+ isc-dhcp-dclient 4.4.1 has started passing valid_lft, preferred_lft to
+ ip addr add but busybox ip doesn't support these options. Handle these
+ gracefully, making them no-ops for now.
+Author: Steve Langasek <steve.langasek@ubuntu.com>
+Last-Modified: 2019-03-12
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1819747
+Forwarded: no
+
+Index: busybox-1.27.2/networking/libiproute/ipaddress.c
+===================================================================
+--- busybox-1.27.2.orig/networking/libiproute/ipaddress.c
++++ busybox-1.27.2/networking/libiproute/ipaddress.c
+@@ -596,7 +596,8 @@
+ /* If you add stuff here, update ipaddr_full_usage */
+ static const char option[] ALIGN1 =
+ "peer\0""remote\0""broadcast\0""brd\0"
+- "anycast\0""scope\0""dev\0""label\0""local\0";
++ "anycast\0""scope\0""dev\0""label\0"
++ "valid_lft\0""preferred_lft\0""local\0";
+ #define option_peer option
+ #define option_broadcast (option + sizeof("peer") + sizeof("remote"))
+ #define option_anycast (option_broadcast + sizeof("broadcast") + sizeof("brd"))
+@@ -679,6 +680,7 @@
+ } else if (arg == 7) { /* label */
+ l = *argv;
+ addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l) + 1);
++ } else if (arg <= 9) { /* valid_lft, preferred_lft */
+ } else {
+ /* local (specified or assumed) */
+ if (local_len) {
diff -Nru busybox-1.27.2/debian/patches/series busybox-1.27.2/debian/patches/series
--- busybox-1.27.2/debian/patches/series 2019-03-06 12:10:50.000000000 -0800
+++ busybox-1.27.2/debian/patches/series 2019-03-12 15:08:43.000000000 -0700
@@ -27,3 +27,4 @@
CVE-2018-1000517.patch
CVE-2018-20679.patch
CVE-2019-5747.patch
+handle-ip-valid_lft.patch
--- End Message ---
--- Begin Message ---
Source: busybox
Source-Version: 1:1.30.1-3
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 924442@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Christoph Biedl <debian.axhn@manchmal.in-ulm.de> (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: Sun, 24 Mar 2019 16:52:05 +0100
Source: busybox
Architecture: source
Version: 1:1.30.1-3
Distribution: unstable
Urgency: high
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Closes: 924374 924442
Changes:
busybox (1:1.30.1-3) unstable; urgency=high
.
* Ignore any valid_lft or preferred_lft parameters to ip, thanks
Steve Langasek. Closes: #924442
* Fix ip oneline, thanks Dominik George. Closes: #924374
Checksums-Sha1:
8fddd9bbb5c213ac98d7931b5d07c6aaf71f34ec 2241 busybox_1.30.1-3.dsc
bb29c1ff5c11548f8d96b7b8de500ddd401534a9 48668 busybox_1.30.1-3.debian.tar.xz
3edd1b28c775e575b22804d122c44976b028f111 7032 busybox_1.30.1-3_powerpc.buildinfo
Checksums-Sha256:
9bf9c6d7e0cb3d454813680fc7c436d9bcca9407a1ef2a427e44e5d160b68eca 2241 busybox_1.30.1-3.dsc
51f453fdfbcb129df9d8684873b62b1c7af6de14694297f4ad187d55401cb7fc 48668 busybox_1.30.1-3.debian.tar.xz
d12b59a462820ab79016d8203b5138443ea703ad141ba4db849be30b542df9df 7032 busybox_1.30.1-3_powerpc.buildinfo
Files:
ff4d79d87b5522b3d26a5abfe20f2cf1 2241 utils optional busybox_1.30.1-3.dsc
10e53b6dbcdc714f8501dad8de9b1206 48668 utils optional busybox_1.30.1-3.debian.tar.xz
6cb78bfb59ee60d1001fa3b8b859eb80 7032 utils optional busybox_1.30.1-3_powerpc.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEWXMI+726A12MfJXdxCxY61kUkv0FAlyXtq0ACgkQxCxY61kU
kv3/SBAAsKBOY+MuDDGAgc0WJgMCVS79m+u/huf36Pe6Wxf87k2MkYKCZ3H6qGvF
IWZBjs9SC8mDo05Fejx+WLvI4uKMAC+9Mu4AJklrWUl2U4vcrl5tql7UyaRQe3Ae
gxXoMVGs6nZ5mEcERGVj7X91/wT7PjcCtGcdrT+GAzuj9q3dN5qrV1Vs0wUw+dQe
iJVKWDAHjYpwq8rXh9cRt8UVitfq476B+UnoA6eMsGIDZi805lhPg6TRhM2FDa1C
YUk4Pd1pAo3SI4Qr95WvFpY+CkKaQNuqMGkT4soyg82/h53WP7THtU8SHhtwkg8r
kbO2LM9RPMhMlwiN4R+IpjRCHwhwscw5kdZL8t0N+cuTWULBzwecURXl6sITF3xm
I5X8Y9rTwmFym935d5POXj+9b8HOPMRMCVxLrz11KlBg8UEzUbm5kjOOYOMNLmcA
Ofe7fyu3JTBFl7I71+0p4HtoiZZ8EDKzRjBCTqsoqSd+WoccB+Kg0cPktEs1OMZ3
XdsLi/QIs++iQPD8Olg6cZO6oxIvvoGorVvvYybV19pR6zQrsAPGQcx2d0xsxS/i
XSlCCObNN+xBOvusUxtC4eO6wjPN8LSwYMbKlw8eyUSetgrH0cRlM8usapQ0WH0V
7vRUQtB2ibSPlLZJQp+WYh5oCIst7Npu4z+E3rPhvCGE6Ei4voI=
=qx7h
-----END PGP SIGNATURE-----
--- End Message ---