svn commit: r368045 - in head: . etc/mtree rescue/rescue sbin sbin/ping sbin/ping/tests sbin/ping6 sbin/ping6/tests tools/build/mk

Emmanuel Vadot manu at bidouilliste.com
Thu Nov 26 14:49:35 UTC 2020


On Thu, 26 Nov 2020 07:36:37 -0700
Alan Somers <asomers at freebsd.org> wrote:

> On Thu, Nov 26, 2020 at 1:27 AM Emmanuel Vadot <manu at bidouilliste.com>
> wrote:
> 
> >
> >  Hi Alan,
> >
> > On Thu, 26 Nov 2020 04:29:31 +0000 (UTC)
> > Alan Somers <asomers at FreeBSD.org> 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 ICMPv4
> > >   based on the -4 and -6 options, and the format of the address.
> > >
> > >   Submitted by:       Ján Su?an <sucanjan at gmail.com>
> > >   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
> > >
> > ==============================================================================
> > > --- 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+=sbin/ping6
> > > +OLD_FILES+=rescue/ping6
> > > +OLD_FILES+=usr/lib/debug/sbin/ping6.debug
> > > +OLD_FILES+=usr/share/man/man8/ping6.8.gz
> > > +OLD_FILES+=usr/tests/sbin/ping6/Kyuafile
> > > +OLD_FILES+=usr/tests/sbin/ping6/ping6_c1_s8_t1.out
> > > +OLD_FILES+=usr/tests/sbin/ping6/ping6_test
> > > +OLD_DIRS+=usr/tests/sbin/ping6
> > > +
> > >  # 20201025: Remove cal data files
> > >  OLD_FILES+=usr/share/calendar/calendar.all
> > >  OLD_FILES+=usr/share/calendar/calendar.australia
> > >
> > > Modified: head/UPDATING
> > >
> > ==============================================================================
> > > --- 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
> > >
> > ==============================================================================
> > > --- 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
> > >
> > ==============================================================================
> > > --- 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+= ccdconfig
> > >  .endif
> > >
> > >  .if ${MK_INET6_SUPPORT} != "no"
> > > -CRUNCH_PROGS_sbin+= ping6
> > >  CRUNCH_PROGS_sbin+= rtsol
> > >  .endif
> > >
> > >
> > > Modified: head/sbin/Makefile
> > >
> > ==============================================================================
> > > --- 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}+=  ccdconfig
> > >  SUBDIR.${MK_CXX}+=   devd
> > >  SUBDIR.${MK_HAST}+=  hastctl
> > >  SUBDIR.${MK_HAST}+=  hastd
> > > -SUBDIR.${MK_INET6}+= ping6
> > >  SUBDIR.${MK_INET6}+= rtsol
> > >  SUBDIR.${MK_IPFILTER}+=      ipf
> > >  SUBDIR.${MK_IPFW}+=  ipfw
> > >
> > > Modified: head/sbin/ping/Makefile
> > >
> > ==============================================================================
> > > --- 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=runtime
> > >  PROG=        ping
> > > -SRCS=        ping.c utils.c
> > > +SRCS=        main.c ping.c utils.c
> >
> >  I think you should add a LINKS=... 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 <manu at bidouilliste.com>
> >
> 
> 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.

-- 
Emmanuel Vadot <manu at bidouilliste.com> <manu at freebsd.org>


More information about the svn-src-head mailing list