From owner-dev-commits-src-all@freebsd.org Wed Jul 21 09:32:49 2021 Return-Path: Delivered-To: dev-commits-src-all@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 D7132660998; Wed, 21 Jul 2021 09:32:49 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4GV9Nd0Fhlz4qfQ; Wed, 21 Jul 2021 09:32:48 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-qt1-f169.google.com with SMTP id v14so1462765qtc.8; Wed, 21 Jul 2021 02:32:48 -0700 (PDT) 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:content-transfer-encoding; bh=f8XSQ6o5ZCCB5CiKyfdwlJUR3MvsBFFUwt26x0ya9iM=; b=h1AmOHrLlW84uM8DUK7RX4Kv7fZhOWY/slpuWhVZpb07KfaxT4WRMIgdz6hrAAJifV XiUKgBmvSamvcr0l/0idmmBz8XLw47jKwm3IaP3aFsbPp0URz6q6aelrWj1IcRPeMa8m HoPkLOlZOysZwMqBUYiql/bu4yGssW0zFI7aI6uFEgOvgQ5uEvuMzlFmClLejLuRuR13 kIiGSHBNChnH3CzqpRzLkXCzm1h4NQAOOimW8dZtFAYLZ0Tg+tqZL3U/gxa8dJR9Mc1N KUM0G/T1V36qpkvlgqscQP30u2s5jpiLMujK8tYn71am/9QTkKr2RsbVqD2Fr6JGFeqj a8/A== X-Gm-Message-State: AOAM530IKjSpdQ6QJeLgp6vl0/nToESax3XCLiYSj93AlGmEQEkMvKuy +uxYISmJKys6bqh+Fp7R99THgXRqDLSVHA== X-Google-Smtp-Source: ABdhPJwvVhZRNd0CZov/uM/3gIFs3PI+kP0l6LtzVuasMEEEWQpX8kF6dxrTEPqgtALXut1wnp4mcQ== X-Received: by 2002:ac8:1347:: with SMTP id f7mr29875492qtj.70.1626859968173; Wed, 21 Jul 2021 02:32:48 -0700 (PDT) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com. [209.85.219.170]) by smtp.gmail.com with ESMTPSA id x21sm11307107qkn.0.2021.07.21.02.32.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 21 Jul 2021 02:32:47 -0700 (PDT) Received: by mail-yb1-f170.google.com with SMTP id g5so2385864ybu.10; Wed, 21 Jul 2021 02:32:47 -0700 (PDT) X-Received: by 2002:a25:73d1:: with SMTP id o200mr45304348ybc.377.1626859967574; Wed, 21 Jul 2021 02:32:47 -0700 (PDT) MIME-Version: 1.0 References: <202107072012.167KC1IL065912@gitrepo.freebsd.org> In-Reply-To: From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Wed, 21 Jul 2021 11:28:32 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: f6043a672135 - main - ObsoleteFiles.inc: Remove manpages from OLD_FILES To: Wolfram Schneider Cc: Mark Millard , Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4GV9Nd0Fhlz4qfQ X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of fernandoapesteguia@gmail.com designates 209.85.160.169 as permitted sender) smtp.mailfrom=fernandoapesteguia@gmail.com X-Spamd-Result: default: False [-1.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; RWL_MAILSPIKE_GOOD(0.00)[209.85.160.169:from]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_THREE(0.00)[4]; FORGED_SENDER(0.30)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_NEQ_ENVFROM(0.00)[fernape@freebsd.org,fernandoapesteguia@gmail.com]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.160.169:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; TAGGED_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; NEURAL_SPAM_SHORT(1.00)[1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; SPAMHAUS_ZRD(0.00)[209.85.160.169:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.160.169:from]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jul 2021 09:32:49 -0000 On Tue, Jul 20, 2021 at 4:09 PM Fernando Apestegu=C3=ADa wrote: > > On Mon, Jul 19, 2021 at 3:37 PM Wolfram Schneider wro= te: > > > > How about apm.8.gz and apmconf.8.gz? > > > > $ git grep -E '(apm|apmconf|nvram|apmd|sconfig)\.8' | grep OLD_FILES > > ObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/apm.8.gz > > ObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man8/apmconf.8.gz > > tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man= 8/amd64/apm.8.gz > > tools/build/mk/OptionalObsoleteFiles.inc:OLD_FILES+=3Dusr/share/man/man= 8/amd64/apmconf.8.gz > > > > Is it needed? > Those files were not affected by the original commit and are, at this > point, installed only for amd64, arm64 and i386. > apmd.8.gz and sconfig.8.gz were affected though in 0a0f7486413c and > they needed to be removed from OLD_FILES. Forget what I said. Yes, those files were affected by 0a0f7486413 and should be deleted from OLD_FILES too. https://reviews.freebsd.org/D31256 Thanks! > > Cheers. > > > -Wolfram > > > > > > On Wed, 7 Jul 2021 at 22:12, Fernando Apestegu=C3=ADa wrote: > > > > > > The branch main has been updated by fernape (doc, ports committer): > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Df6043a672135da8ec090d8= 878cc844b8aace54f9 > > > > > > commit f6043a672135da8ec090d8878cc844b8aace54f9 > > > Author: Fernando Apestegu=C3=ADa > > > AuthorDate: 2021-07-07 13:15:02 +0000 > > > Commit: Fernando Apestegu=C3=ADa > > > CommitDate: 2021-07-07 18:09:02 +0000 > > > > > > ObsoleteFiles.inc: Remove manpages from OLD_FILES > > > > > > In 0a0f7486413c147d56808b38055c40c64cff61f5 sconfig.8.gz and apmd= .8.gz > > > were moved back to the parent directory share/man/man8. > > > > > > This conflicts with a previous entry in OLD_FILES so running 'mak= e > > > delete-old' would delete the new installed files. > > > > > > Reported by: marklmi@yahoo.com > > > Approved by: emaste@ > > > Fixes: 0a0f7486413c - Build manpages for all architectures > > > MFH: 4 weeks > > > Differential Revision: https://reviews.freebsd.org/D31092 > > > --- > > > ObsoleteFiles.inc | 2 -- > > > 1 file changed, 2 deletions(-) > > > > > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > > > index 60707faebefc..d72aea5e8efc 100644 > > > --- a/ObsoleteFiles.inc > > > +++ b/ObsoleteFiles.inc > > > @@ -14840,11 +14840,9 @@ OLD_FILES+=3Dusr/share/man/man7/mmroff.7.gz > > > OLD_FILES+=3Dusr/share/man/man7/mwww.7.gz > > > OLD_FILES+=3Dusr/share/man/man8/apm.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/apmconf.8.gz > > > -OLD_FILES+=3Dusr/share/man/man8/apmd.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/dm.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/pam_ftp.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/pam_wheel.8.gz > > > -OLD_FILES+=3Dusr/share/man/man8/sconfig.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/ssl.8.gz > > > OLD_FILES+=3Dusr/share/man/man8/wlconfig.8.gz > > > OLD_FILES+=3Dusr/share/man/man9/CURSIG.9.gz > > > > > > > > -- > > Wolfram Schneider https://wolfram.schneider.org