Date: Wed, 19 Feb 2020 22:05:52 -0800 From: Xin Li <delphij@delphij.net> To: Yuri Pankov <yuripv@yuripv.me>, "Pedro F. Giffuni" <pfg@FreeBSD.org> 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: <ceced76f-c742-400c-0ebc-cf13cb7e0362@delphij.net> In-Reply-To: <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> References: <202002200354.01K3s8ib077553@repo.freebsd.org> <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --AEukQedCH7c4yJkYTZt54VPPKfFEVouSQ Content-Type: multipart/mixed; boundary="S0ROYou22JPlqRsRxhQIbVxa5uxk21m9S"; protected-headers="v1" From: Xin Li <delphij@delphij.net> Reply-To: d@delphij.net To: Yuri Pankov <yuripv@yuripv.me>, "Pedro F. Giffuni" <pfg@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <ceced76f-c742-400c-0ebc-cf13cb7e0362@delphij.net> Subject: Re: svn commit: r358153 - head/usr.sbin/services_mkdb References: <202002200354.01K3s8ib077553@repo.freebsd.org> <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> In-Reply-To: <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> --S0ROYou22JPlqRsRxhQIbVxa5uxk21m9S Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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: >> /etc/services: attempt bring the database to this century. >> >> Document better this file, updating the URL to the IANA registry and = closely >> match the official services. >> >> For system ports (0 to 1023) we now try to follow the registry closel= y, noting >> some historical differences where applicable. >> For the User ports (1024 - 49151) we try to keep some sensible balanc= e only >> of services that are likely to be found on FreeBSD/UNIX systems. This= attempts >> to strike a balance between complexity and usefulness. >> >> As a side effect: drop references to unofficial Kerberos IV which was= EOL'ed >> on Oct 2006[1]. While it is conceivable some people may still use it = in some >> very old FreeBSD machines that can't be replaced easily, the use of i= t is >> considered a security risk. Also drop the unofficial netatalk, which = we >> supported long ago in the kernel but was dropped long ago. >> >> [1] https://web.mit.edu/kerberos/krb4-end-of-life.html >> >> MFC after: 3 weeks (likely to 12-stable only) >> Differential Revision: https://reviews.freebsd.org/D23621 >> >> Modified: >> head/usr.sbin/services_mkdb/services >=20 > I noticed `mergemaster` failing, and it seems to be not happy with this= change: >=20 > # make installconfig > installing DIRS CONFSDIR > install -d -m 0755 -o root -g wheel /etc > install -C -o root -g wheel -m 644 /usr/src/usr.sbin/services_mkdb/s= ervices /etc/services > services_mkdb -l -q -o /var/db/services.db /etc/services > services_mkdb: Ran out of protocols adding `divert'; recompile with lar= ger PROTOMAX > *** Error code 1 >=20 > Stop. > make: stopped in /usr/src/usr.sbin/services_mkdb Fixed in r358154. Please merge the revision with r358153 when MFC'ing. --S0ROYou22JPlqRsRxhQIbVxa5uxk21m9S-- --AEukQedCH7c4yJkYTZt54VPPKfFEVouSQ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.2.19 (FreeBSD) iQIzBAEBCgAdFiEEceNg5NEMZIki80nQQHl/fJX0g08FAl5OIcMACgkQQHl/fJX0 g096mhAAhY0iapjtQyrHcls9UGExulQPvgY0LcItPzVTP8ih38ZVF14gAnaJ2bc9 rhd5m49EW9KlvuPNSnJcF4WlwilFLGykpeTf/KbBk90U6pSJoozUjy9Xt9JcErLt J7zYBuJw+aTcB6fJ2jEkzfDHXuC9zgDKg9/tjQKC0KY7K73WlbRdQ+rHt6C1D37i 4dgJQQBV8ggeFCtT77KEZKxWQurSnPv4xqk9KLxRhK9Hd5Eg49eBeHHFxCNQ/R0t EAa8VgwN3Xf8CdL5a1Cj1Oj8rq1xSxTCx4hnkRQ5JleJ57gEBQTCbp4XgwNd8wYc EFe0H8af4k55BKW9KLE5JTwwpyLzGBxMu+HF8x3aooIZTzDG+hruHb92Tj8VmbsY 9KJ+RSKUMnEoHE48s57tQhvfoZ7BZKIcBTXQNj8xSGo6kRt6YlQStLw8OM6cbEUv MzjKICMZ7Hclo6p8O3DuXbHluncB+I8Wx6i8u3KncW6IaNIF+TAEc7shZvtUFckW 5ZhKj58I5s337IP32znqeKEXxATDLao/gVGvJRczpd8MpaavqJrU1DRKf+V+Oo6C 0SpYeS5oGA3hdMB47y2mQQ/X4pJ8p8C4U3TKhWcGlzl+1meTRhnVOi5pPJfLo2Vc L3Tsb7msQyS5ntglBw208EL0JPNjjeRjDLj+n1CIphPxahBcijM= =dXRQ -----END PGP SIGNATURE----- --AEukQedCH7c4yJkYTZt54VPPKfFEVouSQ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ceced76f-c742-400c-0ebc-cf13cb7e0362>