From owner-freebsd-pkgbase@freebsd.org Thu May 16 01:12:05 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 B7D8015A8218 for ; Thu, 16 May 2019 01:12:05 +0000 (UTC) (envelope-from brd@so14k.com) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9F1258186B for ; Thu, 16 May 2019 01:12:03 +0000 (UTC) (envelope-from brd@so14k.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id B44682473D for ; Wed, 15 May 2019 21:11:57 -0400 (EDT) Received: from imap2 ([10.202.2.52]) by compute2.internal (MEProxy); Wed, 15 May 2019 21:11:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=so14k.com; h= mime-version:message-id:in-reply-to:references:date:from:to :subject:content-type:content-transfer-encoding; s=fm2; bh=GW4e4 jt0q1jtxVhgh3rqClHzwCxtHBPTd813rwyfJu0=; b=XhLEQ3nB3N2xMiYj32s0P DaIQe77AarQkxJI5D+10R7kdzZI0GGFrOjhqMLOKAe5BkxKddKz5Mufdx12KS/5F DDc06TCLUhzIPQjmahAytzc/IKz841Fbpc4wdzcVOc1hkoUY2B9H4xv/BLUk7PMX iYp6UT7FmD2654pAgasZDLqX3agSTSSVGUwB5ny9ulflPW4xEB/Nq31Rl6ZGpmiy YT+16jPtDVtHH7BEy9+bN4+x0pVLLe6hRLsd0HyReCp/Wc9ibctdYK0fQugqjPml sNKi7s8th9SK9Qit6TZLjO/jkhiywiI7iVQ5fMEAYPq6W6D88YrtaBQHOuhaAaXO Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; bh=GW4e4jt0q1jtxVhgh3rqClHzwCxtHBPTd813rwyfJ u0=; b=hnuU8VE0i+4HYTzH+W99rZ2aK0o6byYTzcgcs2GMntyjaSRnu/1BG4kxM 9d8vojuSUFeHCd+1YwajZquhdk/eqTmURSbLissyvMotkymXeIr0CgKA5nNahNmM AO5cslIcRGiIyxxg4uvHulcjMhm8dENMuq1WeFYxOSVmZtbgkiCjz7UCKA+mmgHK Y47xWo6hY4r/T3CFkpC4yOEu/tnDrHGVYRtRESyFBpf7cs4oQTs0DdqKsSz8PeGZ Jhpttvl8jN0yTGgJAmkiEHWuZ33hZ/6XmIPDawcGe3HXcAE4Z4CiUumfSOw/xPu+ hzgN82eqQyuPhrvfkUVnCUJdRpCZA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrleelgdegvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvffutgfgsehtqh ertderreejnecuhfhrohhmpedfuehrrgguucffrghvihhsfdcuoegsrhgusehsohdugehk rdgtohhmqeenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucfrrghrrghmpehmrg hilhhfrhhomhepsghrugesshhoudegkhdrtghomhenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id F12647C3E9; Wed, 15 May 2019 21:11:56 -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: <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> In-Reply-To: <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> Date: Wed, 15 May 2019 21:11:56 -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: 9F1258186B X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org; dkim=pass header.d=so14k.com header.s=fm2 header.b=XhLEQ3nB; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=hnuU8VE0; spf=pass (mx1.freebsd.org: domain of brd@so14k.com designates 66.111.4.27 as permitted sender) smtp.mailfrom=brd@so14k.com X-Spamd-Result: default: False [-6.00 / 15.00]; XM_UA_NO_VERSION(0.01)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[so14k.com:+,messagingengine.com:+]; MX_GOOD(-0.01)[in2-smtp.messagingengine.com,in1-smtp.messagingengine.com,in2-smtp.messagingengine.com,in1-smtp.messagingengine.com,in2-smtp.messagingengine.com,in1-smtp.messagingengine.com,in2-smtp.messagingengine.com,in1-smtp.messagingengine.com,in2-smtp.messagingengine.com,in1-smtp.messagingengine.com,in2-smtp.messagingengine.com,in1-smtp.messagingengine.com]; NEURAL_HAM_SHORT(-0.99)[-0.994,0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; IP_SCORE(-3.41)[ip: (-9.30), ipnet: 66.111.4.0/24(-4.46), asn: 11403(-3.22), country: US(-0.06)]; RCVD_IN_DNSWL_LOW(-0.10)[27.4.111.66.list.dnswl.org : 127.0.5.1]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[so14k.com:s=fm2,messagingengine.com:s=fm2]; URIBL_BLOCKED(0.00)[messagingengine.com.multi.uribl.com,so14k.com.multi.uribl.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; DMARC_NA(0.00)[so14k.com]; RCPT_COUNT_ONE(0.00)[1]; MID_RHS_WWW(0.50)[] 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: Thu, 16 May 2019 01:12:06 -0000 On Wed, May 15, 2019, at 1:39 PM, Brad Davis wrote: > 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://= reviews.freebsd.org/D20173 > > > > > It marks the group and=C2=A0the master.passwd file for inclusi= on in the=C2=A0 > > > > > FreebSD-runtime package. > > > > > I tried this change on my 12 system,=C2=A0the files are includ= ed in the > > > > > package. You also see them in the runtime.plist=C2=A0file, but= as 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, ins= tead of beeing > > > > > merged with it. > > > > > i think,=C2=A0the tag "config" must be added to the above patc= h. 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= pkgbase, I > > > > > > discovered that my /etc/group, /etc/passwd, /etc/master.pass= wd, > > > > > > /etc/pwd.db and /etc/spwd.db had been overwritten. > > > > > >=C2=A0 > > > > > > I encountered this after running 'make packages', installing= into a > > > > > > ZFS Boot Environment using bectl to create and mount a new B= E, running > > > > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "= FreeBSD-*"' > > > > > > to upgrade the packages and insure that new base packages go= t 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[h= ttps://lists.freebsd.org/mailman/listinfo/freebsd-pkgbase] > > > > > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscrib= e@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@= 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. > >=20 > > I'll come up with a different version of the patch, the problem wit= h > > 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 metadat= a > > will be added automatically. > > I've reverted the commits for now. >=20 > Unfortunately this is going to break again when I commit this:=20 > https://reviews.freebsd.org/D16728 >=20 > But once this goes in, the files will be properly tagged as a config=20= > file and merged properly in the future. >=20 > Sorry in advance. HEADS UP: This was committed as r347638. Regards, Brad Davis