From owner-svn-src-all@freebsd.org Fri Jul 26 13:04:34 2019 Return-Path: Delivered-To: svn-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 28BE3BF9CB; Fri, 26 Jul 2019 13:04:34 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.blih.net", Issuer "mail.blih.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 5165B8F7F8; Fri, 26 Jul 2019 13:04:33 +0000 (UTC) (envelope-from manu@bidouilliste.com) Received: from mail.blih.net (mail.blih.net [212.83.177.182]) by mail.blih.net (OpenSMTPD) with ESMTP id ac53f52c; Fri, 26 Jul 2019 15:04:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=mail; bh=7COCIE2Q02HrktGvhGJYpRRSTgY=; b=EtGgqnOrzv9nrMvvuDtpnfk9zJ8A 738DZwzEqi1qbAx5Mt0OYOS3IH0ga9jptoSNrveaCkgmGsCGfHvqQWBGu5hmbGgL e7cWjF5S8nKP4vtVHwA3nsfp5f9lLYVIcXtwm6ilsiuFHMJYlj456YHbgzAQDhnb 2HRfQfpWeq5CQOw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=bidouilliste.com; h=date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; q=dns; s= mail; b=OLfPR5sMzonZicRZyDxoavJmCZb1AuqMV25E5IodqqxglZzXFT2jvdy2 iTR8bKwWND0AZYyZiWkKOXl35699z0YZsmzTz9y9LjokYJ5FMHPg48STyCvqcj0L ZYZottyQ2KADWZdMXVP1SIDOl3BgUUiOyhgCZqHK6px/wpCJCFg= Received: from knuckles.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 46fea0d5 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Fri, 26 Jul 2019 15:04:31 +0200 (CEST) Date: Fri, 26 Jul 2019 05:23:45 +0200 From: Emmanuel Vadot To: Guido Falsi Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r350135 - head/share/mk Message-Id: <20190726052345.560b122cf2714bef73a2bf4f@bidouilliste.com> In-Reply-To: <0e851350-0967-ee2b-3655-b79d9abd38ed@FreeBSD.org> References: <201907191511.x6JFBWVi053537@repo.freebsd.org> <37944eff-6e00-df14-59d3-beae3fa89b6a@FreeBSD.org> <28eb9717-533e-3d87-0e30-f60317ed97cb@FreeBSD.org> <20190726051042.fcc4f6d969e19fb6f480977b@bidouilliste.com> <0e851350-0967-ee2b-3655-b79d9abd38ed@FreeBSD.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 5165B8F7F8 X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mail header.b=EtGgqnOr; spf=pass (mx1.freebsd.org: domain of manu@bidouilliste.com designates 212.83.177.182 as permitted sender) smtp.mailfrom=manu@bidouilliste.com X-Spamd-Result: default: False [2.38 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mail]; URIBL_BLOCKED(0.00)[bidouilliste.com.multi.uribl.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:212.83.177.182/32]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[bidouilliste.com]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_MEDIUM(0.88)[0.875,0]; NEURAL_SPAM_SHORT(0.93)[0.927,0]; DKIM_TRACE(0.00)[bidouilliste.com:+]; MX_GOOD(-0.01)[cached: mx-backup.blih.net]; NEURAL_SPAM_LONG(0.15)[0.147,0]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(0.34)[ip: (-0.99), ipnet: 212.83.160.0/19(2.62), asn: 12876(0.09), country: FR(-0.01)]; ASN(0.00)[asn:12876, ipnet:212.83.160.0/19, country:FR]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Jul 2019 13:04:34 -0000 On Fri, 26 Jul 2019 14:58:01 +0200 Guido Falsi wrote: > On 26/07/19 05:10, Emmanuel Vadot wrote: > > On Thu, 25 Jul 2019 00:17:31 +0200 > > Guido Falsi wrote: > > > >> On 25/07/19 00:14, Guido Falsi wrote: > >>> On 19/07/19 17:11, Emmanuel Vadot wrote: > >>>> Author: manu > >>>> Date: Fri Jul 19 15:11:32 2019 > >>>> New Revision: 350135 > >>>> URL: https://svnweb.freebsd.org/changeset/base/350135 > >>>> > >>>> Log: > >>>> bsd.confs.mk: Test the correct value for the destination package > >>>> > >>>> Reviewed by: bapt, gjb > >>>> Differential Revision: https://reviews.freebsd.org/D20961 > >>>> > >>> > >>> Hello, > >>> > >>> I don't know the actual workings of this file and have not checked it in > >>> depth, but this change is causing "make package" to not package > >>> /etc/rc.d/sshd (and others, all the ones being defined in > >>> ${group}PACKAGE variables), which are then missing when upgrading machines. > >>> > >>> Reverting this change makes packaging things work again. I think this > >>> change is actually wrong and the previous version was correct. > >>> > > > > /etc/rc.d/sshd is in the FreeBSD-sshd package, the other ones are also > > in their own package now, I'll check them all to see if that make sense. > > It makes perfect sense for that file to be in the FreeBSD-sshd package > and that was my first guess when looking for the missing file, but in my > case it was not present in that package. > > By reverting your change it appears to end up in the FreeBSD-runtime > package. Fresh build from today : elbarto@wopr> tar tzf FreeBSD-ssh-13.0.s20190726081149.txz /etc/rc.d/sshd /etc/rc.d/sshd elbarto@wopr> tar xzf FreeBSD-ssh-13.0.s20190726081149.txz +MANIFEST elbarto@wopr> jq < +MANIFEST | grep sshd "/etc/rc.d/sshd": "1$09d051563f89dbae0f54af42add15f9c16d5bf5c63a32d8eadc5127f665e4de9", "/etc/ssh/sshd_config": "1$7501d70e5186360c812b55cf0f0caff51169ca6764222f3fa668c09e8b5823a8", "/usr/sbin/sshd": "1$85772d32ba83cf6edd190fe48e949a358b08079a1dcc2c6a0de9addfe5075829", "/usr/share/man/man5/sshd_config.5.gz": "1$593bcd2338b124faf735825c52da8d9534f3e4b326a573590e8625f364017b57", "/usr/share/man/man8/sshd.8.gz": "1$729b894da4fa632be0ca6e06897943caca0e9d699a8a3c0ed33393e0b7ecec44", "/etc/rc.d/sshd", "/etc/ssh/sshd_config" > > > >> After sending this message I also noticed, it causes the spurious > >> "FreeBSD-zfs" package to be generated again. > > > > Not so spurious, it now contains the rc.d zfs related files. > > I think that I'll remove it anyway, it doesn't make sense. > > It does, but, again reverting your change, those files end up in the > runtime package. Yes reverting make those files end up in the runtime package, aka the default package used when no packages are specified. The change is good but will needs more tweaking in libexec/rc.d/Makefile so files endup when it make sense. > -- > Guido Falsi -- Emmanuel Vadot