From owner-freebsd-current@freebsd.org Fri Jan 1 00:42:38 2021 Return-Path: Delivered-To: freebsd-current@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 F3FD24D7B12 for ; Fri, 1 Jan 2021 00:42:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6R7d6gC8z4g28; Fri, 1 Jan 2021 00:42:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from [192.168.0.4] (unknown [200.118.158.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: pfg) by smtp.freebsd.org (Postfix) with ESMTPSA id 984FE25033; Fri, 1 Jan 2021 00:42:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Subject: Re: Bug in r361898 (was Re: poudriere: services_mkdb recompile with larger PROTOMAX) To: Daniel Eischen , freebsd-current@freebsd.org References: From: Pedro Giffuni Organization: FreeBSD Message-ID: <6808fb50-0823-0ae3-a9dd-0fc73eafd33e@FreeBSD.org> Date: Thu, 31 Dec 2020 19:42:36 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 00:42:38 -0000 On 12/31/20 5:47 PM, Daniel Eischen wrote: > On Thu, 31 Dec 2020, Daniel Eischen wrote: > >> I see this message in src/UPDATING: >> >> 20201216: >>  The services database has been updated to cover more of the basic >>  services expected in a modern system. The database is big enough >>  that it will cause issues in mergemaster in Releases previous to >>  12.2 and 11.3, or in very old current systems from before r358154. >> >> I'm trying to update a poudriere jail from a freshly built -current >> system (r368820): >> >>   FreeBSD vega.my.domain 13.0-CURRENT FreeBSD 13.0-CURRENT #0 r368820 >>   Wed Dec 30 15:55:06 EST 2020 >> >> I've tried running this command twice: >> >>   export MAKEOBJDIRPREFIX=/opt/FreeBSD/obj/head.obj >>   poudriere jail -u -j 13amd64 >> >> [ /opt/FreeBSD/obj/head.obj is my freshly built (r368820) obj tree is ] >> >> services_mkdb was updated in the jail on the first pass: >> >>   # ls -l /usr/local/poudriere/jails/13amd64/usr/sbin/services_mkdb >>   -r-xr-xr-x  1 root  wheel  15288 Dec 31 13:02 >> /usr/local/poudriere/jails/13amd64/usr/sbin/services_mkdb >> >> But as on the first pass of 'poudriere jail -u -j 13amd64`, I still get >> the following error: >> >> ... >> >> --- _CONFSINS_services --- >> install -N /opt/FreeBSD/svn/head/etc  -C -o root  -g wheel -m 644 >> /opt/FreeBSD/svn/head/usr.sbin/services_mkdb/services >> /usr/local/poudriere/jails/13amd64/etc/services >> --- installconfig_subdir_usr.bin --- >> --- installconfig_subdir_usr.bin/nice --- >> ===> usr.bin/nice (installconfig) >> --- installconfig_subdir_usr.sbin --- >> --- afterinstallconfig --- >> --- installconfig_subdir_lib --- >> --- installconfig_subdir_lib/ncurses --- >> --- installconfig_subdir_lib/ncurses/ncurses --- >> ===> lib/ncurses/ncurses (installconfig) >> --- installconfig_subdir_usr.sbin --- >> services_mkdb -l -q -o >> /usr/local/poudriere/jails/13amd64/var/db/services.db >> /usr/local/poudriere/jails/13amd64/etc/services >> --- installconfig_subdir_usr.bin --- >> --- installconfig_subdir_usr.bin/nl --- >> ===> usr.bin/nl (installconfig) >> --- installconfig_subdir_usr.sbin --- >> services_mkdb: Ran out of protocols adding `divert'; recompile with >> larger PROTOMAX >> >> What's the work-around for this?  services_mkdb seems to have been >> updated on the first pass off 'poudiere jail -u ...', but still fails >> on the second pass. > > A typo (tdp was used instead of tcp) in the services file seems to > have been introduced in r361898.  This is the patch that fixes the > problem for me. > > Index: usr.sbin/services_mkdb/services > =================================================================== > --- usr.sbin/services_mkdb/services (revision 368820) > +++ usr.sbin/services_mkdb/services (working copy) > @@ -1788,7 +1788,7 @@ >  iscsi-target 3260/udp   # iSCSI port >  mysql  3306/tcp   #MySQL >  mysql  3306/udp   #MySQL > -ms-wbt-server 3389/tdp   rdp #MS WBT Server > +ms-wbt-server 3389/tcp   rdp #MS WBT Server >  ms-wbt-server 3389/udp   #MS WBT Server >  efi-lm  3392/tcp   #EFI License Management >  efi-lm  3392/udp   #EFI License Management > Oops .... thanks ! It proved a nice chance to start using git. Pedro.