From owner-svn-src-all@freebsd.org Thu Nov 26 08:27:13 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 713034A582D; Thu, 26 Nov 2020 08:27:13 +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 4ChW8J5KvPz3Pr0; Thu, 26 Nov 2020 08:27:12 +0000 (UTC) (envelope-from manu@bidouilliste.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bidouilliste.com; s=mx; t=1606379224; 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=HoNaPdsbIXVPCr1akMJMTb2z4yy5X59B4L2ldGKU0TI=; b=TrPCptt4SN2qgfKn1xlKc+VpPD9BhuUmbkyAv/DUgPc0grPP+gkkh5WAc2jcjQtX/WT/nS F+oF87zM1AGBh4XICg/YJ1nugHp525ZAEmniGFqbXgcm0hEZlLlp9QVhw3IUrCFre7JwE8 TMxEgvMKLtQ6nmtjWjL8NqNyBpxjOl4= Received: from amy.home (lfbn-idf2-1-288-247.w82-123.abo.wanadoo.fr [82.123.126.247]) by mx.blih.net (OpenSMTPD) with ESMTPSA id fff58a2c (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 26 Nov 2020 08:27:04 +0000 (UTC) Date: Thu, 26 Nov 2020 09:27:04 +0100 From: Emmanuel Vadot To: Alan Somers Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org 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: <20201126092704.f689ac823d6571ca0c98212a@bidouilliste.com> In-Reply-To: <202011260429.0AQ4TV2B023801@repo.freebsd.org> References: <202011260429.0AQ4TV2B023801@repo.freebsd.org> 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: 4ChW8J5KvPz3Pr0 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 08:27:13 -0000 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 >=20 > Log: > Merge ping6 to ping > =20 > 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. > =20 > 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 >=20 > 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_t= 1.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 >=20 > 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 > =20 > +# 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 >=20 > 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".) > =20 > +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 >=20 > 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 > .. > .. >=20 > 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 > =20 > .if ${MK_INET6_SUPPORT} !=3D "no" > -CRUNCH_PROGS_sbin+=3D ping6 > CRUNCH_PROGS_sbin+=3D rtsol > .endif > =20 >=20 > 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 >=20 > 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 @@ > =20 > 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, > MAN=3D ping.8 > BINOWN=3D root > BINMODE=3D4555 > LIBADD=3D m > + > +.if ${MK_INET6_SUPPORT} !=3D "no" > +CFLAGS+=3D -DINET6 -DKAME_SCOPEID > +SRCS+=3D ping6.c > +LIBADD+=3D md > +.endif > =20 > .if ${MK_DYNAMICROOT} =3D=3D "no" > .warning ${PROG} built without libcasper support --=20 Emmanuel Vadot