From nobody Mon Mar 04 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 <freebsd-pkgbase@mlmmj.nyi.freebsd.org>; 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 <bapt@freebsd.org>
To: Lexi Winter <lexi@le-fay.org>
Cc: freebsd-pkgbase@freebsd.org
Subject: Re: pkgbase and config file merges
Message-ID: <o54dtqdkvvemtvvvf6xw3yoj7bbje2teip4rlhwyjzlbxakhm6@be5hddb6byua>
References: <ZeKucEQtR0OPjF_F@ilythia.eden.le-fay.org>
List-Id: Packaging the FreeBSD base system <freebsd-pkgbase.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase
List-Help: <mailto:freebsd-pkgbase+help@freebsd.org>
List-Post: <mailto:freebsd-pkgbase@freebsd.org>
List-Subscribe: <mailto:freebsd-pkgbase+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-pkgbase+unsubscribe@freebsd.org>
Sender: owner-freebsd-pkgbase@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ZeKucEQtR0OPjF_F@ilythia.eden.le-fay.org>

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