From owner-freebsd-pkgbase@freebsd.org Sat May 11 13:44:20 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 6B159159D665 for ; Sat, 11 May 2019 13:44:20 +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 D005889C42 for ; Sat, 11 May 2019 13:44:18 +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 3b6fa7c0; Sat, 11 May 2019 15:44:10 +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=jOqlBpVfH32ECOvpbkzFUdKpuN0=; b=fja9JcOVVOscZ7u9UkSsNfzlPD9t AxRItzJHYO8UBYNKao4omCDHm2sK9CrOQiSkCCfpbdnheNVNjNR72xtBdpk0gUJ/ ghb5MzHNx5bjylmMFq0Wh+YCLLJxmwekp/GBxmmov21L+l9Q3wBsvApflBwi12d1 TCY3skCFEo3pfLI= 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=iOYKVf00xIZHbgRIDb2OnpQRnr9hpESngDe7gOZwTt+D/+9EAtFvxna/ UQzg+KKPZoG4T3uLTBA1NrPeCgDxsUH7vhcOzLFFRoAESqObSEzShr0x/QsDT0Fk lQLcC2YfH6XRcdUTfRenrd5TnBPxYspHiMDc5b3vgzIwqFGDkfY= 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 e79d03e3 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO; Sat, 11 May 2019 15:44:10 +0200 (CEST) Date: Sat, 11 May 2019 15:44:10 +0200 From: Emmanuel Vadot To: mj-mailinglist@gmx.de Cc: freebsd-pkgbase@freebsd.org Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade Message-Id: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> In-Reply-To: References: 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: D005889C42 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bidouilliste.com header.s=mail header.b=fja9JcOV; 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.22 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[bidouilliste.com:s=mail]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:212.83.177.182/32]; MV_CASE(0.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; DMARC_NA(0.00)[bidouilliste.com]; NEURAL_SPAM_MEDIUM(0.06)[0.062,0]; NEURAL_SPAM_SHORT(0.40)[0.396,0]; NEURAL_HAM_LONG(-0.70)[-0.703,0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bidouilliste.com:+]; RCPT_COUNT_TWO(0.00)[2]; MX_GOOD(-0.01)[mx-backup.blih.net,mail.blih.net]; FREEMAIL_TO(0.00)[gmx.de]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; IP_SCORE(0.38)[ip: (-0.74), ipnet: 212.83.160.0/19(2.93), asn: 12876(-0.30), 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: 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: Sat, 11 May 2019 13:44:20 -0000 On Sat, 11 May 2019 15:23:21 +0200 mj-mailinglist@gmx.de wrote: > Hi Ashley, >=20 > I guess this=A0change=A0is=A0the cause:=A0https://reviews.freebsd.org/D20= 173 > 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 regular fi= le, > 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 bee= ing > merged with it. > i think,=A0the tag "config" must be added to the above patch. But i am no= t sure, > what the sytnax looks like for this. > =A0 > -- > Martin > =A0 > > After building and installing -CURRENT r347469 using in-tree pkgbase, 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, running > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeBSD-*"' > > to upgrade the packages and insure that new base packages got installed, > > 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://list= s.freebsd.org/mailman/listinfo/freebsd-pkgbase] > > To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@freebsd.o= rg" > >=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" Yes sorry that's my fault. I beleive the included patch should work but I don't have time to test right now. 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" I'll try to test soon and commit. --=20 Emmanuel Vadot