From nobody Sat Mar 2 04:43:28 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 4Tmsm4283qz5Bxtp for ; Sat, 2 Mar 2024 04:43:32 +0000 (UTC) (envelope-from lexi@le-fay.org) Received: from thyme.eden.le-Fay.ORG (THYME.EDEN.LE-FAY.ORG [81.187.47.194]) by mx1.freebsd.org (Postfix) with ESMTP id 4Tmsm33WxNz4sRC for ; Sat, 2 Mar 2024 04:43:31 +0000 (UTC) (envelope-from lexi@le-fay.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=le-fay.org header.s=thyme header.b=N8TeBk7k; dmarc=none; spf=pass (mx1.freebsd.org: domain of lexi@le-fay.org designates 81.187.47.194 as permitted sender) smtp.mailfrom=lexi@le-fay.org Received: from iris.eden.le-Fay.ORG (IRIS.EDEN.LE-FAY.ORG [IPv6:2001:8b0:aab5:106:3::6]) by thyme.eden.le-Fay.ORG (Postfix) with ESMTP id 47E8EA2 for ; Sat, 2 Mar 2024 04:43:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=le-fay.org; s=thyme; t=1709354608; bh=X59u3Joy/REe4VGZ2/vN+v0pT/VX6dxCIVbvN8RfbG4=; h=Date:From:To:Subject; b=N8TeBk7kH8y/RFP9YpX/e0wxNF+jd1bNJCO4whfGihryMlFwd11mRommLIoyGVLUw kuVEkbXO+N7Fjmq9GTtDHY+71Z4niAIauSlcxs0SolQsHgzRpfTyNZ7jhirQFEfN0s /AUJrGVrt1rh2q951Tf+cbZrCVx0fyvCIlSBOgLg= Received: from ilythia.eden.le-fay.org (ILYTHIA.EDEN.LE-FAY.ORG [IPv6:2001:8b0:aab5:106:3::10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by iris.eden.le-Fay.ORG (Postfix) with ESMTPSA id 4EA872C041C for ; Sat, 2 Mar 2024 04:43:28 +0000 (GMT) Date: Sat, 2 Mar 2024 04:43:28 +0000 From: Lexi Winter To: freebsd-pkgbase@freebsd.org Subject: pkgbase and config file merges 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: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="znsdPu1UJBM+loO0" Content-Disposition: inline X-Spamd-Bar: ----- X-Spamd-Result: default: False [-5.50 / 15.00]; SIGNED_PGP(-2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.996]; R_DKIM_ALLOW(-0.20)[le-fay.org:s=thyme]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip4:81.187.47.194]; RCVD_NO_TLS_LAST(0.10)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:20712, ipnet:81.187.0.0/16, country:GB]; MISSING_XM_UA(0.00)[]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[le-fay.org:dkim]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DMARC_NA(0.00)[le-fay.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; MLMMJ_DEST(0.00)[freebsd-pkgbase@freebsd.org]; DKIM_TRACE(0.00)[le-fay.org:+] X-Rspamd-Queue-Id: 4Tmsm33WxNz4sRC --znsdPu1UJBM+loO0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. --znsdPu1UJBM+loO0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEuwt6MaPcv/+Mo+ftDHqbqZ41x5kFAmXirm0ACgkQDHqbqZ41 x5mtaAwAjE4izwyCVTC4fn8hPmNEbSYSoOdUSVueY0t+OWJAjjli6hUtpHR6PZ2q Qp/4zmu9NgRb+xyHUkRlvsKU8dRUp8BwETZJpvRi+g8ccLS89wrxdG2SlwuZeGNH Bt6FEwOarNQqnPSw/VkDqWAvvrsGfc3JZPFtGw76FbFResUVy8/+lhSwoAbak7Zt dJj2j95tTR+ZLCYy5eBhAO5AUUX6FEvRlkotTfmsq5KegijCfN8r+BP2LfvcOfO1 XIIEI6IVdyEW0VoI/gWqCsKjIeQD05C+cVL1LoGJ9iuuhBTtgvHRADK+PvFEXNFz /DpGP46jnamDJflZ08s+BfQqWFDzX7xg6ZS6Em3d/aFs/lGCgjbOKmaDAE/8kjQQ +ZrOr5PwHOiFeGaEh1ksyfRaaSE5IJA+YOxuAyBtfubLP7yWz2H56C9N6IWaTR51 ewvUOwCLufJT4OjSgmDWt9BbuNfnEJ5xIf3PgzjdJCKCzyIqkQInuilAfb3oZv/I AjMYsXDa =Wtf4 -----END PGP SIGNATURE----- --znsdPu1UJBM+loO0--