From owner-svn-src-head@freebsd.org Wed Sep 19 17:20:17 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CBE8C10A23DF for ; Wed, 19 Sep 2018 17:20:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic314-13.consmr.mail.bf2.yahoo.com (sonic314-13.consmr.mail.bf2.yahoo.com [74.6.132.123]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 72FF48AA56 for ; Wed, 19 Sep 2018 17:20:17 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-YMail-OSG: 5CsOz08VM1m8SKkO5PBcIUn22jga2QBpMzrAD0Xph8ELNoe5NDs9jp4CucSwlp9 av.b8j5AgBbAuxHie.0OPWBjStDIbk0yZ1YVwRKZbwCfvK9BgvbIw_F_94Q6kn3CGaRS5w7pvIV5 o8fCiLtxML_JSxT7u_7XvStq3uVL57OuZl6nsEuMXMUtMHodZbRt_eCxp4TlmBfJUJH4ERaJ584G MI.E2MyLtOod6AAxen9nWjMVv1rMk19uIYpGnA9uyp_J5cATDbrg4oYqbCHhp2a2d_7cXik1iBVE Oe6Mw410eGisRsFxegCDY.w8Wprgii17E4LdZCabnO3RnKBrAbniYYZTX87l9YeeOfgyMAGk3NZ8 SQTZxrpx84oBGUEBEOZ8Magksy4UZvMIf6g1Q64snet0b8VSQcwcPp3.OGooPCzOlVQuTz5KCeij NWX8MbUfgN7Z2ftxpItyv0S8PAUqEJNioqfRXkYdK_eEgBRaO2HFs45QGGTxdrUd6ng2A.H5m4Gi tIXpDUjIVAHhcZYZdke03Tybrtw4IsgiXSGx6SrIWZGcSMiZ3.I6jbChuFKLz3IFStdMmzT.mC4E soTMYvGH1dXswUDQsf75O3KrB1G3g.uX7kNOti8qtEaEb5FbOl7UEy1a8BJrBLFAL1hTVq1A65b6 oobpOzTCbmnovMP99qJ5wIxyjg3ZKltmiKmHJ2kHiAelzkyjKxHaxz91COr9Tk..8FGE.WEY8acC LTeJIH.T1LIoH92qt8y4wXLJDuUse.KD7.AmHaoFidlbfhC3LwggZerIcf1i6VPRJqlNPncBG2Sy X5_Lai6InxA6egv_jpGzPPaF4cg_2k0dCYwmzcPaIvDsTOpBSilk37241wLMfUkL_AJMT5Qfw97v XlSLXnKNq44VtFAKq3IsMggUTeVeRFRQIcioN9THKOpTMWfwCAvgwuPvxCQllYfPYx9mSDNAdQ9N SPcAn77ytppY.a5d6ITcaNeyB0E8xZF2uH3jipbEI0ul_AkJjtnlOjLYpwcqvrHfEvFkY6VePt4r WFvRXSWftMg-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.bf2.yahoo.com with HTTP; Wed, 19 Sep 2018 17:20:16 +0000 Received: from ip70-189-131-151.lv.lv.cox.net (EHLO [192.168.0.105]) ([70.189.131.151]) by smtp421.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID ec244eb94db3bee720a955a2bb70cf49; Wed, 19 Sep 2018 17:20:13 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Subject: Re: svn commit: r336601 - head Date: Wed, 19 Sep 2018 10:20:11 -0700 References: To: "Piotr P. Stefaniak" , svn-src-head@freebsd.org In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3445.9.1) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Sep 2018 17:20:18 -0000 [I was asked what the fix might be. So I suggest specifics.] On 2018-Sep-16, at 10:06 AM, Mark Millard wrote: > Looks like this head/ObsoleteFiles.inc update has a typo > in each thing added to OLD_FILES . . . >=20 > # ls -lTdt /usr/tests/usr.bin/indent/* > -r--r--r-- 1 root wheel 121 Sep 13 22:53:30 2018 = /usr/tests/usr.bin/indent/Kyuafile > . . . > -r--r--r-- 1 root wheel 295 Sep 13 22:53:29 2018 = /usr/tests/usr.bin/indent/binary.0 > -r--r--r-- 1 root wheel 92 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/sac.0.pro > -r--r--r-- 1 root wheel 130 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/sac.0.stdout > -r--r--r-- 1 root wheel 122 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/sac.0 > -r--r--r-- 1 root wheel 94 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/nsac.0.pro > -r--r--r-- 1 root wheel 130 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/nsac.0.stdout > -r--r--r-- 1 root wheel 123 May 1 19:35:24 2018 = /usr/tests/usr.bin/indent/nsac.0 >=20 > vs. ( note usr.bin vs. usr/bin ): >=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 Sun Jul 22 12:04:21 2018 = (r336600) > +++ head/ObsoleteFiles.inc Sun Jul 22 12:45:02 2018 = (r336601) > @@ -38,6 +38,13 @@ > # xargs -n1 | sort | uniq -d; > # done >=20 > +# 20180722: indent(1) option renamed, test files follow > +OLD_FILES+=3Dusr/bin/indent/tests/nsac.0 > +OLD_FILES+=3Dusr/bin/indent/tests/nsac.0.pro > +OLD_FILES+=3Dusr/bin/indent/tests/nsac.0.stdout > +OLD_FILES+=3Dusr/bin/indent/tests/sac.0 > +OLD_FILES+=3Dusr/bin/indent/tests/sac.0.pro > +OLD_FILES+=3Dusr/bin/indent/tests/sac.0.stdout > # 20180721: move of libmlx5.so.1 and libibverbs.so.1 > OLD_LIBS+=3Dusr/lib/libmlx5.so.1 > OLD_LIBS+=3Dusr/lib/libibverbs.so.1 As near as I can tell the fix would be something like (leading whitespace seems to be disappearing): # svnlite diff /usr/src/ObsoleteFiles.inc Index: /usr/src/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 --- /usr/src/ObsoleteFiles.inc (revision 338675) +++ /usr/src/ObsoleteFiles.inc (working copy) @@ -48,12 +48,12 @@ # 20180725: Cleanup old libcasper.so.0 OLD_LIBS+=3Dlib/libcasper.so.0 # 20180722: indent(1) option renamed, test files follow -OLD_FILES+=3Dusr/bin/indent/tests/nsac.0 -OLD_FILES+=3Dusr/bin/indent/tests/nsac.0.pro -OLD_FILES+=3Dusr/bin/indent/tests/nsac.0.stdout -OLD_FILES+=3Dusr/bin/indent/tests/sac.0 -OLD_FILES+=3Dusr/bin/indent/tests/sac.0.pro -OLD_FILES+=3Dusr/bin/indent/tests/sac.0.stdout +OLD_FILES+=3Dusr/tests/usr.bin/indent/nsac.0 +OLD_FILES+=3Dusr/tests/usr.bin/indent/nsac.0.pro +OLD_FILES+=3Dusr/tests/usr.bin/indent/nsac.0.stdout +OLD_FILES+=3Dusr/tests/usr.bin/indent/sac.0 +OLD_FILES+=3Dusr/tests/usr.bin/indent/sac.0.pro +OLD_FILES+=3Dusr/tests/usr.bin/indent/sac.0.stdout # 20180721: move of libmlx5.so.1 and libibverbs.so.1 OLD_LIBS+=3Dusr/lib/libmlx5.so.1 OLD_LIBS+=3Dusr/lib/libibverbs.so.1 This is sort of like the older part of the file: # 20170322: rename to _test to match the FreeBSD test suite name = scheme OLD_FILES+=3Dusr/tests/usr.bin/col/col OLD_FILES+=3Dusr/tests/usr.bin/diff/diff OLD_FILES+=3Dusr/tests/usr.bin/ident/ident OLD_FILES+=3Dusr/tests/usr.bin/mkimg/mkimg OLD_FILES+=3Dusr/tests/usr.bin/sdiff/sdiff OLD_FILES+=3Dusr/tests/usr.bin/soelim/soelim OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_config OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_etcdir OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_groupadd OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_groupdel OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_groupmod OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_lock OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_useradd OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_userdel OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_usermod OLD_FILES+=3Dusr/tests/usr.sbin/pw/pw_usernext =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)