From owner-freebsd-pkgbase@freebsd.org Mon May 13 03:23:36 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 CF92315A97D0 for ; Mon, 13 May 2019 03:23:36 +0000 (UTC) (envelope-from erisianash@gmail.com) Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7B6C194E74 for ; Mon, 13 May 2019 03:23:35 +0000 (UTC) (envelope-from erisianash@gmail.com) Received: by mail-pg1-x544.google.com with SMTP id h1so6008867pgs.2 for ; Sun, 12 May 2019 20:23:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-description:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=PCeMvKLrTp6oQIc7lw3q9DcVv4CAqhTGreEKGCGqkhY=; b=mIraCGP33j/vOzQWqlIJ/bGindaYSSET/GMWjJVWv+Frv+KcAeGByHdrEIcPl+kB4W FbHyNSf7Fteh7GZaspfbshD2cEYWbWCEhJ6iuTgQqrXxx0OL6RovFh1o53j95xT7g0Cq +FiQpP0X/WwUc8IDSiAW5yeUD7C7tRTABxKQAHmV5VYFpo3XVHHrrwcvy4HGH+CEhR1g zO2NbU1PorVaaP8bV+TodVcwdeQH8wuHrPInJR/Gn3sCoUTSC+kkrB0VNPLEq0sll0SA +5Nen/y0wBklx0w8aZsoI6sMv4D/o6bqlnnkgNvLM3hCevyFZ2vHXU0qyVu4+tBdCrCf nI4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-description:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=PCeMvKLrTp6oQIc7lw3q9DcVv4CAqhTGreEKGCGqkhY=; b=NGZdVUtpnvzN/UDQmqzIguyb9a1u4tuNlt9hnkdO8GugYTiKV3MIC/HxC/TmDZdj/o Xv+/6s+sXuKZ9/P26piJxezRZMFqfghdf1MZ4pO7LYWCnEGCiI4jn/z4LdguCxHsMYlF HAu0uoC+D/X6lNch1aCAF3agYWXg15Ei9mwXBu3WeK6bJI5+kKeDUGFaiG5iwV1F1dqA 9GdKu2U+Ca5MFIgK47VVZ3EHLh7ZIcjrrQooxxpgnuqzG16Hsc9/b8bXFSW1R/X571qQ DRj004WqPjiEw694mWvVElHdWtHHUNZTYaEY/CuoBt+2Wx0l4P0Zebx7pcviquDKDzHM JaAA== X-Gm-Message-State: APjAAAUOdh0f99NLHWmbApcEMzPy3xK13ZXrHWWg2RXETJM/3vn+a2jm aCWrxMu8JZmKURKzLpIRZX1zsLX6LyI= X-Google-Smtp-Source: APXvYqztvHzOJtdf1mHuZQIseX2zaieXZ8unnSG+3JocyMm5mbxzAuxGaA41cu4emSzhuol7RHyuKw== X-Received: by 2002:a63:7c54:: with SMTP id l20mr25367016pgn.167.1557717813899; Sun, 12 May 2019 20:23:33 -0700 (PDT) Received: from eris.lan (75-164-224-233.ptld.qwest.net. [75.164.224.233]) by smtp.gmail.com with ESMTPSA id z71sm30689702pgd.40.2019.05.12.20.23.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 May 2019 20:23:33 -0700 (PDT) From: Ashley Chase X-Google-Original-From: Ashley Chase Received: from achase (uid 1001) (envelope-from ErisianAsh@gmail.com) id 90073 by eris.lan (DragonFly Mail Agent v0.11+); Sun, 12 May 2019 20:24:04 -0700 Date: Sun, 12 May 2019 20:24:04 -0700 To: Emmanuel Vadot Cc: mj-mailinglist@gmx.de, freebsd-pkgbase@freebsd.org Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade Message-ID: <20190513032404.7iwcnu4kkfqsiok4@eris.lan> References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Description:  Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 7B6C194E74 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=mIraCGP3; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of erisianash@gmail.com designates 2607:f8b0:4864:20::544 as permitted sender) smtp.mailfrom=erisianash@gmail.com X-Spamd-Result: default: False [-4.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; NEURAL_HAM_SHORT(-0.84)[-0.839,0]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[4.4.5.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.75)[ip: (1.80), ipnet: 2607:f8b0::/32(-3.25), asn: 15169(-2.26), country: US(-0.06)]; FREEMAIL_CC(0.00)[gmx.de] 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 03:23:37 -0000 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: > > > Hi Ashley, > > > > I guess this change is the cause: https://reviews.freebsd.org/D20173 > > It marks the group and the master.passwd file for inclusion in the  > > FreebSD-runtime package. > > I tried this change on my 12 system, the files are included in the > > package. You also see them in the runtime.plist file, but as regular file, > > not marked as a config file, like the motd file for example. > >   > > ... > > @(root,wheel,0644,) /etc/group > > @(root,wheel,0600,) /etc/master.passwd > > @config(root,wheel,0644,) /etc/motd > > ... > >   > > i guess now the existing file is replaced by the new file, instead of beeing > > merged with it. > > i think, the tag "config" must be added to the above patch. But i am not sure, > > what the sytnax looks like for this. > >   > > -- > > Martin > >   > > > 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. > > >  > > > 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. > > >  > > > ~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@freebsd.org" > > >  > > _______________________________________________ > > 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=package=runtime"\ > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 -T > "tags=package=runtime,config"\ ${BIN1} ${DESTDIR}/etc; \ > - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > "tags=package=runtime"\ > + ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 -T > "tags=package=runtime,config"\ master.passwd ${DESTDIR}/etc; > > .if ${MK_TCSH} == "no" > > I'll try to test soon and commit. This resolved the issue. Thank you.