From owner-svn-src-all@freebsd.org Thu Feb 20 09:17:09 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 3FF4925A0FB for ; Thu, 20 Feb 2020 09:17:09 +0000 (UTC) (envelope-from pfg@freebsd.org) Received: from sonic308-56.consmr.mail.ne1.yahoo.com (sonic308-56.consmr.mail.ne1.yahoo.com [66.163.187.31]) (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 48NTW84fH0z4Wys for ; Thu, 20 Feb 2020 09:17:08 +0000 (UTC) (envelope-from pfg@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1582190222; bh=+rMxD0VrY6NWiUQEzcGlYE3sgC7zQ8ibBLFb9O1TgWs=; h=Date:From:To:Cc:In-Reply-To:References:Subject:From:Subject; b=BWweE7ssNtZrurL4IP2iY6u9u6HWwtJJcQOElVWwcKzxN6XUCl2OK9jZNkd9Gu2DlPoA8IS9gjpEUHwiLOyFz328JJy0r6WFAmsHGq9NgjdHEWGUgEtdfEhf9A8sKr67Wc+G/NVwrxnyxqs+K3vZM7etBQkDye3p0g1c+fhegfxOzgW2us9Jotjc7hvPEUvPQCmdDgP2fwsDT4mBytpJ3K5M5alXEM9K4HdZ2waJh0NkLMS7taVsYJXVKNsztpSDIHND+oMeEiJrzf5HbEqJ+z27OZ3PKk59N10yePVipEkv5inD1OnlokjP0Kq1pggHvwdTQWIDCMFQ3tlcMTtf4Q== X-YMail-OSG: nl6HspkVM1k5hIQOgOzSmDe.jiVfNNI1O0XNAaobbP3WNZkZAREh3_I1BGhpdZc EiEZONIE_3VSOinXJDdOTyyOgnsOmhjcDIB_4g79Gt6Wi7UsOC_5V0xYfPxHTOQwA4xwxe.6_qMG Fd2GSu1OmUt95RryW6BkY.DfoHpXPOlvGJ2YUgwErSPFUcXJ9ADecO.FqR69TjQttwynVJBMQtih TPdvlLka_sIhliKo1_uoRkxZe6Z8KnqEXMKqLv7CHioQocvWYaxa4Q_WceONfSFYSHbNyU_bvhzW 7SNgWNRsKwd.6rS4OhNgsidN2oJOz1fdAAtnGyy2V.QsE.DJT3XP_rkJu3ms7Lu3wsLxN1FxsxJ2 Mp_3c0SOwYH5MP8yF3fCh5u6_oJNDrCNdjDRkCYBB2ucvRui3VlJDljX9Yod2Rz_JvIqt0xVc.wQ LmYDIJ19gCautSMTgYwSTGkoed9fKKjOdmGMpqw0eZpjedAVVmFTjEo0s1kPhTED6i8F8W71tJDR 6AVnOu8Ub8eBda7NFcncME9yRZp6mzyVJwNBUNWLYRTAZJUyBR_D5lkLvEGNZHUEYT5tLy33XD2g GDi1E4UInj8DTARBKGp2Zhz_rM9exdWifT64ngPFqh_ganXCXaS2eDqwL11ZWRnVDRhMavVGqOY. iLqtot_FmJOOm3Hcuo9655LFdC38w3yddjAi2QQJKUEAheDkb12hwuv3bDQLICNihRYvC0msMs3N w_vEazIT.QPaudOUS8WNDc2k0E8eIAGyZXiJrvGRM_PUfe1DvwmTnY40kJqBzISuC4Vdq.5663zE VmuCgqsSEDVFXfjCfX6_gH.TSRgEdxqSbPABTi64jtKBrRKqVFl0i8e3DuyMoKUkl_Rb3shZ0sLE xqE7poh4TexYJKfp5AgqAVsA658lrRnQ6rhpojn1vexYXooTg7kDcpqYJ8oUdT806z3x.aRzU_0J t0.iexJFbu.uL4vRQNzanzhWdscGA0_ztvx7T7q.J4is3_a9zW9Qwha69ks8pn5117n1L66D3fAr .D01aUyEhh7nxBW0OascTOO9n4woeaq32M3w6ed2UcbB28NJC4Wmx9M6Mzh9t14KvXRueW1uAzv1 czkx8L3KM60ZOV6eZHXK_eE565jeDBaz5ZuCRIxLNwcCXW1_yrw4dMV_jyDmAZ1RjR50SkLdF26w xbwyDVoZ.UuAfZo527mDqxgXzgJO2n1fcLWpe5qf0_2UCQDKS3fdUeaeCvcjEpRN_hvwglKVRknZ PKd8iSwZu2aKnfOCG00T_S0L3sNNIX1BHPVMJhnj92oCEdbrCbxkGA276vMiJb9g8WSOzWjTWwh3 KPaYiK2qLpI1YnbQBFuVzy3n58VSSqEA5GFkFDP9Gdd2wOkKSG7B7449y9d2DGoMVlM4- Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ne1.yahoo.com with HTTP; Thu, 20 Feb 2020 09:17:02 +0000 Date: Thu, 20 Feb 2020 09:16:58 +0000 (UTC) From: Pedro Giffuni To: , Yuri Pankov Cc: , , Message-ID: <1899052077.5603983.1582190218939@mail.yahoo.com> In-Reply-To: References: <202002200354.01K3s8ib077553@repo.freebsd.org> <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> Subject: Re: svn commit: r358153 - head/usr.sbin/services_mkdb MIME-Version: 1.0 X-Mailer: WebService/1.1.15199 YahooMailIosMobile Raven/37985 CFNetwork/758.5.3 Darwin/15.6.0 X-Rspamd-Queue-Id: 48NTW84fH0z4Wys X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.90 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.91)[-0.907,0]; NEURAL_HAM_LONG(-0.99)[-0.990,0]; ASN(0.00)[asn:36646, ipnet:66.163.184.0/21, country:US] Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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, 20 Feb 2020 09:17:09 -0000 blockquote, div.yahoo_quoted { margin-left: 0 !important; border-left:1px = #715FFA solid !important; padding-left:1ex !important; background-color:whi= te !important; }=20 Oops! Sorry was AFK ... Thanks! Pedro. On Thursday, February 20, 2020, 1:06 AM, Xin Li wrote= : On 2/19/20 10:01 PM, Yuri Pankov wrote: > On 20 Feb 2020, at 06:54, Pedro F. Giffuni wrote: >> >> Author: pfg >> Date: Thu Feb 20 03:54:07 2020 >> New Revision: 358153 >> URL: https://svnweb.freebsd.org/changeset/base/358153 >> >> Log: >>=C2=A0 /etc/services: attempt bring the database to this century. >> >>=C2=A0 Document better this file, updating the URL to the IANA registry a= nd closely >>=C2=A0 match the official services. >> >>=C2=A0 For system ports (0 to 1023) we now try to follow the registry clo= sely, noting >>=C2=A0 some historical differences where applicable. >>=C2=A0 For the User ports (1024 - 49151) we try to keep some sensible bal= ance only >>=C2=A0 of services that are likely to be found on FreeBSD/UNIX systems. T= his attempts >>=C2=A0 to strike a balance between complexity and usefulness. >> >>=C2=A0 As a side effect: drop references to unofficial Kerberos IV which = was EOL'ed >>=C2=A0 on Oct 2006[1]. While it is conceivable some people may still use = it in some >>=C2=A0 very old FreeBSD machines that can't be replaced easily, the use o= f it is >>=C2=A0 considered a security risk. Also drop the unofficial netatalk, whi= ch we >>=C2=A0 supported long ago in the kernel but was dropped long ago. >> >>=C2=A0 [1] https://web.mit.edu/kerberos/krb4-end-of-life.html >> >>=C2=A0 MFC after:=C2=A0=C2=A0=C2=A0 3 weeks (likely to 12-stable only) >>=C2=A0 Differential Revision:=C2=A0=C2=A0=C2=A0 https://reviews.freebsd.o= rg/D23621 >> >> Modified: >>=C2=A0 head/usr.sbin/services_mkdb/services >=20 > I noticed `mergemaster` failing, and it seems to be not happy with this c= hange: >=20 > # make installconfig > installing DIRS CONFSDIR > install=C2=A0 -d -m 0755 -o root=C2=A0 -g wheel=C2=A0 /etc > install=C2=A0 -C -o root=C2=A0 -g wheel -m 644=C2=A0 /usr/src/usr.sbin/se= rvices_mkdb/services /etc/services > services_mkdb -l -q -o /var/db/services.db=C2=A0 /etc/services > services_mkdb: Ran out of protocols adding `divert'; recompile with large= r PROTOMAX > *** Error code 1 >=20 > Stop. > make: stopped in /usr/src/usr.sbin/services_mkdb Fixed in r358154.=C2=A0 Please merge the revision with r358153 when MFC'ing= .