From owner-freebsd-pkgbase@freebsd.org Wed May 15 17:38:49 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 B1F85159A607 for ; Wed, 15 May 2019 17:38:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) 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 1F07596DBD for ; Wed, 15 May 2019 17:38:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from auth1-smtp.messagingengine.com (auth1-smtp.messagingengine.com [66.111.4.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: brd/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 07A33104EA for ; Wed, 15 May 2019 17:38:49 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailauth.nyi.internal (Postfix) with ESMTP id B425325B60 for ; Wed, 15 May 2019 13:38:48 -0400 (EDT) Received: from imap2 ([10.202.2.52]) by compute5.internal (MEProxy); Wed, 15 May 2019 13:38:48 -0400 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleekgddutdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefofgggkfgjfhffhffvufgtgfesth hqredtreerjeenucfhrhhomhepfdeurhgrugcuffgrvhhishdfuceosghrugeshfhrvggv uefuffdrohhrgheqnecuffhomhgrihhnpehfrhgvvggsshgurdhorhhgnecurfgrrhgrmh epmhgrihhlfhhrohhmpegsrhgrugdomhgvshhmthhprghuthhhphgvrhhsohhnrghlihht hidqjedtjeeifedvfedvqddukedtieelieekkedqsghrugeppefhrhgvvgeuufffrdhorh hgsehsohdugehkrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 193EA7C4CD; Wed, 15 May 2019 13:38:48 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.1.6-541-gda5ca9a-fmstable-20190515v2 Mime-Version: 1.0 Message-Id: <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> In-Reply-To: <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> Date: Wed, 15 May 2019 13:37:50 -0400 From: "Brad Davis" To: freebsd-pkgbase@freebsd.org Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 1F07596DBD X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.992,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] 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: Wed, 15 May 2019 17:38:49 -0000 On Mon, May 13, 2019, at 8:39 AM, Emmanuel Vadot wrote: > On Sun, 12 May 2019 20:24:04 -0700 > Ashley Chase wrote: >=20 > > 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=C2=A0change=C2=A0is=C2=A0the cause:=C2=A0https://re= views.freebsd.org/D20173 > > > > It marks the group and=C2=A0the master.passwd file for inclusion= in the=C2=A0 > > > > FreebSD-runtime package. > > > > I tried this change on my 12 system,=C2=A0the files are included= in the > > > > package. You also see them in the runtime.plist=C2=A0file, but a= s regular file, > > > > not marked as a config file, like the motd file for example. > > > > =C2=A0 > > > > ... > > > > @(root,wheel,0644,) /etc/group > > > > @(root,wheel,0600,) /etc/master.passwd > > > > @config(root,wheel,0644,) /etc/motd > > > > ... > > > > =C2=A0 > > > > i guess now the existing file is replaced by the new file, inste= ad of beeing > > > > merged with it. > > > > i think,=C2=A0the tag "config" must be added to the above patch.= But i am not sure, > > > > what the sytnax looks like for this. > > > > =C2=A0 > > > > -- > > > > Martin > > > > =C2=A0 > > > > > After building and installing -CURRENT r347469 using in-tree p= kgbase, I > > > > > discovered that my /etc/group, /etc/passwd, /etc/master.passwd= , > > > > > /etc/pwd.db and /etc/spwd.db had been overwritten. > > > > >=C2=A0 > > > > > I encountered this after running 'make packages', installing i= nto a > > > > > ZFS Boot Environment using bectl to create and mount a new BE,= running > > > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "Fr= eeBSD-*"' > > > > > to upgrade the packages and insure that new base packages got = installed, > > > > > and finally unmounting and activating the BE. > > > > >=C2=A0 > > > > > ~Ashley Chase > > > > > _______________________________________________ > > > > > freebsd-pkgbase@freebsd.org mailing list > > > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase[htt= ps://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase] > > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@= freebsd.org" > > > > >=C2=A0 > > > > _______________________________________________ > > > > freebsd-pkgbase@freebsd.org mailing list > > > > https://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@fr= eebsd.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. >=20 > 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. Unfortunately this is going to break again when I commit this: https://r= eviews.freebsd.org/D16728 But once this goes in, the files will be properly tagged as a config fil= e and merged properly in the future. Sorry in advance. Regards, Brad Davis