From owner-svn-src-all@freebsd.org Thu Nov 26 14:49:35 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D9C44ADECB; Thu, 26 Nov 2020 14:49:35 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mx.blih.net (mx.blih.net [212.83.155.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx.blih.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ChgdW0sJmz4ZZQ; Thu, 26 Nov 2020 14:49:34 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1606402172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2oAAJJSjbIekCYnWiBKwz6MEAolOKEDcei5RB9GQmlg=; b=SeKyANVbL4YJQYiLx97NvcV9f+xOhR9DW2MBQCZn9UZMcM8diwXM+6V8IBQj3FGh9VqztQ nrKH6B00md9igOcaluswMJKntxjYx9yw5zsh+E1WGrYDd4Dser5zO/vFp9z0Du4xDZ1hFJ eijp/BXFXaHsDO4f2ZrkaqfsVYF2kCg= Received: from skull.home.blih.net (lfbn-idf2-1-288-247.w82-123.abo.wanadoo.fr [82.123.126.247]) by mx.blih.net (OpenSMTPD) with ESMTPSA id 875e448e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 26 Nov 2020 14:49:32 +0000 (UTC) Date: Thu, 26 Nov 2020 15:49:31 +0100 From: Emmanuel Vadot To: Alan Somers Cc: src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk Message-Id: <20201126154931.093e7b5097480d18a01caaf7@bidouilliste.com> In-Reply-To: References: <202011260429.0AQ4TV2B023801@repo.freebsd.org> <20201126092704.f689ac823d6571ca0c98212a@bidouilliste.com> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4ChgdW0sJmz4ZZQ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 14:49:35 -0000 On Thu, 26 Nov 2020 07:36:37 -0700 Alan Somers wrote: > On Thu, Nov 26, 2020 at 1:27 AM Emmanuel Vadot > wrote: >=20 > > > > Hi Alan, > > > > On Thu, 26 Nov 2020 04:29:31 +0000 (UTC) > > Alan Somers wrote: > > > > > Author: asomers > > > Date: Thu Nov 26 04:29:30 2020 > > > New Revision: 368045 > > > URL: https://svnweb.freebsd.org/changeset/base/368045 > > > > > > Log: > > > Merge ping6 to ping > > > > > > There is now a single ping binary, which chooses to use ICMP or ICM= Pv4 > > > based on the -4 and -6 options, and the format of the address. > > > > > > Submitted by: J=E1n Su?an > > > Sponsored by: Google LLC (Google Summer of Code 2019) > > > MFC after: Never > > > Differential Revision: https://reviews.freebsd.org/D21377 > > > > > > Added: > > > head/sbin/ping/main.c (contents, props changed) > > > head/sbin/ping/main.h (contents, props changed) > > > head/sbin/ping/ping.h (contents, props changed) > > > head/sbin/ping/ping6.c > > > - copied, changed from r368010, head/sbin/ping6/ping6.c > > > head/sbin/ping/ping6.h (contents, props changed) > > > head/sbin/ping/tests/ping_6_c1_s8_t1.out > > > - copied unchanged from r368010, > > head/sbin/ping6/tests/ping6_c1_s8_t1.out > > > Deleted: > > > head/sbin/ping6/Makefile > > > head/sbin/ping6/Makefile.depend > > > head/sbin/ping6/ping6.8 > > > head/sbin/ping6/ping6.c > > > head/sbin/ping6/tests/Makefile > > > head/sbin/ping6/tests/ping6_c1_s8_t1.out > > > head/sbin/ping6/tests/ping6_test.sh > > > Modified: > > > head/ObsoleteFiles.inc > > > head/UPDATING > > > head/etc/mtree/BSD.tests.dist > > > head/rescue/rescue/Makefile > > > head/sbin/Makefile > > > head/sbin/ping/Makefile > > > head/sbin/ping/ping.8 > > > head/sbin/ping/ping.c > > > head/sbin/ping/tests/Makefile > > > head/sbin/ping/tests/ping_test.sh > > > head/tools/build/mk/OptionalObsoleteFiles.inc > > > > > > Modified: head/ObsoleteFiles.inc > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/ObsoleteFiles.inc Thu Nov 26 02:14:52 2020 (r36804= 4) > > > +++ head/ObsoleteFiles.inc Thu Nov 26 04:29:30 2020 (r36804= 5) > > > @@ -36,6 +36,16 @@ > > > # xargs -n1 | sort | uniq -d; > > > # done > > > > > > +# 20201124: ping6(8) was merged into ping(8) > > > +OLD_FILES+=3Dsbin/ping6 > > > +OLD_FILES+=3Drescue/ping6 > > > +OLD_FILES+=3Dusr/lib/debug/sbin/ping6.debug > > > +OLD_FILES+=3Dusr/share/man/man8/ping6.8.gz > > > +OLD_FILES+=3Dusr/tests/sbin/ping6/Kyuafile > > > +OLD_FILES+=3Dusr/tests/sbin/ping6/ping6_c1_s8_t1.out > > > +OLD_FILES+=3Dusr/tests/sbin/ping6/ping6_test > > > +OLD_DIRS+=3Dusr/tests/sbin/ping6 > > > + > > > # 20201025: Remove cal data files > > > OLD_FILES+=3Dusr/share/calendar/calendar.all > > > OLD_FILES+=3Dusr/share/calendar/calendar.australia > > > > > > Modified: head/UPDATING > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/UPDATING Thu Nov 26 02:14:52 2020 (r368044) > > > +++ head/UPDATING Thu Nov 26 04:29:30 2020 (r368045) > > > @@ -26,6 +26,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: > > > world, or to merely disable the most expensive debugging > > functionality > > > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.con= f".) > > > > > > +20201124: > > > + ping6 has been merged into ping. It can now be called as "ping > > -6". > > > + See ping(8) for details. > > > + > > > 20201108: > > > Default value of net.add_addr_allfibs has been changed to 0. > > > If you have multi-fib configuration and rely on existence of all > > > > > > Modified: head/etc/mtree/BSD.tests.dist > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/etc/mtree/BSD.tests.dist Thu Nov 26 02:14:52 2020 > > (r368044) > > > +++ head/etc/mtree/BSD.tests.dist Thu Nov 26 04:29:30 2020 > > (r368045) > > > @@ -448,8 +448,6 @@ > > > .. > > > ping > > > .. > > > - ping6 > > > - .. > > > route > > > .. > > > .. > > > > > > Modified: head/rescue/rescue/Makefile > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/rescue/rescue/Makefile Thu Nov 26 02:14:52 2020 > > (r368044) > > > +++ head/rescue/rescue/Makefile Thu Nov 26 04:29:30 2020 > > (r368045) > > > @@ -103,7 +103,6 @@ CRUNCH_PROGS_sbin+=3D ccdconfig > > > .endif > > > > > > .if ${MK_INET6_SUPPORT} !=3D "no" > > > -CRUNCH_PROGS_sbin+=3D ping6 > > > CRUNCH_PROGS_sbin+=3D rtsol > > > .endif > > > > > > > > > Modified: head/sbin/Makefile > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/sbin/Makefile Thu Nov 26 02:14:52 2020 (r36804= 4) > > > +++ head/sbin/Makefile Thu Nov 26 04:29:30 2020 (r36804= 5) > > > @@ -73,7 +73,6 @@ SUBDIR.${MK_CCD}+=3D ccdconfig > > > SUBDIR.${MK_CXX}+=3D devd > > > SUBDIR.${MK_HAST}+=3D hastctl > > > SUBDIR.${MK_HAST}+=3D hastd > > > -SUBDIR.${MK_INET6}+=3D ping6 > > > SUBDIR.${MK_INET6}+=3D rtsol > > > SUBDIR.${MK_IPFILTER}+=3D ipf > > > SUBDIR.${MK_IPFW}+=3D ipfw > > > > > > Modified: head/sbin/ping/Makefile > > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- head/sbin/ping/Makefile Thu Nov 26 02:14:52 2020 (r36804= 4) > > > +++ head/sbin/ping/Makefile Thu Nov 26 04:29:30 2020 (r36804= 5) > > > @@ -5,11 +5,17 @@ > > > > > > PACKAGE=3Druntime > > > PROG=3D ping > > > -SRCS=3D ping.c utils.c > > > +SRCS=3D main.c ping.c utils.c > > > > I think you should add a LINKS=3D... here so people script which uses > > ping6 won't break (and of course adding support in the code to do ipv6 > > ping if progname is ping6 if this isn't the case). > > > > Cheers, > > > > -- > > Emmanuel Vadot > > >=20 > Yes, that would make sense. But for how long? Would the ping6 hard link > stick around forever, or eventually be removed in some future version of > FreeBSD? I have no opinion on this matter. But since ping6 was present for a very long time I guess we're stuck with it for a long time too. --=20 Emmanuel Vadot