From nobody Mon Mar 4 10:14:25 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpF0y6R4Pz5CKQp for ; Mon, 4 Mar 2024 10:14:26 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpF0y4rpnz4mKt; Mon, 4 Mar 2024 10:14:26 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709547266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CkXRLEQocGYlqqovCkcJsFOZwCEBWt+85woK15I3IJo=; b=XLWgp/rOrHP6jljTbWSKElmAZlGUrXUk/y5pow1VM8mFzjOkoMMZgoEftf+qB6VRFHjhKY Vif/5oMPxS2MDL0OoKNJSCJEpSWVVrm/64vjyCwIj8hVHiRhaZlaNNvKiMUeAfbvx3wkhd tnRdjQZDXSgnVhD++kvYBCQiHkk22zrB906zaCjl+YbdgT5u4g9Fv316ZlAO5yaiaW38fh 0rcl1vky37ZvXJHbNg2tHW3dOb9AYBz0MWde9AzHFO7Sg7Bo7fgML/Mq2kMfL2HqP/I0B0 WMQafbpuF1zWZfgd0L19UUhDJ0TzNW8dBgUwmKIYQg09zNvgpiJZryT0s1Semg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709547266; a=rsa-sha256; cv=none; b=ldor98XtJXbnufHYiNZ6UVG3Vcm6vM60oJ+MH4wQ+XJsxsys/TKpvJO+X13BXvgcOJDtbk rvqKpZI0wcoeZ4EWm7kzOiW+d6zjOWYadUMwzkuSYptI6RJfIHL542HoVYWlklJrfJr5BR q4VBC/h4LPXl4RQXPVZ3oP+KlF4EMB54k0SEvTjyJeBjjAtMlP/tITeh6V5qln08tpoaYY OC62yhoEH1ZiYaTju+8x3DwPuRZOmLVjw1sOu3ZQ+li1on1LBFmxKZFUPJ3R4k+/57PA+p HyIpBTtEaaWCT50UIQqcM1K68PFG76eEq/VMJABBa01OR4QnKiCJqA1fThCd5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709547266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CkXRLEQocGYlqqovCkcJsFOZwCEBWt+85woK15I3IJo=; b=IOzFsOQAxlc3WJLKO04unhc1qdNdQt+vBfoWNPRSKdAl7zKNr8PyfRwWcP78PC8vBBfV/U 8n1JUuPTI0z6dFbR7Bx1nkOHwHFLATPjnJALHyqjR2UgQUFRRDyTWUAs0gMbUPyoE2JBQI fK4kcVWZclyp6GdS9nS5UnGX42MSvw/Zyh3FeC2j7877428r/8KjFKKMQsP8XnmgnwTpSJ fjkBSWwCU9RgeGZC/K5AIRQKUPqbNf8KMQ9Z5LbNO+s4ljrZAvFRUuNqGwRO7lPOskdvvs pcFUJRBrlWrSDolFnUbC3zWuBx5vVTEC0yYbcu+uZkBx3Pr5TMuNXZ98lHo9cA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TpF0y3nDmzJ5W; Mon, 4 Mar 2024 10:14:26 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 3666C123983; Mon, 4 Mar 2024 11:14:25 +0100 (CET) Date: Mon, 4 Mar 2024 11:14:25 +0100 From: Baptiste Daroussin To: Lexi Winter Cc: freebsd-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges Message-ID: References: List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Sat, Mar 02, 2024 at 04:43:28AM +0000, Lexi Winter wrote: > hello, > > could someone briefly explain how pkgbase handles merging of > configuration files, for example /etc/master.passwd? does pkg have a > built-in 3-way-merge system similar to etcupdate(8) to handle this, or > is it done another way? > > thanks, lexi. Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the file is properly marked as a config file i the source tree which is the case of master.passwd Best regards, Bapt From nobody Tue Mar 5 06:02:41 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TplN633bdz5BvWY for ; Tue, 5 Mar 2024 06:02:46 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TplN540dlz42JK for ; Tue, 5 Mar 2024 06:02:45 +0000 (UTC) (envelope-from grahamperrin@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=nctdscQv; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of grahamperrin@gmail.com designates 2a00:1450:4864:20::42b as permitted sender) smtp.mailfrom=grahamperrin@gmail.com Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33e285a33bdso1751213f8f.2 for ; Mon, 04 Mar 2024 22:02:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709618564; x=1710223364; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=0p3H+bTLVxS6IuY3t4j720ZYJxCUeA97qCxVQHZlIe4=; b=nctdscQvr7PidpCtn0RZUtIQsSG7fLL9wXxUfuBWfPi87Z7MXmvzSB8ct7sjE9Sr5a xf6oSlaMrEEA7TUJmTs0dqMVXp2R9tliB6uKMtR+y/xSzRBkPkhRfkaFQjF/4o+82BMu s+mDiXDtrVmFe2XbSqr9eosIk/dfSrozykvWOjLXK3fxfLRt/clDKqQgCpqJ1kO/oDzC 0rR3Wfh1SjKQxfuvoeptd0jeeCDLhAfTF6p4/hnISNxTml7e7kaNGZaSzkpHTdHSWnNJ Uk5FB1qIxGDoWk8JW/u30UQIoXW7MGMt/Mj7zJ3SmTveCWBu59qnkoxCgJkZCpAVOV5W PnJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709618564; x=1710223364; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0p3H+bTLVxS6IuY3t4j720ZYJxCUeA97qCxVQHZlIe4=; b=W7oU15htOyB6K3y866KBviFExmtlEuRfaSvYf53f1kYG0Q9ag+jnj/BNmaVKoZOpyD 0yji3bfb1ntipZ7g21/qWFhzdIdlKqL0F6e9gD5R7jeEZwqkeWJjboBI7wj+yd+VmBtQ FkyA2UGDGEzvMmKp3fk+QRngp5KCCPtJiFKkbDLCzZenfhu7uk/FPh3Zvsw15O4cFyJL ClyG1+j2W367eU/Xt7c3tLq4Rr8/9ZIDtpwmML5utRMX1rVSeyKP4luxQkG8PGlyg6rq MBFEJbgbZh0vBq5paBwk+kMYdzfrpeq1GsvcmRu7h29Ves1ipOUnX4J1CgLHZ09sQhXY fKxw== X-Gm-Message-State: AOJu0Yy69ihRYxO4hkfSVD+WDXUUi0qGqbWVTu1o/W+jao0lNWPXoCFW vr7Z3FsSSjpIP4FX/ko97+znJ+YpL4fIqjQXdMkUUcaKr8V+JcNkTy6CtZ+2 X-Google-Smtp-Source: AGHT+IG92Puo/R9M03erm5XYjtdAHfKnCGGXe1NRczj7ZDWBWfBcrhrlbXTXpgn+Rz1r7se5xCAfpg== X-Received: by 2002:adf:e6cc:0:b0:33d:6fd8:90d3 with SMTP id y12-20020adfe6cc000000b0033d6fd890d3mr7583499wrm.4.1709618563658; Mon, 04 Mar 2024 22:02:43 -0800 (PST) Received: from [192.168.1.10] (host-92-22-93-189.as13285.net. [92.22.93.189]) by smtp.gmail.com with ESMTPSA id bn20-20020a056000061400b0033e43756d11sm3164531wrb.85.2024.03.04.22.02.42 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 Mar 2024 22:02:42 -0800 (PST) Message-ID: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> Date: Tue, 5 Mar 2024 06:02:41 +0000 List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: pkgbase and config file merges To: freebsd-pkgbase@freebsd.org References: From: Graham Perrin Content-Language: en-GB Autocrypt: addr=grahamperrin@gmail.com; keydata= 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 Cyw= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.99 / 15.00]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[grahamperrin]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[freebsd-pkgbase@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::42b:from] X-Rspamd-Queue-Id: 4TplN540dlz42JK On 04/03/2024 10:14, Baptiste Daroussin wrote: >> … > Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the file is > properly marked as a config file i the source tree which is the case of > master.passwd > > Best regards, > Bapt Thanks, that's a very pleasant surprise, is outdated? (Answered in 2012; .) Is still, partly, an issue? – pkg(8) deinstall and then reinstall of FreeBSD-runtime leads to wiping out `/etc/master.passwd` and `/etc/group` · Issue #1845 · freebsd/pkg From nobody Wed Mar 6 08:50:45 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqR3Y37pwz5C6tj for ; Wed, 6 Mar 2024 08:50:49 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqR3Y2gpFz4qGb; Wed, 6 Mar 2024 08:50:49 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709715049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MHQXVPTwGjlb7WbD/eBmLxSgkxk5vH4Faaa0SWTFDiU=; b=Jwn6QWyLCyrytKLMkxksVpUuejPzVDZCjBlkgiVpU9qdYND3N9IOUI0iLJXXQNQDplDVM6 RAghPPjxQm/rbXPT2prVezV2FUwNOGEUkhKsP9C3qJ9PtVZ/cv2y+2EZ+YDR2dIUH+2MM2 Dy18OyVMO0K8sQrZx1SbJUx9SNjE4VMHWdgJhsoifjnfYtzXxSbNq7Lyet2EdENJ0dzoDr CRC/0V8WPdJfNKfiWSMWnCBQLx7p4YGSE3v76Uj4s1IdhAMcQ3rYNrXZ7Kl9sfhmg50bwu pb1dq+eT/nH26N9EFkKm0Fcf81ulo6zP6aRCxKRYiAn7QWrtIcEueTPmV+fFdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709715049; a=rsa-sha256; cv=none; b=GAqyTqIEpoV4paFMx3jbfv+GBo6C2ZXSOut+RdBpHRSPc/oHMH0bzuQEJVnfd6Gw305lzO +PTQ7jN5vgzdY2nc2ajz3+dLzB+EV8cjhJxjzjYK5+lkryin0u59v5bHo26cdI/tWldW6O V8kjGbiMQBnw+qWY+w8b7djzuoMLQlG2QuEIr/w3bIt6N9eHVGS5lbWm7kwmeUaHPTS7Fo 9dI6pIpiie6G1JOTnKGYutecTh/N12mG7W3GQDqoO0cBYHskWpopHemIvKR+gM58wHzoPd exnGI422Vxma7FupK+q8F8G426nfRuollMv8RJXjWo9dXhLnhbOMb2pCNA/CQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709715049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MHQXVPTwGjlb7WbD/eBmLxSgkxk5vH4Faaa0SWTFDiU=; b=gPeSm+qv28syEJAqy1A252aKcszo/YNkBKntJ9gYqcdQ3S1WEd2nk88UaFpDYut4N9b+NG jxjRiH6y9oKyXU9hlHDnrtFzsBYm/EzZ9iP/NXGBKR3fkcI18ref8dvdhqrhLPn1aWfI70 +QHUsEIqtxocz5IkvmNm6GWlbnXRuTUf6CkaqNP9xt9pw7H00xrsPRYU5/wKCWhaeY8sJ4 ql5LoxASs632lCQvmEYgu2OFbb57HZ9Wmz0mFagkq31xtX5Ojy9EqJC6laOHg6yBQv0AA8 pjXqlE6AJZ0/LqHUCgLSZEVzyKEuFWFq/P89KWhHZrRqMw6x5kvkOJOP6msweA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqR3Y1bWvzFM8; Wed, 6 Mar 2024 08:50:49 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id E5213126C62; Wed, 6 Mar 2024 09:50:45 +0100 (CET) Date: Wed, 6 Mar 2024 09:50:45 +0100 From: Baptiste Daroussin To: Graham Perrin Cc: freebsd-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges Message-ID: <2i4vs2rmlpqssl5wyrzhn5izyvuoxz2rmfjbjlaaq6exuqbllm@e436o6dw7nx3> References: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> On Tue, Mar 05, 2024 at 06:02:41AM +0000, Graham Perrin wrote: > On 04/03/2024 10:14, Baptiste Daroussin wrote: > > > … > > Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the file is > > properly marked as a config file i the source tree which is the case of > > master.passwd > > > > Best regards, > > Bapt > > Thanks, that's a very pleasant surprise, is > outdated? > > (Answered in 2012; .) No this is not outdated. > > Is still, partly, an issue? > > – pkg(8) deinstall and then reinstall of FreeBSD-runtime leads to wiping out > `/etc/master.passwd` and `/etc/group` · Issue #1845 · freebsd/pkg > this is not an issue, this is expected. Best regards, Bapt > From nobody Wed Mar 6 16:59:36 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqdvj1R6Wz5Cw9k for ; Wed, 6 Mar 2024 16:59:45 +0000 (UTC) (envelope-from marquis@roble.com) Received: from mx5.roble.com (mx5.roble.com [209.237.23.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx5.roble.com", Issuer "mx5.roble.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqdvh5c7yz4l2r; Wed, 6 Mar 2024 16:59:44 +0000 (UTC) (envelope-from marquis@roble.com) Authentication-Results: mx1.freebsd.org; none Received: from roble.com (roble.com [209.237.23.50]) by mx5.roble.com (Postfix) with ESMTP id 72D01D288; Wed, 6 Mar 2024 08:59:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=roble.com; s=rs060402; t=1709744376; bh=jV2V3wYFE+e8q98fxeieMDyE74ihy/dDjv462YUvexc=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=BB4IiugLQn6j7ri2gIvkcBTJ2hxpVZMxOdndO5a3K6WCvYO0ArD1gvrk34iH+Odbb yORZ6Fh9Htardr2aYjmlWl/tfIjqeAcqS5kScTMwNBoMRme4yQMbW5ph5gH3S9YTCP zEpt1RJbIwYF2eLZdd3CJcZAsNG6kbu2XVg+7OFc= Date: Wed, 6 Mar 2024 08:59:36 -0800 (PST) From: Roger Marquis To: Baptiste Daroussin cc: Graham Perrin , freebsd-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges In-Reply-To: <2i4vs2rmlpqssl5wyrzhn5izyvuoxz2rmfjbjlaaq6exuqbllm@e436o6dw7nx3> Message-ID: <5ns1p95s-n316-22qs-63p2-q6246q043802@mx.roble.com> References: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> <2i4vs2rmlpqssl5wyrzhn5izyvuoxz2rmfjbjlaaq6exuqbllm@e436o6dw7nx3> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:17403, ipnet:209.237.0.0/18, country:US] X-Rspamd-Queue-Id: 4Tqdvh5c7yz4l2r Automatically overwriting files like passwd is clearly a problem. Preferred solution would be a list, say [never_overwrite] and/or [ask before overwriting] and/or [write diff to /var/db/pkgbase/...] in /etc/defaults/pkgbase specifying existing files that should never be modified without at least a dialog. This plus the cleanup of pkgsave files which should only be written to /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the blockers to more widespread adoption of packagebase and, ideally, make it mandatory or at least the default option in the next version of FreeBSD. Roger > On Tue, Mar 05, 2024 at 06:02:41AM +0000, Graham Perrin wrote: >> On 04/03/2024 10:14, Baptiste Daroussin wrote: >>>> ? >>> Pkg has 3-way merge code, so it is similar to etcupdate(8) provided the file is >>> properly marked as a config file i the source tree which is the case of >>> master.passwd >>> >>> Best regards, >>> Bapt >> >> Thanks, that's a very pleasant surprise, is >> outdated? >> >> (Answered in 2012; .) > > No this is not outdated. >> >> Is still, partly, an issue? >> >> ? pkg(8) deinstall and then reinstall of FreeBSD-runtime leads to wiping out >> `/etc/master.passwd` and `/etc/group` ? Issue #1845 ? freebsd/pkg >> > this is not an issue, this is expected. > > Best regards, > Bapt >> > > > > From nobody Wed Mar 6 17:24:18 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqfS52kSZz5CyYF for ; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqfS51vsrz4nhF; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BijnUN4vyCZB67LlVFLpETUB+R7ZI4UOk3z6i8FMpiI=; b=DtZKRmqtCwtXLGeniM7pgAv/+37xM3/1XPn4IqEz8XP34F115tJLija4ef1zGk7ejaDhi4 fehNqz0maZQJylJRhjanRAEcA9bLsoRdasyBjYdqHBIb1h0gYqqG5c9wfvHD8UvnygoSWJ jZWC61+Q8ALZM3I5cLw2suI/dflu9D8iBr8H2KK+bkUJEdBLn2FaU7uIiHcecAGq4+DSb4 2TSwHDCyOlAkpk8tpazC/09dPsRLMuShZX6qPNh/kdgYNV0kV/cOUNT6/a3UxIuh8abtRK 2mEsijuT7au5Oh0IpTFVy0SlzCRXpc1dIyT2U28aRqhK7orI6m0Y+xzf5bR/dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709745861; a=rsa-sha256; cv=none; b=Pf9nGWDE8tW+/wyCzGSK1vEU9XG4b5bp9DyExsiutGDoQFWiTifa0RXToAXfjXqnEl4Rm4 NZ3e5Zr08Ck4g0AXBtpRTpbnSj9L429Llu4pZB3++E6suX4Wc1WmcXh/lyqTWqjzAj5zXa g4+sZO1qC/Mn98sm0xwx77TBMWvjdKP3Ai+h1I3FeHVRUCZdNhT3I5jZMHa7IlFJ71xmCY MBq9wTzvr0CCoYM4lv5h7OQdD7/60ohkw86B4+8WZP3IiOYw6EbJRCceozGz5gUrE/zWA8 kkQGUxTW3CUBklQCb32zucqU5Ru9OwVMcdNlRq+ENzbhn6ClZiZp18bZJfbqNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=BijnUN4vyCZB67LlVFLpETUB+R7ZI4UOk3z6i8FMpiI=; b=Gr6nP/6L71BO8vlOQOBXXv+kUnZjOxtujoZ6EG6M8jgenLTXanl6IBAqD++mAT5Gc41AqR 2/trhIPQHy/X3Y9dazM3zc7qJY2YdsgUIHAQ2rkCAW4TNOoRLA6/dOZA0t7Z5VuCD+f8e2 z0XplVjp71O8oOsJnISBT4JdrrrITuL+1KgpmJ8oO/upuQapqH9rwFMhMrpC88xGkWWnbK gMNvdtYQuJDgIxPeeK3ccfGpl2taRT2LNZ0AxiAW5863P6kwTmL9RNT/7mwq+ypqnF0EV4 D3HYqTTRvDhohTrgif+vHk3Pk9+T2vZuGyx3nsM+tjOz02RNtvUVPW9CEbS1XQ== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqfS50psgzPv9; Wed, 6 Mar 2024 17:24:21 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id ADF2E1B0023; Wed, 6 Mar 2024 18:24:18 +0100 (CET) Date: Wed, 6 Mar 2024 18:24:18 +0100 From: Baptiste Daroussin To: Roger Marquis Cc: Graham Perrin , freebsd-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges Message-ID: References: <8137de78-e205-4e7c-a25b-700045b3c950@gmail.com> <2i4vs2rmlpqssl5wyrzhn5izyvuoxz2rmfjbjlaaq6exuqbllm@e436o6dw7nx3> <5ns1p95s-n316-22qs-63p2-q6246q043802@mx.roble.com> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5ns1p95s-n316-22qs-63p2-q6246q043802@mx.roble.com> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: > Automatically overwriting files like passwd is clearly a problem. > Preferred solution would be a list, say [never_overwrite] and/or [ask > before overwriting] and/or [write diff to /var/db/pkgbase/...] in > /etc/defaults/pkgbase specifying existing files that should never be > modified without at least a dialog. > > This plus the cleanup of pkgsave files which should only be written to > /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the blockers > to more widespread adoption of packagebase and, ideally, make it > mandatory or at least the default option in the next version of FreeBSD. > this can only happen in the bootstrap phase and not otherwise, in normal usage there is always a 3 way merge happening and if the 3 way merge fails there the original is preserved and a file.pkgnew is created with the new content. pkg should always be and remain unattended, once it enter a transaction so there is no plan to make it interactive. I don't understand what you are asking for about the .pkgsave files cleanup. Best regatrds, Bapt From nobody Wed Mar 6 18:07:51 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqgQd3fb1z5D2xh for ; Wed, 6 Mar 2024 18:08:09 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic306-20.consmr.mail.gq1.yahoo.com (sonic306-20.consmr.mail.gq1.yahoo.com [98.137.68.83]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqgQc37wwz4vfL for ; Wed, 6 Mar 2024 18:08:08 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=fU6iJZhI; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.83 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1709748484; bh=kPdvXFaa/Wa6BxppD4eHO1w77U8m9vJH/TCT/Mjx1hY=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=fU6iJZhIoNhTlNq/UG5ZoiH3/UZGQljX0OVxglKnwdbvK+Q7VtQdCTRgWgEcUMpUqqxaOPzY7dKyC2O8FGoV7zX3fJymcNp3yfGMh/dnO1zaviZ2mFqDLbiTEk9vD/VKzCaeL7qgKMxb4PIM/8nF/o6iKyvW7gskDlHXrMhm/Si/6fEnof7TIAxkrkpW16RXHut1R1Tf8I9KaNos6nShcRA8Kb36jwV7StzCzvD7CV6/iPkRb7PXaLngasNBIKvc4CqzmKXjmF55y+6Y/kwb0OLTi4GmnxcVKP603SQeRJaztEKZNaeBfvcTINWhGUYyVyshDxMbCTz/ni5Sef0mow== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1709748484; bh=yXJHIZ7rcqeHkpalGtWN6alOgfaU/BVOiUdhyGVtEDi=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=awfDDYuufmO84zPkCSvjJwacnfM8Om0RObXo5Y59V/JpiWAFm1+cH2TJKfyHio7r9EIe48P0CCqGFy1aNC6lTPrSsyPe14U24Ww1QefDypL/oml5iNxQg/jkQSBzbJIokBuMfenKGjcLMb9BGxcBK2qB1eV4wFBemVEitktzFEvC90hk0rVfNU2BsjQtmbLTS26pKIIAlpglfgU5F7WmE47WNW1FRIW/0bwCEOlOFTCQDmtKGDXp+mvoU3od5D0LNeGSSgMegypGZIqc73GGAzn2eWOOMpzO//UcRZ1ZQkvtryjAdopTvWp9Agn0OXCUDYyLjSRJXUCOQtESGyiCXg== X-YMail-OSG: HhUxqt8VM1lY0e44xPW8VDhqKYhVsVynrDRuJUJJdKwn762_JBpuG3Xs_UbjyaT yldRmpzaA4k80Ueo9y4.s1uOnGlqfvow7bziw32G0WOp.4fKOwLa5qVwWN3d1MJ.vX7Z2MTX01qG H_YomgfFXQG9UozdSFinYn9g4Nuy6FKlU3GjbSfx0uGVNuhJIzX.gwySKiZj6F3MCBFdQgTo1jAS HxGoVdWfP5FAPQda1vG71_1CFhccmfaIkEJqIsuOS8hg80h7lsdyoedmwKhM610imhW5PGOWnsXy Oyulxs9P9tA81d6.vAthpZBdAFUljeZYJ6cAqYXuTRDXj4q7HkW1wEyR9GspfNBvBHeo2WfNZS2t 49oEwXE3jUx7hshShR77qA.lcGbkll0inblhwXUG7D_mD6KBk_LtqHch0x2l0e.APvtaz2SPejs2 EKWFbw.GZ0.7wWc.6Fg0LN1o.anYQtbHmpJoyEJIX4fFkEvGvvc76ArYNu48apW0kDrSg7M0hOjO 0lb7IBNdCURFONDd4mj0pHfWfUxWCavmFbbxoe5o3u3h5PQkCsqk0j1ASUAPC0fmKQem5AGqNr2I JrswlLYTy40chCzQ9V0UFuM1OFvu.7ODvvxayaHRUaiyeNKUxKTDRhyDUAhHeuf2rGbeUmlJjgK0 4P1Flve7IypxN9nJV8H9NQuIOmambBVXHPUEWZI0e8rcEHZ7C9DVLk6b_D0Fv4lP42k9LRPW818i 7J8iaVQouZoBCuIa1LucAtRuYfa80aIiIcvSKCiSRCPHG9iEk6O5TnejSrqnP4oZNusXQeYVJZms MdmJ.xEw1mnIYBWFz7fK4zOySpG47nwlt6bypzZvNQFH0OK306u4ke558X4GLLWTlRJn7y4b2ymp oy.Nl_odLZz9RuwLdHvZT48kJAuOvP18xkoGTBeGB1ejYmXU9OJF_ZNQT7yiuBwtWdOD54ni4M9z 7uQA2yg0rOZMVNrsYZQJ3678g_aQTF0Ooq769ZVlOIJ0MYsBF7cjOmdrEUhbzAF9YRUTJBieRah8 t0kKL8U4nOAVB6tEJlbQxOMim19rOmyQZvGiDZqLQ.kbPMBLdut_NjVei1UAPlDPYFWKf7diWXDt 6RkaYkpPsggjDGmVzSn0FCRWkOT8c60FlwmYiM3sVhyND96e6k3LZRzL.EXDhQijKfJ_pXvx4wPV gZyJDnsb5W72Z6QQZLDWv.fOSt1CRDCluEy9PsBLu6vIukNjTLv3kNWsv6Otx3N8_fjUahu4Y7Ey kCoBMpauWIo8MYc.L2KHL3aSj9TkojwC0im_1MzdNksvq5qoNqAqnjyQRQjyyXgf56rVLpnGksYr rFeDrROotgnQKywzEn4zPWIPhgeuGHLWJYHyqpLEIwI9WiQh85Pqlafst2dg6p14MuHjYwOGxvH_ Gp_9cUPyYFibSLohd6uQKZPf23IGHcN.ZaAghdY45oJJKBn73EZiLYDEyopCY5EAJ0LYDCUqLRTj VU_xUpfHicA6vkYLwTbfcHri2wHQ5Zy292FggbU2qA1y4jCCB.SrnVEK7MffOWi6Zy.01elA2_hE 5p2jW9i14PFtp4oI2Z_u27_tej.7In91nxdsjo8dZh6IRw4Nt720LsXfoBLHw1l6FMhQN6T159EW iXPoNPzk3qrc6CmQp0UEDdTbb607nZEs3dxuFs9EmfWcs5nmAaoDY.8z1SgeGP0tB28iiRqa1KNt k_7D_fFIKzYNoO2oQKoGRw1ZDEShHX4FF6sNyMliNtofbeslmfXpWzeYgFrb_utC6AV5eh0ahhqt Uh2Emz6dCu3SvKhljSQClkQ_eZyJxw.5tnkq3Sj75Fqh0XVknI2YcDhRuvjqxh97rIvPqokDbnsi h4y_XBJBZR8O6KC5SwuaRG2nEasdhxzGkmAVmBVKNAiyoFeAYaOCFpPr39zhe__BNuXylHvH0WVc lgLPqhM9K1pZZSyZFAXcOW01BTRi0AKFFQCIkftudtRGni8tvLbRenv6akgQ9.n5th.huy2ibWZC oKrrxWQtguCUoM39b4N8DEJAglhPGzWCZkUHup_i07DhlEKoMSv41HbJ2UXKiSa_1J0MVTUgPtOv ewCzBDQkJd8pCrkB1_5FoOkuv9HmPCwayM0gGcUEowbRq6yh1MiVPblq5yjnUcKLRlCkKo8ShmNt 9JokzW970ahbzu6lIl00AILU0Z.h038fkOTUsvIXEwLkFcbceIkSutDJ_PH61gKatCq_C4_F_aRs JkNuSXKkLmzZO6L3hmy2Eo6_Z6P8VReUNOvU3mxzV.pUqm1g6W424rgQe43xFmDsZ4MnpcBiyiks - X-Sonic-MF: X-Sonic-ID: 3c50387d-39cf-4d9d-87f7-5c666da3362c Received: from sonic.gate.mail.ne1.yahoo.com by sonic306.consmr.mail.gq1.yahoo.com with HTTP; Wed, 6 Mar 2024 18:08:04 +0000 Received: by hermes--production-gq1-5c57879fdf-kht2b (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID f34f7809b044c4dd8b095ff3dac8b863; Wed, 06 Mar 2024 18:08:02 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: pkgbase and config file merges Message-Id: Date: Wed, 6 Mar 2024 10:07:51 -0800 To: Baptiste Daroussin , FreeBSD-pkgbase@freebsd.org X-Mailer: Apple Mail (2.3774.400.31) References: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.97 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.973]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; RCPT_COUNT_TWO(0.00)[2]; FREEMAIL_FROM(0.00)[yahoo.com]; TO_DN_SOME(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; MLMMJ_DEST(0.00)[FreeBSD-pkgbase@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.83:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.83:from] X-Rspamd-Queue-Id: 4TqgQc37wwz4vfL Baptiste Daroussin wrote on Date: Wed, 06 Mar 2024 17:24:18 UTC : > On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: > > Automatically overwriting files like passwd is clearly a problem. > > Preferred solution would be a list, say [never_overwrite] and/or = [ask > > before overwriting] and/or [write diff to /var/db/pkgbase/...] in > > /etc/defaults/pkgbase specifying existing files that should never be > > modified without at least a dialog. > >=20 > > This plus the cleanup of pkgsave files which should only be written = to > > /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the = blockers > > to more widespread adoption of packagebase and, ideally, make it > > mandatory or at least the default option in the next version of = FreeBSD. > >=20 > this can only happen in the bootstrap phase and not otherwise, in = normal usage > there is always a 3 way merge happening and if the 3 way merge fails = there the > original is preserved and a file.pkgnew is created with the new = content. >=20 > pkg should always be and remain unattended, once it enter a = transaction so there > is no plan to make it interactive. >=20 > I don't understand what you are asking for about the .pkgsave files = cleanup. I've been using find to check for *.pkgsave files to know to deal with them if they occur. Checking now with find, I did not find any *.pkgnew files. I had not been aware to look for those. But I've discovered .pkgtemp.* as a naming convention and for it I find: # find -x / -name .pkgtemp.\* -print | wc -l 80 So it looks like I've more checking and cleanup to do in general for my PkgBase experiments. =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Mar 6 18:12:22 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqgWW25kxz5D33D for ; Wed, 6 Mar 2024 18:12:23 +0000 (UTC) (envelope-from bapt@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqgWW1ZPsz4vt3; Wed, 6 Mar 2024 18:12:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709748743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q2wINE3jm4FKq5A7ZR2PSlEW5jGHEQogSCtZupSl4pQ=; b=Nl1ffkJUYfrQp9u1mbCmFmM3aCsVuZc5mGunx/g6NKvyGwfw3KkrUQ8intuysp0uyIg2yA qqSOC1VKSRO3Xp+7Z2rGCQboHH74IsOR5Vd+iYj0unwxtb1vvJqtmXD7n1jdUQVgiyywNo +lUUW5R6M4sXovFPF6O9fwp1Sn6UiMPt9hzVlhlYpl6QLSstteTI+YB1LUOaDB4C06/ksC CDSM6c1FkriGKUUJ/FwJfm7n+8MNqCQQFIyMcKy3A67VKkBtLjG0T0l5qZ0Wx+XmqZ/eBG lGDSQgB5WnJyiN37sT06e8/e8YPRtJH+Sh0mrKaM3TTamJlOkwxsNHihN7pIVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709748743; a=rsa-sha256; cv=none; b=xgR4vIdD2QN/WhQYFLoAO26KdsWude9xn2luSOIZG2Gi9LOOZBnv7Te7gKqhuVPjp7HKY/ yufW/MiL2W8oi7FzV12fdKJXnVrfABm1a21oYXCeJ0jVLvv5c6f05ZWJzQbef1/fIXrrQr soOj0VRNdCFDx3v712yPzvxlIeIOuB/cPV0hLmlJNjebfPwUVZIlsmAW7RGadD7/7LGiiP 1sR/L9EKUwLCZpDPRBbCImB/eSRq3acXHIalgk40xIRo2VUBDiCSLoX9ojXOulELkazu9p DKsnKE1I6Z1TP7phEWn0b2qiZQJdb3VSPwz8vs2i9ksZJlbQwRnVaTcWYfYKsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709748743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q2wINE3jm4FKq5A7ZR2PSlEW5jGHEQogSCtZupSl4pQ=; b=AVRefRg7wdhhsJrSPENX1PkAvPofm8gPTvdyt8MEOlPishl9ZnIhjVDc9QTmjEMk4JZMMa v6fSZcjlTMegaine1dD3GwHjzwI9KtAyU42TMuYV6DJVQJCvpCmQ1nc1w83/aUx/CJBeM4 aTcgqkfx/RHJgFKhj5tzDvxOpaY8A5FIwNp6pQrSPl9WC5D/UOG+uGJXFcQpE/1BNnaRNQ SYtHlr7x3aq7k9FOohNpXpKjj8u8wcm52bLNXcFzgsx+zAqSRUVSOcfmC2XcEAADkOPlFD 2tunHVYhktpjZ6wRL8Oo92mihJ9kZ+GqbUan09SHhZ7dsr0KXdpl9p9MvzCZng== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqgWW0ZYDzSqx; Wed, 6 Mar 2024 18:12:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [127.0.0.1] (42.177.66.37.rev.sfr.net [37.66.177.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 1EE35127FB7; Wed, 6 Mar 2024 19:12:21 +0100 (CET) Date: Wed, 06 Mar 2024 19:12:22 +0100 From: Baptiste Daroussin To: Mark Millard , FreeBSD-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges User-Agent: K-9 Mail for Android In-Reply-To: References: Message-ID: List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 6 mars 2024 19:07:51 GMT+01:00, Mark Millard a =C3= =A9crit=C2=A0: >Baptiste Daroussin wrote on >Date: Wed, 06 Mar 2024 17:24:18 UTC : > >> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: >> > Automatically overwriting files like passwd is clearly a problem=2E >> > Preferred solution would be a list, say [never_overwrite] and/or [ask >> > before overwriting] and/or [write diff to /var/db/pkgbase/=2E=2E=2E] = in >> > /etc/defaults/pkgbase specifying existing files that should never be >> > modified without at least a dialog=2E >> >=20 >> > This plus the cleanup of pkgsave files which should only be written t= o >> > /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the blocker= s >> > to more widespread adoption of packagebase and, ideally, make it >> > mandatory or at least the default option in the next version of FreeB= SD=2E >> >=20 >> this can only happen in the bootstrap phase and not otherwise, in norma= l usage >> there is always a 3 way merge happening and if the 3 way merge fails th= ere the >> original is preserved and a file=2Epkgnew is created with the new conte= nt=2E >>=20 >> pkg should always be and remain unattended, once it enter a transaction= so there >> is no plan to make it interactive=2E >>=20 >> I don't understand what you are asking for about the =2Epkgsave files c= leanup=2E > >I've been using find to check for *=2Epkgsave files to know to deal with >them if they occur=2E > >Checking now with find, I did not find any *=2Epkgnew files=2E I had not >been aware to look for those=2E > >But I've discovered =2Epkgtemp=2E* as a naming convention and for >it I find: > ># find -x / -name =2Epkgtemp=2E\* -print | wc -l > 80 > >So it looks like I've more checking and cleanup to do in general for >my PkgBase experiments=2E > > >=3D=3D=3D >Mark Millard >marklmi at yahoo=2Ecom > =2Epkgtemp=2E Should never occur except if pkg crashes =2Epkgsave once you have boostrapped you should not have any=2E Best regards Bapt From nobody Wed Mar 6 20:53:18 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tql5Y1zfbz5DLnx for ; Wed, 6 Mar 2024 20:53:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-24.consmr.mail.gq1.yahoo.com (sonic311-24.consmr.mail.gq1.yahoo.com [98.137.65.205]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tql5X0sN8z4Ld6 for ; Wed, 6 Mar 2024 20:53:36 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1709758414; bh=ua7T8mxUor/BYuCDWeaKy3Xi7JisMsAGlwbQtxXk5+w=; h=Subject:From:In-Reply-To:Date:Cc:References:To:From:Subject:Reply-To; b=swiMSHemrf8jzWSn8Np9/lTMCsOCmjcQAnkXX8H6nscus+qIeQzcgE/oWOb+kywfcoKXdgTzXPYUP7Ldrqw8aXBQ3v2KHBBP0UqfN2IhZC4IFswIrDwqgeaQiPC9pihq6Zw27/d7InvMHWiuSqzRnNKcbv4tcC5/IP7PHQiCdj0Bq0cPQve4qR4qxdSiKS5DiRlVMwuacVNtcOn1tV2+GgqN2pXmPbPVYna/Sywv5rP+wINUh5T5E1r/OV8U9leu/b6LAl57qCmjCc3BAMWCejyR9qIRdJ3dhEKTVQ1uUsWLN6LkI7XF7DlAI53UE/IvAJ4hVIHCb3/qOWVr+ofl0w== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1709758414; bh=rvJ6cjCvNtNLyRhMHlZ9J6j6p9U+trTVXzYyt053IXn=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=heGiGsgI/FpsiDEMZdxr7uEmfdyVxwdbY/O9qhgD80ZTXmregbpFdIKyQXXibVuMZQueVYA3EBSm+gczr1M/bumTSEwtoMTWUQ/4qan09yF/0nnVVJ4cS+GOVI0QOu4Gj9VYiBbRhibFvAOhXoeVRa68bKw4d3mC3bqNgpN3bD4MgF4IYUIRd+IlHNio7Tamzfw2FcoD43JVZnffZ3KSuXfY/sNDrHpNpQ3VWCxWq42WlEArJQ63NfT21Px5DgjYS7BNCjXvSR7w3DRqxCqWmUwt+/Gw2CgRcFqlqAi0V/m1DJ2UP9wXxiLuJLcFCaMfWy2+yXU/iZgf6cYYYwXQGw== X-YMail-OSG: ugESZScVM1mxXW8MLjxOEcndl8UTyYE.tc6eaOhcG9pZ.eEPJV0UW8Ir6eCYBti KrPwD99zpqbp_7v4O9lS8uX57HfAz.5c8WanAkyrNE.6YCt6BDT39zAiyeEZyy3P8pvjQdCQfreq vUAaKt32X.9oMYBv79dSw6YhQ7UjQJIMWT7WiKSdm9pNZOMAvEs6s60ZxxpcDRw3me8K4BPLckBX PM5AC8XkJUKdkMqMdmQsDbQtNINkXwVJMEBJoTf3XEwG5abGZqudXHpAqZHUIMC03LmzsLS3iYWf aKUxPDpB7osgvPpr5p9FmJ5z53YFKpDhztysGJdF6xOStRCaHmzJmaUgnOwfrXWxv8GFAsj1SQhJ y8M75zKNB5o2g5cOMyh6MLOc4zF5cqlcz8To8bJlxM1dro1AC7K6Uj_7W099Ezjfbt5DJIsNhIbk hJvUh41WNVR5YBRoU4Y9WfpwaYQszrjygBJPuztmw2APrIRKKJPXZKa3LUlS9rfhMmZB7EHgzkvV gQ.RO87Eh.j55sxa5RczjCCm91s9u4dJJZE9myFBotjUHC4n1D_QmXHiCSheCdtPZh5AyCgjszO_ n3yQ2ah4ns7.liljz6ypRsIEe_DsBKAbcDncB_R4YtFTUqx8WUwuk9bpVbus6xsQfFHWpesTwFin M42hGY7SOo3ylztl2f26mWoWfNpRVcg.6hfH7DD_mjjeoXozi5LkefFB9o0zwtV0VoTSyNG4IiCU CQl7Gk9Gtc2RIezFv.zpfSMAFlXpo8ZItSCHBFPdHsfvcGR3zs0t4mm4U7frTcRzHAr5cIdelqbx M91j7DF7bpADECLqbeA8M7TprXeq1QGMGC0hdoVap4F2sK_Qc5DdbzpADMOIxXitTAYg5QzJOsKd V8yRN76oji_5oZj22NHR8urWYKDCLdmueHifJONQph0.3xQxqhx1PzD8S6L7BccwIO60Zyqb_FbX SoXbp3E7XsdJkadUVnkuyFelDkkS2SVCijk1FWriuLcQKKxefRw_Fidp.DDn8kiRRHJwpCoKKKqB CWXTASBlCyf6Cr3GZx81JNx4q4VN.UzyM6pVgL4fRow_GkxfAMVDO7kl4rODp9Rv6rN0YbSdAyez 3nnR.iUrUDuogScMqhvGeNXd0kpEQzUd1tloj5kTvLbf4LLAO1KfYk6sEn1JzCpG4YZHUYZ1JWN5 L6PUsT55vghcSgwa_KO1bW0Lgpa7i4qcyHLZe2KtClpKGkDhZCBUM566fgkU1KW5VEAbMpUZ51sS AMbyf8c4n.k7M33BNFYgsFfwHvW3lcHXCtcTX9q9s8CBzGN1ryAFZoby0apYX1oG2kH3Ck9wFOw2 ns9Ot0mg6VmI26dXFDt04J_1PdqbGUxOsOWtVrzgqJ5faty3d3cxKc5IHC2JskHox5JYtfm64Z9p pV79tkxSz_n6CEx8.nMSEy8UJJ1_LYxwvbCVn_RDFAiIFYoI.l52i34sCYZPr011Qy6DwLDIzsa2 PsH49i5rCKrv_OeXLO83RqmSIfVWDes98ClcXxaODE4UAr7xuCC0pavA.BLO9gHIYJDMdTik2hNS Z7nPE3ZaZEAE0gSHC4trHUPY4ix2nDppy0KcyY3FFEh9NUKCekXNxIiX2wO6sU0cMz9VD1ROkbEg xZUOs_W5lNsPY0AUQGWa35tVQB5vioWoxB2pxiDutNFB8TLmZqmWwtVyvq5pMjGz1_zJ.B5S7jxL 9d9BVyX87mh2PAcCN9EB_H0vQ64Smkhyu67opWkWAml3ZpAJNB2OQA9Cleni1kGW6.onldxFXNF0 w1pVEesnm5S9cUdTVNs8f2Z4mH7LHCRlRU10fwHjEfjTcI6ByL.sJRNNT7UMGoeB3EvY2tDnK0fb _EaXovFn99iEFZZ3LLwRHCjiAQuNJZm6K0hJL1ldnkjeQ76Hnv0lg1TlPz_qimW.WhcqHEcNt86S NeEZnccjUUlq3E.aQkcutb1GD_9LEcNFh8YHYgRVcEg0VsJQR9rrrKRWLECsHeMr2Gh3vulTdGE9 Xeb3EzFZx54N5mEAtycqVzCMRoKl1xF12i7eLPrLBaD2NS3Axti4bztLiD5OXcXTIY4b0lUJiClK PIUAJMs6rrL6crfMWbOwCRpG1rQNwihr2J5k5NYf0DIz2._.1mBhPELV1NtFSfBZJG2OwLhPJIFR 78pA0kmtZ.2wePq69jLXYuaKufgrGKbq_ayN_YNiFdyY5cUIt7i3THfRRQPhWhMQL.xg..QDfr3q H4xZwQ_GJgecfCueFsRl6EHCn2KfdNw8ufmamXVWatBwpBsjnRR1TFwtmy7B7NnpCNHNshEo7azo - X-Sonic-MF: X-Sonic-ID: ed74b521-5c4d-40a6-a790-db9a09c22019 Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Wed, 6 Mar 2024 20:53:34 +0000 Received: by hermes--production-gq1-5c57879fdf-6xjwd (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 4ad601d1ce9a05b6b11e08aae8641861; Wed, 06 Mar 2024 20:53:28 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: pkgbase and config file merges From: Mark Millard In-Reply-To: Date: Wed, 6 Mar 2024 12:53:18 -0800 Cc: FreeBSD-pkgbase@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <878B0E3B-DEA7-4D89-BEB4-1DA1FE8780AC@yahoo.com> References: To: Baptiste Daroussin X-Mailer: Apple Mail (2.3774.400.31) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US] X-Rspamd-Queue-Id: 4Tql5X0sN8z4Ld6 On Mar 6, 2024, at 10:12, Baptiste Daroussin wrote: >=20 > Le 6 mars 2024 19:07:51 GMT+01:00, Mark Millard a = =C3=A9crit : >> Baptiste Daroussin wrote on >> Date: Wed, 06 Mar 2024 17:24:18 UTC : >>=20 >>> On Wed, Mar 06, 2024 at 08:59:36AM -0800, Roger Marquis wrote: >>>> Automatically overwriting files like passwd is clearly a problem. >>>> Preferred solution would be a list, say [never_overwrite] and/or = [ask >>>> before overwriting] and/or [write diff to /var/db/pkgbase/...] in >>>> /etc/defaults/pkgbase specifying existing files that should never = be >>>> modified without at least a dialog. >>>>=20 >>>> This plus the cleanup of pkgsave files which should only be written = to >>>> /var/db/pkgbase/pkgsave/`date +%G%m%d%H%M` should address the = blockers >>>> to more widespread adoption of packagebase and, ideally, make it >>>> mandatory or at least the default option in the next version of = FreeBSD. >>>>=20 >>> this can only happen in the bootstrap phase and not otherwise, in = normal usage >>> there is always a 3 way merge happening and if the 3 way merge fails = there the >>> original is preserved and a file.pkgnew is created with the new = content. >>>=20 >>> pkg should always be and remain unattended, once it enter a = transaction so there >>> is no plan to make it interactive. >>>=20 >>> I don't understand what you are asking for about the .pkgsave files = cleanup. >>=20 >> I've been using find to check for *.pkgsave files to know to deal = with >> them if they occur. >>=20 >> Checking now with find, I did not find any *.pkgnew files. I had not >> been aware to look for those. >>=20 >> But I've discovered .pkgtemp.* as a naming convention and for >> it I find: >>=20 >> # find -x / -name .pkgtemp.\* -print | wc -l >> 80 >>=20 >> So it looks like I've more checking and cleanup to do in general for >> my PkgBase experiments. >>=20 >>=20 >> =3D=3D=3D >> Mark Millard >> marklmi at yahoo.com >>=20 >=20 > .pkgtemp. Should never occur except if pkg crashes I looked at the file dates/times: All from 2024-Jan-20. That would be when I was discovering that use of the RPi5 EDK2 draft ends up with unreliable USB file I/O. So it fits your description. > .pkgsave once you have boostrapped you should not have any. >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Wed Mar 6 22:09:07 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqmmj5Dvkz5DTb9 for ; Wed, 6 Mar 2024 22:09:09 +0000 (UTC) (envelope-from marquis@roble.com) Received: from mx5.roble.com (mx5.roble.com [209.237.23.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mx5.roble.com", Issuer "mx5.roble.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqmmj33HVz4SfB; Wed, 6 Mar 2024 22:09:09 +0000 (UTC) (envelope-from marquis@roble.com) Authentication-Results: mx1.freebsd.org; none Received: from roble.com (roble.com [209.237.23.50]) by mx5.roble.com (Postfix) with ESMTP id E5A52D89C; Wed, 6 Mar 2024 14:09:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=roble.com; s=rs060402; t=1709762948; bh=T8TCn7fcODcUquAmZEvwDMMEjMMNdBG79O9gr6L1BG8=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=qfQ9G2+cTMoJwJkVr+Qkx4zS/6KL1iLaEFEUlrbLvYsjWBZRICSrBtBy0F5hoeYtk 5znV3ODi4h0XGsG324tNahZkCRyasiDpQHVlYM8SZdVCYc8/nFahsRpngg7dI75vua /y3lv34KsguBFCcZYkFnMEM11u2/tqKh3uVsCXLg= Date: Wed, 6 Mar 2024 14:09:07 -0800 (PST) From: Roger Marquis To: Baptiste Daroussin cc: FreeBSD-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges In-Reply-To: Message-ID: References: List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:17403, ipnet:209.237.0.0/18, country:US] X-Rspamd-Queue-Id: 4Tqmmj33HVz4SfB On Wed, 6 Mar 2024, Baptiste Daroussin wrote: > .pkgsave once you have boostrapped you should not have any. Bootstrapped what though? Whether pkgbase had been previously installed is not the issue as we expect some pkgbase installs will be to existing systems, with existing configurations. These configurations should not be overwritten (but may be patched). Not being able to think of a scenario where overwriting existing configs would be the expected much less desired behavior, I'm wondering what scenarios would require this bootstrap behavior? Roger From nobody Thu Mar 7 06:02:47 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqzHD3v5Pz5Cp0f for ; Thu, 7 Mar 2024 06:02:48 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqzHD3P1Yz49Cv; Thu, 7 Mar 2024 06:02:48 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709791368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t/oZ4nueXkM2h87YrTLmpGB8i5AQdMQiOwZ7Y36WVso=; b=bt2TzmfXe2kYOi5vPovOHcs8N0Fg5JbuUwgfX5CzMtH79g1paZBnkWHpW2+J8pwOyq/INW Ar1VEHgWJdj70PqDlbAaIZgLvl1SLNRMHtk/1E4Qjou3vLRIu9R4uWU9gCXa5k79Fs4JhM 3ZKjYdB3aoUKwdzOM4zJRdaHj0eVS1pieoi2jlJOoSMg2XWLy6qGPu5Vi07ZfP/0+ZMf/3 NaCBmd2XVUortk4IcIy8+EuDlyGlX2f9zRbFZySDx8JASu5pTFqtR0v5ePGQGpwaF7HcWg r51YJikjup81LTp01dxsmmvpZMweYy1SNIIiOcOaL5rFOT2eHQqVP6M2Q7aXXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709791368; a=rsa-sha256; cv=none; b=pDF9DNRmk+4FAeSq5wOkR5I/p2rbYCNnlnC4ygtXNO0Qllk3GsdRxyZ5l0uwDkx9uGRewJ /6qpaMexidjyWnjmXdOYNSkHyUyiYA0ptv+cgZhBkaKA+O7RNzbXhZ6/Tq7nXt/3tHA5WP yxIwFGWFMLn5d4SQM+9DLM87gK1krGGU1WTDXWZberRH2hte2Dh4NTKrnrUR/qtq/Q6rJC KJIpjqPNkJI6rpTE3Yq6gvAbBZHwnt8Jm4pL2MBvse7Q4T2Et3RAemo1bm/7CFGdTOeYe6 0LE1+EtLFaMUJMJlnnzN3/RcF1MY2vL2+YCcu6lXb8HL3ScPRsk7cWI2XtIl0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709791368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=t/oZ4nueXkM2h87YrTLmpGB8i5AQdMQiOwZ7Y36WVso=; b=uSblD2tTgR8ZX2N8CcNwxudYxygOKzMWJM0iQsjeG537XRE67jqtBOmQEWWt8jAQfwmqNd xiz0jQGG4eZVaeTwhxHOMz5xtd1+AcgJZkMzXLRqWfFm1XgdYROp8Khf+9wY8QC7+s8FsS rdi/2wYNLAQGM5bVq2VcUXXsT40e4RkGJv0PcoMHmbr+e2tl3/SgZ46mInTJnCeJS4+paV q9zlaThyBEQ5fBWGLDH4iugG4p240d/Tlb2f2l4FustXJbaX6rVfTi73PpTNTIno38CCzq PL2rkrtcv54aaGssCW1IjEHUFoEYJbsVTEWUKy4GKmf8FbRY0vCgs7WnoGgL0w== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TqzHD2SMzzh8M; Thu, 7 Mar 2024 06:02:48 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [127.0.0.1] (42.177.66.37.rev.sfr.net [37.66.177.42]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 9BD241B06B8; Thu, 7 Mar 2024 07:02:46 +0100 (CET) Date: Thu, 07 Mar 2024 07:02:47 +0100 From: Baptiste Daroussin To: Roger Marquis CC: FreeBSD-pkgbase@freebsd.org Subject: Re: pkgbase and config file merges User-Agent: K-9 Mail for Android In-Reply-To: References: Message-ID: <5785EAFC-0509-42A7-9FCA-F96136CE7641@FreeBSD.org> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 6 mars 2024 23:09:07 GMT+01:00, Roger Marquis a = =C3=A9crit=C2=A0: >On Wed, 6 Mar 2024, Baptiste Daroussin wrote: >> =2Epkgsave once you have boostrapped you should not have any=2E > >Bootstrapped what though? Whether pkgbase had been previously installed >is not the issue as we expect some pkgbase installs will be to existing >systems, with existing configurations=2E These configurations should not >be overwritten (but may be patched)=2E > >Not being able to think of a scenario where overwriting existing configs >would be the expected much less desired behavior, I'm wondering what >scenarios would require this bootstrap behavior? > >Roger Pkgbase behave exactly the same as etcupdate and or freebsd-update, this i= s what I am saying Bapt From nobody Thu Mar 7 19:57:02 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrKny69QNz5Dhst for ; Thu, 7 Mar 2024 19:57:10 +0000 (UTC) (envelope-from wollman@khavrinen.csail.mit.edu) Received: from khavrinen.csail.mit.edu (khavrinen.csail.mit.edu [IPv6:2603:400a:0:7ec::801e:1c14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "khavrinen.csail.mit.edu", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrKny2NrYz4gSq; Thu, 7 Mar 2024 19:57:10 +0000 (UTC) (envelope-from wollman@khavrinen.csail.mit.edu) Authentication-Results: mx1.freebsd.org; none Received: from khavrinen.csail.mit.edu (localhost [127.0.0.1]) by khavrinen.csail.mit.edu (8.17.1/8.17.1) with ESMTPS id 427Jv3Y6058588 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO CN= issuer=); Thu, 7 Mar 2024 14:57:03 -0500 (EST) (envelope-from wollman@khavrinen.csail.mit.edu) Received: (from wollman@localhost) by khavrinen.csail.mit.edu (8.17.1/8.17.1/Submit) id 427Jv2Wp058587; Thu, 7 Mar 2024 14:57:02 -0500 (EST) (envelope-from wollman) List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <26090.7182.877370.695999@khavrinen.csail.mit.edu> Date: Thu, 7 Mar 2024 14:57:02 -0500 From: Garrett Wollman To: Baptiste Daroussin Cc: Roger Marquis , FreeBSD-pkgbase@freebsd.org Subject: UNS: Re: pkgbase and config file merges In-Reply-To: <5785EAFC-0509-42A7-9FCA-F96136CE7641@FreeBSD.org> References: <5785EAFC-0509-42A7-9FCA-F96136CE7641@FreeBSD.org> X-Mailer: VM 8.2.0b under 29.1 (amd64-portbld-freebsd13.2) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.4 (khavrinen.csail.mit.edu [0.0.0.0]); Thu, 07 Mar 2024 14:57:03 -0500 (EST) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:3, ipnet:2603:400a::/32, country:US] X-Rspamd-Queue-Id: 4TrKny2NrYz4gSq < said: > Pkgbase behave exactly the same as etcupdate and or freebsd-update, > this is what I am saying What's the pkgbase equivalent to `etcupdate resolve`? -GAWollman From nobody Thu Mar 7 20:22:30 2024 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrLMG027nz5DlGk for ; Thu, 7 Mar 2024 20:22:34 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrLMF6QTRz4mb8; Thu, 7 Mar 2024 20:22:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k3mCIk17EmERhWY+w9uTB4SllwVVURGTMuZu6dUyACM=; b=ulEB/eiOThm+BvyucoXbaPtR0D6mnsoi3gmUvUdH0pHQiETDJSeoFyVjqPoLAKpKnQp9wi W0DqLVV+f7EXIJy0glFc+wBqkiadMsp0Xyy3qDHit12wMg9oahVfkHRkZIZoPwhdk56NV8 D7rieUwBH9Ik18r8ZQ6ZgCT/IR9q4ccfBl66/ULxNkp4imvC5R/Y+sInsQk/9SHzoftpwX ACBYHowVHB1/ZdDWQEL//C87pcQD8fAG/RnOBjlxPFMvicuqBeYe4nIvXDvRjD3zuYJya0 bbHb9XZ1xvqoexJFCShruqQkrbfssV2a3F0ZvUO1avVrt0pNEW+kg4fJJBrYcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709842953; a=rsa-sha256; cv=none; b=a1mCtG5e2YAUf/kVhUbrOS+5TTUsmGYxQU4r/mU+Xay+4P1Vp+ahINgViuSXmPqVzJEwpi XTpgzAz14V4ozE2upjh+BJPveq7LM+jROe2SbBhFSmEq50FYaeS3FlvsMKHrIpMV+dbN0N oA/M/leIrX8WwD1QLptkKSm2SohBfNsmzU14zDPPTA1bnnbpjjpZ7kueULxSAUmiDsSkkn zftn6ICvdKbC2Jr1DO6Fk6HYVLu1LPADqWti/UHVj3HBmdLJRNWUu3teUvJ9tJPs/9aiIJ q1KGbcJPlc7V6fTsNEGGYZtwjx9lmgNv8a1Y5dT/AZKfGKErTjliXY+7COOlBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k3mCIk17EmERhWY+w9uTB4SllwVVURGTMuZu6dUyACM=; b=YIr1x2kwtBM5S6DlwK4f+GczIVEFoUKUsHjp5qwHMvncQaAHHkiGMzKzeojyxxO/WOzCv5 6thzTeL2CvlSNF6nbTqwE525WGWoV//3Xpa1Ik7Rotrr22FqDoaytNrhWAhvBX7STE1Rg8 Ide0WSjLYlfeoj9PppmoVKWPUwXAlWzLQSTUf709IPBmszAAaopKUTrqnvZTe4AYNSVeg/ Vx8asr7eLi7oq7TalwpheFU0LSinzS0iA6Gpk0ngt03frr/CH/V7PfwbTJC9Vmzk2uO3tE ZyGW/Ru04f3nQoP89WiaP5ghZFOujX/md4h9NCIZ1YZekzQD8bG6lJPnoJYC9w== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrLMF5T9Zz1Dxj; Thu, 7 Mar 2024 20:22:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [IPv6:::1] (2a02-8428-078f-2201-3de6-b690-5a84-54b0.rev.sfr.net [IPv6:2a02:8428:78f:2201:3de6:b690:5a84:54b0]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 150F11B1952; Thu, 7 Mar 2024 21:22:31 +0100 (CET) Date: Thu, 07 Mar 2024 21:22:30 +0100 From: Baptiste Daroussin To: Garrett Wollman CC: Roger Marquis , FreeBSD-pkgbase@freebsd.org Subject: Re: UNS: Re: pkgbase and config file merges User-Agent: K-9 Mail for Android In-Reply-To: <26090.7182.877370.695999@khavrinen.csail.mit.edu> References: <5785EAFC-0509-42A7-9FCA-F96136CE7641@FreeBSD.org> <26090.7182.877370.695999@khavrinen.csail.mit.edu> Message-ID: <1FD1684B-10DE-4297-8052-E152F7916B16@FreeBSD.org> List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 7 mars 2024 20:57:02 GMT+01:00, Garrett Wollman a =C3=A9crit=C2=A0: >< said: > >> Pkgbase behave exactly the same as etcupdate and or freebsd-update, >> this is what I am saying > >What's the pkgbase equivalent to `etcupdate resolve`? > >-GAWollman > There is none yet, Bapt