From owner-freebsd-pkgbase@freebsd.org Sun May 12 07:30:29 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 69E02158F81E for ; Sun, 12 May 2019 07:30:29 +0000 (UTC) (envelope-from mj-mailinglist@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8DF8C60D for ; Sun, 12 May 2019 07:30:28 +0000 (UTC) (envelope-from mj-mailinglist@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1557646219; bh=bHg76C1JTf1dQFfYXN8HpaIKPWTtsfcWw6j1nH+DozA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Wib6sLW712kZskFcku7102ReTHTlFRt4VxvL+t3zHWFWQGULRmr2rporKXWKfJ+bx IkpHtTU7vLj1/QTgLA9jVYpkqhKP4sqjSlf8tWPlx6YvL/+6loC6zVzEdTFYV/qdAI xWFavnEa2GeqdIdCnvoKEyPqS0lVdxnZpt9sDcCM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [89.245.32.253] ([89.245.32.253]) by web-mail.gmx.net (3c-app-gmx-bs32.server.lan [172.19.170.84]) (via HTTP); Sun, 12 May 2019 09:30:19 +0200 MIME-Version: 1.0 Message-ID: From: mj-mailinglist@gmx.de To: "Emmanuel Vadot" Cc: freebsd-pkgbase@freebsd.org Subject: Aw: Re: Existing passwd and group files overwritten by pkgbase upgrade Content-Type: text/plain; charset=UTF-8 Date: Sun, 12 May 2019 09:30:19 +0200 Importance: normal Sensitivity: Normal In-Reply-To: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> Content-Transfer-Encoding: quoted-printable X-UI-Message-Type: mail X-Priority: 3 X-Provags-ID: V03:K1:AalnGpoVYJcgBBHxP9SBfAR3H2c7FPn3PWo82LNhqp87YDJuC6hA9PdZ1Gj5aYw5J4KO8 4nwHLVix1hQUJotbtp6Choq/Zsp8e0IpjLiWOEowDZ/F8BxIIA/IyrRx1hRUvNmd4N5/PCH4qVsb bN8doERaqcE0wQZAQqHOd0zxfmP9xrkDSE/yTrHS2GU2mobxZqnNZd1iUsJqijy6BJco3fljBeUC RgUHOMjXKM+qCuwtqlzh0qnIcfbYlTejY9xZ0bjyEFFosdcPMc12Mr2mylZDR9F19ahk7U8qKuK7 ZE= X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:2OMadaBAt3c=:stJCC1mDv7YPFqgvWXxmiS 3QQ2UgL9Me9VoawzT/2tyE3uzEPcB7qX38fvVZ4fG2KTfMZW0P7nh2fZeZO80mbAu6enyg6hu 1rKlJAnFO76H/qQRLzp2TfdYYEH+V+MjKzHM/8X4M1q2nsjsYer9e+bJEn2mLPAlYB4dInqDf Ddhg35EFSXJGPJgTfeVSL+50Gb0v4GF+4EAXKOMJpwlM5OC3N6XQ51S8NS+bxDPCHU5F0NdpT FHfslPpGE0+qpy9wg6G7hIyYBpSklv72IisMf0nFz3SE9aGyWTGl2ReeNZAvDtTPWYOtZLGAp 4xIC9i2ooanOtv2isTP77XPxMizimXaTjDAjxpLjgmT4DqUun4d9bUp9HJmVdCEuXO4o4y6vX qJiSS3qaZDgl5PPlLD3bS0I+f9phDZ2Hj2q1Tnqcmt7RCE/+LgtxShG4HS5rt/XRDwpanGLfj V7+2Lqr1vjIdQMYyc1PA815wvhe4u/Cu3wVHBAMwrSCL7aVuM3+ToElQn0FaBQxTxSQQ8nwdm SoUcSsf+tNaz2HHFzDeEINv8KjqfE9u3Dm4rg31OdRiojtHL7+0EmWGAGkVRyUW0u++/eyntO NpLbd7ZrZ6uTCoDQw10Ld29KYVd8Osw9X31FyDZdHvJhktQMcS2Kb27g== X-Rspamd-Queue-Id: 4F8DF8C60D X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=Wib6sLW7; spf=pass (mx1.freebsd.org: domain of mj-mailinglist@gmx.de designates 212.227.15.19 as permitted sender) smtp.mailfrom=mj-mailinglist@gmx.de X-Spamd-Result: default: False [-4.07 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:212.227.15.0/25]; FREEMAIL_FROM(0.00)[gmx.de]; DKIM_TRACE(0.00)[gmx.net:+]; RCPT_COUNT_TWO(0.00)[2]; HAS_X_PRIO_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx00.emig.gmx.net]; NEURAL_HAM_SHORT(-0.91)[-0.914,0]; RCVD_IN_DNSWL_LOW(-0.10)[19.15.227.212.list.dnswl.org : 127.0.3.1]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmx.de]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; RECEIVED_SPAMHAUS_PBL(0.00)[253.32.245.89.zen.spamhaus.org : 127.0.0.10]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[gmx.de]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NO_DN(0.00)[]; IP_SCORE(-1.05)[ip: (-5.64), ipnet: 212.227.0.0/16(-1.52), asn: 8560(1.91), country: DE(-0.01)]; MID_RHS_NOT_FQDN(0.50)[]; 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: Sun, 12 May 2019 07:30:29 -0000 > > Hi Ashley, > > > > I guess this=C2=A0change=C2=A0is=C2=A0the cause:=C2=A0https://reviews= =2Efreebsd=2Eorg/D20173 > > It marks the group and=C2=A0the master=2Epasswd file for inclusion in = the=C2=A0 > > FreebSD-runtime package=2E > > I tried this change on my 12 system,=C2=A0the files are included in th= e > > package=2E You also see them in the runtime=2Eplist=C2=A0file, but as = regular file, > > not marked as a config file, like the motd file for example=2E > > =C2=A0 > > =2E=2E=2E > > @(root,wheel,0644,) /etc/group > > @(root,wheel,0600,) /etc/master=2Epasswd > > @config(root,wheel,0644,) /etc/motd > > =2E=2E=2E > > =C2=A0 > > i guess now the existing file is replaced by the new file, instead of = beeing > > merged with it=2E > > i think,=C2=A0the tag "config" must be added to the above patch=2E But= i am not sure, > > what the sytnax looks like for this=2E > > =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=2Epasswd, > > > /etc/pwd=2Edb and /etc/spwd=2Edb had been overwritten=2E > > >=C2=A0 > > > I encountered this after running 'make packages', installing into a > > > ZFS Boot Environment using bectl to create and mount a new BE, runni= ng > > > 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeBSD-= *"' > > > to upgrade the packages and insure that new base packages got instal= led, > > > and finally unmounting and activating the BE=2E > > >=C2=A0 > > > ~Ashley Chase >=20 >=20 > Yes sorry that's my fault=2E > I beleive the included patch should work but I don't have time to test > right now=2E >=20 > diff --git a/etc/Makefile b/etc/Makefile > index ab70a94bc761=2E=2E4b60868fe3dc 100644 > --- a/etc/Makefile > +++ b/etc/Makefile > @@ -69,9 +69,9 @@ distribution: > rc=2Efirewall ${DESTDIR}/etc; > =2Eendif > cd ${=2ECURDIR}; \ > - ${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=2Epasswd ${DESTDIR}/etc; >=20 > =2Eif ${MK_TCSH} =3D=3D "no" >=20 > I'll try to test soon and commit=2E >=20 > -- > Emmanuel Vadot I added the change to the Makefile and run make packages again, now the runtime=2Eplist entries for groups and master=2Epasswd have the "config" attribute: =2E=2E=2E @config(root,wheel,0644,) /etc/group @config(root,wheel,0600,) /etc/master=2Epasswd =2E=2E=2E -- Martin From owner-freebsd-pkgbase@freebsd.org Sun May 12 07:53:23 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 9879D159009D for ; Sun, 12 May 2019 07:53:23 +0000 (UTC) (envelope-from mj-mailinglist@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 747228CFED for ; Sun, 12 May 2019 07:53:22 +0000 (UTC) (envelope-from mj-mailinglist@gmx.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1557647593; bh=tr10akBb5vI1cyNNnFx+9WWsIebChdliKx82dheYkas=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=ZhuNyhqlft51onY99tqQdC74uE/JuCbH9nzFoQ7ZR5SPN3wyXKyZ/5m+ciIKZiibR kZEvpziUBmOtJ2TEkMpEBwMjx7GxmbuMhnjzhO2tJRgEe3/mkJHiGxBQmHAocywGp7 a/pKzn6brLPbUQfaEQtLHAK2mBQujD8YI9t7IhQ4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [89.245.32.253] ([89.245.32.253]) by web-mail.gmx.net (3c-app-gmx-bs32.server.lan [172.19.170.84]) (via HTTP); Sun, 12 May 2019 09:53:13 +0200 MIME-Version: 1.0 Message-ID: From: mj-mailinglist@gmx.de To: "Emmanuel Vadot" Cc: freebsd-pkgbase@freebsd.org Subject: Aw: Re: Existing passwd and group files overwritten by pkgbase upgrade Content-Type: text/plain; charset=UTF-8 Date: Sun, 12 May 2019 09:53:13 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:YFvjLJt9LxvfiCsRaQPzryXI1Ps/icu30nUbC9+H08329FyeMC6/+PSZ5YsWO1FRFz/rY n+g9LtlWrEOmMzOUHRzTV5O4EJNOqrPbR6LFHLxKCpfasJF6OndEylV+LTt+c91GpkW36lZmi3N4 lJa8x/f68sylxT9mwicQPIUPe7j/8qKBmM9+adiMmq5kvpj42joSL45c/YyvKtS+1ds3PZv1gXSL twHgJVqu2ihSRbMU4KPkROsExQIB54lKL4ojmMLVbqv3wXrAT8YNljSznrw+MSz7zDuzt5v7QhYL zI= X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:nUxGkF/hIek=:9AMroUUPWwuaqOj/coNjR1 Sp7/HUErr5pnFvVIuSI5a/V61gjvNTrGT3LPzGdlZP7oihBTnegNjfuoArbHCP+X3Z1n0qioc aOhzmN1UtzWRb0XAvBYuCGPxoRD+QLMeA4KUGArj50oRbUvW/zEtAO4QU1BgHeWw+WBRPmpJk 5DEiS7hxOqg/B4LxGXBuS0/vyoUT9C5CuPwHYtIQ0Lz07BdZF3zOQYMg8y43BK4d66Jwq0q/2 EWW6+wFgph18d+qcLvLuMfz4f5dDu3IjmhzPvWthqCAvPrpA4lQelgvM4ng9J5Wdj+XUfm17m 3tEDcse3JKF8LFyHt1Cnf3nsflGfO0b/tA2Gti67NUQ9nF/wXzvgR76KWGQnih0AjFbbUfiOT FL2/Bra0qwSW8NUtnY6hbKTq5EJyxW63Zj9XplSRh3XXwTbHM0cL69U8YcfriXiaDIGc7Y7Eg /9lMTutLpe+04gdl80CGnZI0tXTGMkfN6CGYTyb2DgUPG/4ZQIjnkD6r8H/nQ3xpoRRWr5J9a g6TVGyvmstSqpYxqjSsbhktJu2Dw1HLoeY4FUP2V7ZXrOOPoRd2AcL0zlPrG4YHtt20X05Cw1 CWaw/KNTPA3igWps4yYrmEYpu7s0VrmaLZCjaLki55ZZbwzcyjLC1k7g== X-Rspamd-Queue-Id: 747228CFED X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmx.net header.s=badeba3b8450 header.b=ZhuNyhql; spf=pass (mx1.freebsd.org: domain of mj-mailinglist@gmx.de designates 212.227.17.22 as permitted sender) smtp.mailfrom=mj-mailinglist@gmx.de X-Spamd-Result: default: False [-4.00 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:212.227.17.0/27]; FREEMAIL_FROM(0.00)[gmx.de]; DKIM_TRACE(0.00)[gmx.net:+]; RCPT_COUNT_TWO(0.00)[2]; HAS_X_PRIO_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: mx00.emig.gmx.net]; NEURAL_HAM_SHORT(-0.88)[-0.881,0]; RCVD_IN_DNSWL_LOW(-0.10)[22.17.227.212.list.dnswl.org : 127.0.3.1]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmx.de]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE]; RECEIVED_SPAMHAUS_PBL(0.00)[253.32.245.89.zen.spamhaus.org : 127.0.0.10]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.99)[-0.992,0]; R_DKIM_ALLOW(-0.20)[gmx.net:s=badeba3b8450]; MIME_TRACE(0.00)[0:+]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[gmx.de]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NO_DN(0.00)[]; IP_SCORE(-1.02)[ip: (-5.47), ipnet: 212.227.0.0/16(-1.52), asn: 8560(1.90), country: DE(-0.01)]; MID_RHS_NOT_FQDN(0.50)[]; 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: Sun, 12 May 2019 07:53:23 -0000 Just to add this info: i just upgraded my jail with packages created with the patched Makfile: all the user were still there after the update. So the fix works. -- Martin 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. 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 From owner-freebsd-pkgbase@freebsd.org Tue May 14 00:19: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 91B3D159EC96 for ; Tue, 14 May 2019 00:19:27 +0000 (UTC) (envelope-from kris@ixsystems.com) Received: from mail-it1-x12d.google.com (mail-it1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 ABF7874445 for ; Tue, 14 May 2019 00:19:25 +0000 (UTC) (envelope-from kris@ixsystems.com) Received: by mail-it1-x12d.google.com with SMTP id a190so2101744ite.4 for ; Mon, 13 May 2019 17:19:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ixsystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version:thread-index :content-language; bh=+/Be9Dpq7gppUDtlCP8+qRDXQDA5qO7qN1DXogdP+D8=; b=LFnHzwbMr/WpEJd2e5GiPTRvnijDCCryfEgkxqFVG/bOoJAXZJelWpx5FGUxhI5CK6 lKwXXhibK8ypOQ3tUpDv0lrwwpybmPMBJBTGLmCxS3KZQ+cIhG5pvITM467NlO0Fp878 mzgfbqm2Uv1zv26mizQ8NGmF/pt6JSK4qu6hvcf5wG57ywJDxWnucgIqUWcUsd9VAyvD ZnUT4fZnliGYJpa9ORFFtZW/myvP3fRdHgc3Wn36W4Ub5FAzneBxrM4erAwK6pY4D3vp /qYStqpvvaugs1CQFbfj3uLQVkVvukvI79qEU07NXCB9+V+zIp+aiwucK/opp+i8Xml/ XH3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :thread-index:content-language; bh=+/Be9Dpq7gppUDtlCP8+qRDXQDA5qO7qN1DXogdP+D8=; b=n0u1qQn2igXU6h5iOG84Yc33sGPZiarnOyG2mwxuNnLXSREP4oN47sDOVhlVdvyidW ye3LOfHraV7jXJW829YvVlpgnEUVMjebKntefM6h/jCCL4rs532AkXe6vAbiYO0+sI2g tqAV58+Nw0MzhYft+NmX8MpU6V1scHQXWnNgTZ4cVzzUCQnjC/MlX7JD3Yu1iRqKQWWf F+NZ6AgBJNNmT3EEdt3zkPMArnMjoRhVNMraM18KAVO9JbEDWC2/54vSuWwY7wyiqyZ/ OMTz05UJ28q7KZGYhx4YgE9fwQ8WJz6BqgZgqrtKrE44oHmwCTagOZdnGjGdpe1wmpZK DERQ== X-Gm-Message-State: APjAAAW/pFDBGn9GtG3hs0Ga684YpUUOyYV2TJox00t3G5QmARnqbeEL VH/q2nbkELYg79sSYd64v4jAp4Ip0DvD1rNxbYLoOjNSupIzyTcmfXDSZ1ym8wjdKiAoKlxrJhF C5e0Avv+fnHm/mcDe8GleIoq4jtw56lXYfsT1RLD7qVQqfQfRrwsYqgvqPvw8X9o9pjILWfmYFA == X-Google-Smtp-Source: APXvYqzV92q0N9RAZSI9kw1U2/7JBG8hUCuZThlwrG7MECNFjTPfd6LEjUAjYTe2Z7Qz10aRiJ2cJQ== X-Received: by 2002:a24:e10c:: with SMTP id n12mr1399424ith.89.1557793164282; Mon, 13 May 2019 17:19:24 -0700 (PDT) Received: from KrisYogaC930 ([66.171.165.146]) by smtp.gmail.com with ESMTPSA id n22sm4942815ioj.74.2019.05.13.17.19.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 17:19:23 -0700 (PDT) From: To: Subject: =?us-ascii?Q?Announcing_=22Flavored=22_base_packages?= Date: Mon, 13 May 2019 20:19:22 -0400 Message-ID: <03d801d509ea$aed6fd20$0c84f760$@ixsystems.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdUJ6ZxLDMqZp4F9QmKPOsRMVIAk0Q== Content-Language: en-us X-Rspamd-Queue-Id: ABF7874445 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=ixsystems-com.20150623.gappssmtp.com header.s=20150623 header.b=LFnHzwbM; dmarc=pass (policy=none) header.from=ixsystems.com; spf=pass (mx1.freebsd.org: domain of kris@ixsystems.com designates 2607:f8b0:4864:20::12d as permitted sender) smtp.mailfrom=kris@ixsystems.com X-Spamd-Result: default: False [-4.68 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; TO_DN_NONE(0.00)[]; URI_COUNT_ODD(1.00)[3]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[ixsystems-com.20150623.gappssmtp.com:+]; MX_GOOD(-0.01)[cached: ALT3.ASPMX.L.GOOGLE.com]; DMARC_POLICY_ALLOW(-0.50)[ixsystems.com,none]; SUBJ_EXCESS_QP(1.20)[]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; FROM_EQ_ENVFROM(0.00)[]; IP_SCORE(-2.88)[ip: (-8.81), ipnet: 2607:f8b0::/32(-3.25), asn: 15169(-2.26), country: US(-0.06)]; MIME_TRACE(0.00)[0:+,1:+]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[ixsystems-com.20150623.gappssmtp.com:s=20150623]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[d.2.1.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]; FROM_NO_DN(0.00)[] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: Tue, 14 May 2019 00:19:27 -0000 As a follow-up to our recent call for testing on base packages, I'd like to take a moment to announce that we've just merged and completed builds for base packages to be built with FLAVORS. What does this mean? It means with pkg it's now possible to switch between different types of base system builds. We've created three flavors for testing: 'generic' - Default FreeBSD world/kernel flags 'minimal' - Build with a bunch of WITHOUT flags set https://github.com/trueos/trueos-ports/blob/334b9246300fc5b9f7dc2057b48464ff 193f4f9d/Mk/Uses/os.mk#L72-L86 'zol' - Build of 'generic' FreeBSD flavor, but setting WITHOUT_ZFS and a dependency on 'sysutils/zol' How do I use one of these flavors? First of all, if you are running the pre-flavor package set we published in the CFT a couple of weeks ago, you'll need to follow these steps to switch to the package set with flavors: # pkg set --change-name userland:os-generic-userland # pkg set --change-name userland-base:os-generic-userland-base # pkg set --change-name userland-docs:os-generic-userland-docs # pkg set --change-name kernel:os-generic-kernel Repeat that process for lib32, debug, tests, or any other optional base packages you have installed. After you're finished switching to the flavors package set, run 'pkg upgrade' and it'll upgrade you to the new packages. You can also switch between flavor packages using a similar method. For example, to switch from the generic -> zol flavors: # pkg set --change-name os-generic-userland:os-zol-userland # pkg set --change-name os-generic-userland-base:os-zol-userland-base # pkg set --change-name os-generic-userland-docs:os-zol-userland-docs # pkg set --change-name os-generic-kernel:os-zol-kernel Repeat this process for any other base packages you have installed. "#pkg info | grep '^os-'" can help you find any other installed base packages. Word of caution!! --------------------------- No matter how tempted you are, avoid using 'pkg install' try and change flavors. Pkg will detect a conflict with the currently installed flavor and proceed to de-install it, destroying all your config files in /etc. That will ruin your day. Using name-changes and 'pkg upgrade' seems to be the safest route at this time, but please let us know if you find any other working alternatives. --------------------------- Lastly, I've updated the docs for pkg base on our FAQ page: https://trueos.github.io/pkgbase-docs/ Feel free to let me know if there's any problems with it, or if you have suggestions. Thanks! -- Kris Moore Vice President of Engineering iXsystems, Inc Ph: (408) 943-4100 Ph: (408) 943-4101 The Groundbreaking TrueNAS M-Series - Enterprise Storage & Servers Driven By Open Source 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 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 From owner-freebsd-pkgbase@freebsd.org Thu May 16 10:13: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 A8A6315902CC for ; Thu, 16 May 2019 10:13:05 +0000 (UTC) (envelope-from matthew@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 1488F6E8DD for ; Thu, 16 May 2019 10:13:05 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from smtp.infracaninophile.co.uk (smtp.infracaninophile.co.uk [81.2.117.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.infracaninophile.co.uk", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: matthew/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 9682117366 for ; Thu, 16 May 2019 10:13:04 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from liminal.local (unknown [IPv6:2607:fea8:be5f:f976:8d06:ea05:dee3:f7fc]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: m.seaman@infracaninophile.co.uk) by smtp.infracaninophile.co.uk (Postfix) with ESMTPSA id A57F5172BB for ; Thu, 16 May 2019 10:13:01 +0000 (UTC) Authentication-Results: smtp.infracaninophile.co.uk/A57F5172BB; dkim=none; dkim-atps=neutral Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade To: freebsd-pkgbase@freebsd.org References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> From: Matthew Seaman Openpgp: preference=signencrypt Autocrypt: addr=matthew@FreeBSD.org; prefer-encrypt=mutual; keydata= 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 Message-ID: Date: Thu, 16 May 2019 06:13:00 -0400 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2lXVAi8HgtnA2rHvr5q7NL0ubDp8ULBwB" X-Rspamd-Queue-Id: 1488F6E8DD 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_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.991,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: Thu, 16 May 2019 10:13:05 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2lXVAi8HgtnA2rHvr5q7NL0ubDp8ULBwB Content-Type: multipart/mixed; boundary="bB2StglsbLe1lABNTQiNeIgAE9Nir1DPx"; protected-headers="v1" From: Matthew Seaman To: freebsd-pkgbase@freebsd.org Message-ID: Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade References: <20190511154410.1a74fecbd8cecef669bb6acf@bidouilliste.com> <20190513032404.7iwcnu4kkfqsiok4@eris.lan> <20190513143917.fbdb507a97741a98e0eb823e@bidouilliste.com> <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> In-Reply-To: <00a80a0e-b71a-4d71-9f19-25db34d1d906@www.fastmail.com> --bB2StglsbLe1lABNTQiNeIgAE9Nir1DPx Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: quoted-printable On 15/05/2019 21:11, Brad Davis wrote: > 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: >>> >>>> 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=C2=A0change=C2=A0is=C2=A0the cause:=C2=A0https://revi= ews.freebsd.org/D20173 >>>>>> It marks the group and=C2=A0the master.passwd file for inclusion i= n the=C2=A0 >>>>>> FreebSD-runtime package. >>>>>> I tried this change on my 12 system,=C2=A0the files are included i= n 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, instead= of beeing >>>>>> merged with it. >>>>>> i think,=C2=A0the tag "config" must be added to the above patch. B= ut 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 pkgb= ase, 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 into= a >>>>>>> ZFS Boot Environment using bectl to create and mount a new BE, ru= nning >>>>>>> 'pkg -r $mounpoint upgrade -y' and 'pkg -r $mountpoint -yg "FreeB= SD-*"' >>>>>>> to upgrade the packages and insure that new base packages got ins= talled, >>>>>>> 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[https:= //lists.freebsd.org/mailman/listinfo/freebsd-pkgbase] >>>>>>> To unsubscribe, send any mail to "freebsd-pkgbase-unsubscribe@fre= ebsd.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@free= bsd.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. >>>> >>>> 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. >> >> Unfortunately this is going to break again when I commit this:=20 >> https://reviews.freebsd.org/D16728 >> >> But once this goes in, the files will be properly tagged as a config=20 >> file and merged properly in the future. >> >> Sorry in advance. >=20 > HEADS UP: This was committed as r347638. So, I'm getting this in the nightly e-mails from my pkgbase VM (now that I've fixed the mail system on it...): Checking for packages with mismatched checksums: FreeBSD-clibs-13.0.s20190515185144: /etc/hosts FreeBSD-clibs-13.0.s20190515185144: /etc/shells FreeBSD-runtime-13.0.s20190515185144: /etc/motd FreeBSD-runtime-13.0.s20190515185144: /etc/syslog.conf FreeBSD-ssh-13.0.s20190515185144: /etc/ssh/moduli FreeBSD-ssh-13.0.s20190515185144: /etc/ssh/sshd_config which I guess are just some more files that should be marked as config files? It make no sense for 'pkg check -s' to complain about mis-matched checksums here, as these files are meant to be user modified.= Cheers, Matthew --bB2StglsbLe1lABNTQiNeIgAE9Nir1DPx-- --2lXVAi8HgtnA2rHvr5q7NL0ubDp8ULBwB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEGfFU7L8RLlBUTj8wAFE/EOCp5OcFAlzdN6xfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDE5 RjE1NEVDQkYxMTJFNTA1NDRFM0YzMDAwNTEzRjEwRTBBOUU0RTcACgkQAFE/EOCp 5OcOihAAmAsKGHF40FKNROWTb3KOaK9gYwqXQmKmxdDAAHD+TRMpFmkx+XU/mc82 nBXDyRNWLhlSzH0qp5sVAiSS1CbXWgueItIUBA7IZNVVKW4AYVMLoM2b63xhXbYZ RDtk2TX0bEi2m9Y4Bfz919/IzgF7c1PJWHKIrxVadynzb6oMgsbsWW0ZfUFgtvtU wcN7O+0O6nWbJ1W/IZodfVskqUvssA27ExQkzX2Qe4VnFFEUZXxD3aylVcpPG3R8 6RhA/hJQCmt/A3+QROyIrRmpRvz2SSqZjZiLFEWWVmYd+t3QfPtiTOtHjuul1RlW SUbFrSCnMOaq2Wnzwl7CXkLcWQFZo0rpv4eevXZF24+OpwzM3FEELVWbxCOGdhxz t22ya2WSqyxc9etoDlEIligzkfctq/8PxV0+wkf76UYV9ZJ9YX67DukWsYgIIspN Dx+DLhTGczUGSqSHwJfNZ6oeJFaxotIG7E0Hp7EHS6BPK/HyeDN8WuJSfYD+ymhj laSF81yAcNrVX7QhdBJX39CTIZnq1E/kNNxhy9nvb3A77G1sj3jsMt/KCuV+8/Zt oMCXondOfUrZWh0CfaC4Bp/1xuaT75kV1LcV8HOpTCXWuITjBoIrdEivke93Ix7G ucv2tAoiacXUE7LpFFnd7wFQFw+Rh9lgf+BbOBXDGF829dCzYfA= =kGf4 -----END PGP SIGNATURE----- --2lXVAi8HgtnA2rHvr5q7NL0ubDp8ULBwB-- From owner-freebsd-pkgbase@freebsd.org Thu May 16 14:47:26 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 2F6741598ECB for ; Thu, 16 May 2019 14:47:26 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5DCBC81801; Thu, 16 May 2019 14:47:25 +0000 (UTC) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x4GElN7l055940; Thu, 16 May 2019 07:47:23 -0700 (PDT) (envelope-from freebsd-rwg@gndrsh.dnsmgr.net) Received: (from freebsd-rwg@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id x4GElN55055939; Thu, 16 May 2019 07:47:23 -0700 (PDT) (envelope-from freebsd-rwg) From: "Rodney W. Grimes" Message-Id: <201905161447.x4GElN55055939@gndrsh.dnsmgr.net> Subject: Re: Existing passwd and group files overwritten by pkgbase upgrade In-Reply-To: <58083f9a-f51a-4094-a728-fde6a2ec5442@www.fastmail.com> To: Brad Davis Date: Thu, 16 May 2019 07:47:23 -0700 (PDT) CC: freebsd-pkgbase@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 5DCBC81801 X-Spamd-Bar: ++ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [2.86 / 15.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_SPAM_SHORT(0.77)[0.767,0]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[dnsmgr.net]; AUTH_NA(1.00)[]; NEURAL_SPAM_MEDIUM(0.58)[0.584,0]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(0.05)[ip: (0.16), ipnet: 69.59.192.0/19(0.08), asn: 13868(0.05), country: US(-0.06)]; MX_GOOD(-0.01)[cached: gndrsh.dnsmgr.net]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_SPAM_LONG(0.58)[0.577,0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US]; MID_RHS_MATCH_FROM(0.00)[] 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 14:47:26 -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: > > > > > 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. > > > > 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://reviews.freebsd.org/D16728 I thought that both moved them and made them of type of config such that no breakage should occur, or is there something else that is going to cause merge master to fail here? On further review you are correct, that does not make these config files. > But once this goes in, the files will be properly tagged as a config file and merged properly in the future. Can you create this next neeeded diff and have that up in phab, so it can be reviewed, approved and committed right after D16728? Thanks, Rod > Sorry in advance. > > Regards, > Brad Davis -- Rod Grimes rgrimes@freebsd.org