From owner-svn-src-all@freebsd.org Thu Nov 26 14:36:50 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 73F9E4AD773; Thu, 26 Nov 2020 14:36:50 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ChgLp2nMxz4YHZ; Thu, 26 Nov 2020 14:36:50 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f51.google.com with SMTP id l36so2044288ota.4; Thu, 26 Nov 2020 06:36:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=rFQU/XNDteTNTuvLzmsvXhMDX3rnVeCZITi6lAf8FXE=; b=iL8+ccI0PQcL4SrHdULOdb8drp73OuJR+ta1sqMv654TciojnbZe1EzcRuhHlgBggy lSZf60GTIsApQxf+hAIzmgK+g/IN5awcY8Pe3dNnSoNWpu035XZ+7+V8NVjH+0Kyp+jR w1w1waWAzNjQyKrJ8pJ0KRm3wT1kY/W+NHK3vHAm5g2l9R30gxTFQcX3BWLln5Vv+z8U Z5bltHrTKzuAJhTf9xOionoQQV87i/dP+Tbal9ALzRm+rvg3+1remt1Krb+gFG2UjJ1y K9BR37FIMf0Ktp7FB0vJvZRUnwD9M3cxoO3e60PkVZRegZg1qdTRxO2nsrzTH2D/SBI5 XPNA== X-Gm-Message-State: AOAM533Iq2Keb7JrIZmIuG+x6vuiFcxWdo8w3+gq8MtaL+2bHu+rjXSJ 7zJqfZxGlT1TvQ9dPTV5i/8+yVocd6l3NIn4tpduCES3Ji8= X-Google-Smtp-Source: ABdhPJzQ6GRzXRFcERb5QzAUVbUJM8yXu14WBaZOAQAlwDikOTHKF+qdOgcVh3h24EUYXPdW7gNmdrVghCVDHf6lSC8= X-Received: by 2002:a9d:6317:: with SMTP id q23mr2534339otk.251.1606401409260; Thu, 26 Nov 2020 06:36:49 -0800 (PST) MIME-Version: 1.0 References: <202011260429.0AQ4TV2B023801@repo.freebsd.org> <20201126092704.f689ac823d6571ca0c98212a@bidouilliste.com> In-Reply-To: <20201126092704.f689ac823d6571ca0c98212a@bidouilliste.com> From: Alan Somers Date: Thu, 26 Nov 2020 07:36:37 -0700 Message-ID: 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 To: Emmanuel Vadot Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 4ChgLp2nMxz4YHZ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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:36:50 -0000 On Thu, Nov 26, 2020 at 1:27 AM Emmanuel Vadot wrote: > > 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 ICMPv= 4 > > based on the -4 and -6 options, and the format of the address. > > > > Submitted by: J=C3=A1n 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 (r368044) > > +++ head/ObsoleteFiles.inc Thu Nov 26 04:29:30 2020 (r368045) > > @@ -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.conf"= .) > > > > +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 (r368044) > > +++ head/sbin/Makefile Thu Nov 26 04:29:30 2020 (r368045) > > @@ -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 (r368044) > > +++ head/sbin/ping/Makefile Thu Nov 26 04:29:30 2020 (r368045) > > @@ -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 > 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?