Date: Thu, 20 Feb 2020 09:16:58 +0000 (UTC) From: Pedro Giffuni <pfg@freebsd.org> To: <d@delphij.net>, Yuri Pankov <yuripv@yuripv.me> Cc: <src-committers@freebsd.org>, <svn-src-all@freebsd.org>, <svn-src-head@freebsd.org> Subject: Re: svn commit: r358153 - head/usr.sbin/services_mkdb Message-ID: <1899052077.5603983.1582190218939@mail.yahoo.com> In-Reply-To: <ceced76f-c742-400c-0ebc-cf13cb7e0362@delphij.net> References: <202002200354.01K3s8ib077553@repo.freebsd.org> <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> <ceced76f-c742-400c-0ebc-cf13cb7e0362@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <delphij@delphij.net> wrote=
:
On 2/19/20 10:01 PM, Yuri Pankov wrote:
> On 20 Feb 2020, at 06:54, Pedro F. Giffuni <pfg@FreeBSD.org> 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=
.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1899052077.5603983.1582190218939>