From owner-svn-src-head@freebsd.org Thu Feb 20 09:56:07 2020 Return-Path: Delivered-To: svn-src-head@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 8AD8025AFDC; Thu, 20 Feb 2020 09:56:07 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48NVN60gPDz4h2P; Thu, 20 Feb 2020 09:56:05 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: by mail-yw1-f68.google.com with SMTP id 10so1614924ywv.5; Thu, 20 Feb 2020 01:56:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=QCLvZk4CrEjR+/lH2COglzWdkruV/WLyuM9ysZMrcSc=; b=I3fVLFIS9269yP52Vrcfjwi9W8/xCSCDhbRx8RHk3tDkCRlEBRVWJd4MWLIMUhmHUF xSYjWbGhk69rZYGdTHemVJriov/O/uPbnqZhdjK6cO3ehCYFgMS5Yh2ER0KIPavKtzMM AcCuYCX6tJdFB2po1Oh163w0WY34WMmYEa8heIEDTsXN7b++XcK/xr58TFWvlwithA/u V4tTea2y8+r2Im8ikT6gGIBmoHixk5MzshE37ZAiwJ/ngwWXww6odDIaThO4XkLbPpPc PviS55TCEHT6iRkc6Uuk4OQ23sZ8zY0AcYuDD5YxkzPgSBPmmbCRuF/LXEE1bPeECf8a cLDg== X-Gm-Message-State: APjAAAXsx9oAKyRtPVlsTmtP2X5pXyagBVFcmyKv8pk+CCqIZ9+hkE0x inXmvf7pks7AVdgVwiuRqsczOFTdqgvubM5V/eBCT/9d X-Google-Smtp-Source: APXvYqz0fLHP4OnsZ5Tt+dq8pTJ5BCPw61ipzDlv2bIouJl6NTW/QtuXwVQcv4fDOvrLiLZcKK/91nkuzYaY+ph86K4= X-Received: by 2002:a0d:ce02:: with SMTP id q2mr24346865ywd.400.1582192564494; Thu, 20 Feb 2020 01:56:04 -0800 (PST) MIME-Version: 1.0 References: <202002200354.01K3s8ib077553@repo.freebsd.org> <48DC2EEA-22D6-4A0D-84CE-3F0770962DB3@yuripv.me> In-Reply-To: From: Li-Wen Hsu Date: Thu, 20 Feb 2020 17:55:51 +0800 Message-ID: Subject: Re: svn commit: r358153 - head/usr.sbin/services_mkdb To: Xin LI Cc: Yuri Pankov , "Pedro F. Giffuni" , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48NVN60gPDz4h2P X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of lwhsufreebsd@gmail.com designates 209.85.161.68 as permitted sender) smtp.mailfrom=lwhsufreebsd@gmail.com X-Spamd-Result: default: False [-3.05 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_NEQ_ENVFROM(0.00)[lwhsu@freebsd.org,lwhsufreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[68.161.85.209.rep.mailspike.net : 127.0.0.18]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RCVD_TLS_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RCPT_COUNT_FIVE(0.00)[6]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[68.161.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.06)[ip: (-0.55), ipnet: 209.85.128.0/17(-3.00), asn: 15169(-1.67), country: US(-0.05)]; FORGED_SENDER(0.30)[lwhsu@freebsd.org,lwhsufreebsd@gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Feb 2020 09:56:07 -0000 On Thu, Feb 20, 2020 at 2:06 PM 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: > >> /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