From owner-freebsd-pkgbase@freebsd.org Mon May 13 12:39:27 2019 Return-Path: Delivered-To: freebsd-pkgbase@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52FA8158F2A1 for ; Mon, 13 May 2019 12:39:27 +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 0E020802C2 for ; Mon, 13 May 2019 12:39:25 +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 e2c21ae2; Mon, 13 May 2019 14:39:17 +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=ZNi+dQBmXgsNb7KM1o2pKi6qnA0=; b=tyuP88Gcm/d6FlzyVMyQV8iKYjUL uOajYr2g2SOqWKMikSD5VVPxL/A9kZT5JtZTQ1Xqu6foiUEgv4LIkbEauJgJ2hX/ 7EjU3XQUA/g+gQH5d3iv9hSbc6+r2lK3ENMn17wezp2qC6KwuNfRF7nrxil7k8k3 t1LQSdH2had7cLo= 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=AtGRdJ3JUawD4I2kzCelh2Tg18zJpNeXfucHhLax2lkBRTDAseMUDit2 LjJKPkXp/l7VqtNuccp17YkApHen2wfwUDwED4udFh4plYIlQDj/tlGQ0cDfDCp7 EMJ3nLMmEhfu5ov+9UtYQNjncBJj6czm59HWcJJyM+qwYHKgzRw= Received: from skull.home.blih.net (ip-9.net-89-3-105.rev.numericable.fr [89.3.105.9]) by mail.blih.net (OpenSMTPD) with ESMTPSA id 51d6c6b5 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Mon, 13 May 2019 14:39:17 +0200 (CEST) Date: Mon, 13 May 2019 14:39:17 +0200 From: Emmanuel Vadot To: Ashley Chase Cc: mj-mailinglist@gmx.de, freebsd-pkgbase@freebsd.org Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade Message-Id: <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> In-Reply-To: <20190513032404.7iwcnu4kkfqsiok4@eris.lan> References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; amd64-portbld-freebsd13.0) Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 0E020802C2 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mail header.b=tyuP88Gc; 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 [-0.32 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mail]; NEURAL_HAM_MEDIUM(-0.57)[-0.571,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:212.83.177.182/32]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[bidouilliste.com]; NEURAL_HAM_LONG(-0.84)[-0.839,0]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.63)[0.629,0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; MX_GOOD(-0.01)[mx-backup.blih.net,mail.blih.net]; FREEMAIL_TO(0.00)[gmail.com]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(0.37)[ip: (-0.73), ipnet: 212.83.160.0/19(2.93), asn: 12876(-0.32), country: FR(-0.01)]; ASN(0.00)[asn:12876, ipnet:212.83.160.0/19, country:FR]; FREEMAIL_CC(0.00)[gmx.de]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: freebsd-pkgbase@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Packaging the FreeBSD base system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2019 12:39:27 -0000 On Sun, 12 May 2019 20:24:04 -0700 Ashley Chase wrote: > On Sat, May 11, 2019 at 03:44:10PM +0200, Emmanuel Vadot wrote: > > On Sat, 11 May 2019 15:23:21 +0200 > > mj-mailinglist@gmx.de wrote: > >=20 > > > Hi Ashley, > > >=20 > > > I guess this=A0change=A0is=A0the cause:=A0https://reviews.freebsd.org= /D20173 > > > It marks the group and=A0the master.passwd file for inclusion in the= =A0 > > > FreebSD-runtime package. > > > I tried this change on my 12 system,=A0the files are included in the > > > package. You also see them in the runtime.plist=A0file, but as regula= r file, > > > not marked as a config file, like the motd file for example. > > > =A0 > > > ... > > > @(root,wheel,0644,) /etc/group > > > @(root,wheel,0600,) /etc/master.passwd > > > @config(root,wheel,0644,) /etc/motd > > > ... > > > =A0 > > > i guess now the existing file is replaced by the new file, instead of= beeing > > > merged with it. > > > i think,=A0the tag "config" must be added to the above patch. But i a= m not sure, > > > what the sytnax looks like for this. > > > =A0 > > > -- > > > Martin > > > =A0 > > > > After building and installing -CURRENT r347469 using in-tree pkgbas= e, I > > > > discovered that my /etc/group, /etc/passwd, /etc/master.passwd, > > > > /etc/pwd.db and /etc/spwd.db had been overwritten. > > > >=A0 > > > > I encountered this after running 'make packages', installing into a > > > > ZFS Boot Environment using bectl to create and mount a new BE, runn= ing > > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeBSD= -*"' > > > > to upgrade the packages and insure that new base packages got insta= lled, > > > > and finally unmounting and activating the BE. > > > >=A0 > > > > ~Ashley Chase > > > > _______________________________________________ > > > > freebsd-pkgbase@freebsd.org mailing list > > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase[https://= lists.freebsd.org/mailman/listinfo/freebsd-pkgbase] > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@freeb= sd.org" > > > >=A0 > > > _______________________________________________ > > > freebsd-pkgbase@freebsd.org mailing list > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@freebsd= .org" > >=20 > > Yes sorry that's my fault. > > I beleive the included patch should work but I don't have time to test > > right now. > >=20 > > diff --git a/etc/Makefile b/etc/Makefile > > index ab70a94bc761..4b60868fe3dc 100644 > > --- a/etc/Makefile > > +++ b/etc/Makefile > > @@ -69,9 +69,9 @@ distribution: > > rc.firewall ${DESTDIR}/etc; > > .endif > > cd ${.CURDIR}; \ > > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T > > "tags=3Dpackage=3Druntime"\ > > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T > > "tags=3Dpackage=3Druntime,config"\ ${BIN1} ${DESTDIR}/etc; \ > > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > > "tags=3Dpackage=3Druntime"\ > > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > > "tags=3Dpackage=3Druntime,config"\ master.passwd ${DESTDIR}/etc; > > =20 > > .if ${MK_TCSH} =3D=3D "no" > >=20 > > I'll try to test soon and commit. >=20 > This resolved the issue. Thank you. I'll come up with a different version of the patch, the problem with this one is that we install rc.bsdextended as a config file while it's not one. I also think that we should use CONFS for those file so the metadata will be added automatically. I've reverted the commits for now. --=20 Emmanuel Vadot