svn commit: r358153 - head/usr.sbin/services_mkdb

[Li-Wen Hsu]

On Thu, Feb 20, 2020 at 2:06 PM Xin Li <delphij at delphij.net> wrote:
>
>
>
> On 2/19/20 10:01 PM, Yuri Pankov wrote:
> > On 20 Feb 2020, at 06:54, Pedro F. Giffuni <pfg at 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 closely, noting
> >>  some historical differences where applicable.
> >>  For the User ports (1024 - 49151) we try to keep some sensible balance 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 it 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
> >
> > I noticed `mergemaster` failing, and it seems to be not happy with this change:
> >
> > # 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/services /etc/services
> > services_mkdb -l -q -o /var/db/services.db  /etc/services
> > services_mkdb: Ran out of protocols adding `divert'; recompile with larger PROTOMAX
> > *** Error code 1
> >
> > Stop.
> > make: stopped in /usr/src/usr.sbin/services_mkdb
>
> Fixed in r358154.  Please merge the revision with r358153 when MFC'ing.

Please note this is not fixed in ci.freebsd.org yet. The reason is it
directly goes to src/release and perform `make packagesystem` to
generate kernel.txz and base.txz.  If I read release(7) correctly,
this should be performed under a fresh installed environment.  I am
checking how to fix this.

delphij and I were trying to propagate ${IMAKEENV} to these targets
but I'm not sure if this is correct way.

Best,
Li-Wen