From nobody Fri Aug 8 14:58:01 2025 X-Original-To: dev-commits-src-main@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 4bz6bb5ZF9z6412Z for ; Fri, 08 Aug 2025 14:58:19 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic311-23.consmr.mail.gq1.yahoo.com (sonic311-23.consmr.mail.gq1.yahoo.com [98.137.65.204]) (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 4bz6bb3Mc5z3DLv for ; Fri, 08 Aug 2025 14:58:19 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=FKzBCe1m; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.65.204 as permitted sender) smtp.mailfrom=marklmi@yahoo.com; dmarc=pass (policy=reject) header.from=yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1754665093; bh=pmjPIZ3Ll1qPGaafleC84DnkmXMKwgg+EVRhysE707g=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=FKzBCe1mCcWZpaAu9f2EtDaaWZvXW/sxUD8aQhu4VtkmTg20Ldf15CORis2nP7z81UjmtdA2KgMXMswFtGgMdUPjHVkhik3iOj6+pGK6AHr3tVYRTk055jer0dL/eE4UCra1yqY91vRLyoycoAeuUqtbhTLFwr2AkRRp7Ffs15AR9BiGYkv55YJecc+eazFAhrZ66cpAvLEl0fhkW3AzBw97Y5niBCG6YTcnCVnXbnz3vyg59RIUcgJUstyIZN+bLSZKTrwqeBp+Pjy33VHjWX0Qo6cNTCfwDCsuYG5GXB7X3hR5QaxmzgB9LkryPiwlNO6DXfqBNMoPjTQQxAckNw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1754665093; bh=JSlg02VG8tKmcjLokDhRfY4bOw5Gi/M5Cse3iJz1FQh=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=ll+pbVRnekTSOCtRIr25y9OdrEB3WPpgDSxC4jpOF4dmoSpNvZqjXhWA5WIXS7/qMH3RdjuJ0elvnLGX6H2q3+1NGINV4Vq4ZSOY55Mb8OPyrIaCpKWP4mISNPOV7xIfsZbpAhfEH6sw0jF7qvS/6UTKHzB2FEZNPUB5RiAPRiO9kpE3Nq6iSPdZ8lOAGusQ/NfMP+AiXdjUcKBStjInGfnGRvy5mpygqDOMVEWEDFfOlUTrX2brzyDjRWeB9wn9XfBESdJwq9G+6vl6MDSZpV+KsiKZJSovepGdVYkj45kzKvBUnbqHwaFJxPM2ohc9XjrauhZkpOo0MbTn60sd4Q== X-YMail-OSG: AYXaO5AVM1mSmN2IiY7VjwpznowrK_.ZS79yAZ018V5R8DH9DYpMgCIrFmHzS9W RA5iOatnqaaQn3mvFwTWlvol1Qmd4ukk_1W26QySefOyCs4y0lS67GIQz4QpR6xinH8peiPZL_45 qr8Vabs1agC9fJ4cWhLnHEO9cGUf5VUrtWkbEPyJZw5JEmvaScZiZuLTk4Z.q4Ri.zf_nsAogs_X CVzQ7HNpstOs2WmAs1H0sajsejT3D_.f90D3Ws3_9IDgq1RF6rtKGmWcr_LIKRLlZBuQyOwz1QBW a2uB9W6oW212m487Py68ktsmAnkubv6Yb9SyNO5Auu3An8hLGn4AKfRleLtA7r0G_spJ7LkTcDZg kpnaciSPoLlWijBNhH4Hj.DB0jrChWrqHt640kSdSTdWwXO_iphT1XfxPLYgm5_qBWVRiQ9bz5Kg uv2aahS8ctyuQTCJ.IOsBMXT69QRcPZ384TNKzQd0k8nLK26UTkAYtA2T5mpxOzxDkDN_Q8Vg652 gyeWp15RWv3w4yIUnIzLPCVc.ZY252a_JTu_p0LP.WDpwUXO9wXRRjhoHIfrz7fbaXXalfLGfpNV HfOiG1h3HAGIveOQsITLMN9JeXX8x01oBiKautWlu2.pIHOVxR.NN7pqeN9kWgkwxxlg2ZqhMbel 4nT7oNK2wR2IaiUFxnjAb1GJhitKNKIV4LH_auVvJO3dB1E0troUItWSjK1K9Fn6Qbk_rwIzy5M. 6ixnz304.f3RPhjphj89oCd_BIgTOhHcB5krQhXAI._B5ILZ6OCI8VBWTDcAO0pMrQl2XLMxLKDn 8GWj3mlmuOFkiV_iGrmtkql1yGTyTnRFhO3Hh3K4nAvgYXzpw8D0AYjfjJeLsABwF2U6_L09azYL uNZY3ZZoP2.Vrgr86klgnTDwpyC2QznsZa5WqKmKLnpvah__kLn4j1pfWeaWrIYTnsmoPqE3Dv98 UL2xra1K4t5FhkoNeHhBiAH_6PQ6W8Z7mcWEcfG3KaonFhYjk2Gktm.rH.bFU64feAcXEhN2jcD8 N0n3ROxKzQhzShBc6SDft6zcPzJBilT0Bx.bn13985YpxYVwzcPCi3M8YsI41nMrRMD8cUj6ME3g n8uLvELG81mok1LdQ8sBmvxAHEv1GVhAx7Z6MwJr6DNT7gCbQQuyTfsxFKr20fkw9QPQzNDm_.FK Q07afpyvoZFzrnP9IAH08jSp6cjpSuRO5LG343UQ42mAVoTvyIPz3TF6XoLw4EaRqpSGJtJiQ9Bt dCptHgKwitdpRGnRUxA7Lfk7DQ._e8vvwpaE0sNwdmhLYM00CDLAuk4KZz3eHW.EIc06ZfhVUw_L AVUpmgwO.Jr2yPcqeuKSIcBwhPf6ftD6gyHi2vF7q5H4YRwWQt0mhzQdkIxe9hpmTt8.CDwrfJXH S_mhESJHc7S3u3PWp3w.1CbXE.BzWr_MoFXs5JrHMr6P0_Kse.lPA_.jAnwl6zWlB9yhastAzG3U 8QgInr4w.TlILdeg.hgHloXUq4ycu6vxI3wRHjkB20nKavudA0kib1hzV4i0qVokx6msUstE9swl MGrQvD7AAqALe_XzizuOOs3eiBirAFRQLnutOY8VQCKzvovli0qAjtUASX4t2PmgvDHUzYsFoSNv NQuyUJ8I_pL5sGMMD9sP.Ywb_uIGNvX8fSyCaTSvn5ay.kFf6GTRB5Wf12UistHmZXGLXtQeUu9i .ryZeYQwwcUMrBdt6K_S1vkwdpO7f.RT5pupO..SZ5oC1dP6GJJJp8H13AxUAllKgDc_IZnfX2TE o7OigA.ECK5U_05BCYc3MJN3TSkhjrEheN3dosvXnsIkkt3n_m7D99xvkMJjOsDz.hS2AWFlPfer zWs21K1C0lWujCJG1UhIBkzrCISyqOvLJwo10WaaoYiuimd.9S_a2Yy57i1W0LUfvHxx5U3aMClD wKXO4Q7GY93KfagN066THbBYELU2hE.TnfbsMgaTDa5dKPdiULBXxVUUOhLhdbepohFOzUEjgorM YQFBm9IxoxmFg1J9uoP7RgHShGcYtp5rlujWlydw8L5W4jITnP_suz0jRUtL6jTJtWQn4GmcmeBK Caez17t0DcUq4kyjC3prCwpzm58fjAyNCHFw8nR5ETpQFLS4kd2lJVaLghq.5gjDKopBb91nlyrs FnMAw1UPYFWkSBq61_YbHrRWVgnNFNvC1jYhuBRnsmTedo1Aytx4A1RByEEnvOBULl1NTiPk3wc_ qLQPibO2yryy5WZg08ClauP5owqjxsSJUzFN_PYx8etETdeybKv1u84oxpeoG4.1In2SNhAhbBxX HQvv1vTZNqbXO1mbqDeoT6.uyLygs5Q-- X-Sonic-MF: X-Sonic-ID: 6e38701f-1041-4f51-a5a3-ca1f1f037bb4 Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.gq1.yahoo.com with HTTP; Fri, 8 Aug 2025 14:58:13 +0000 Received: by hermes--production-gq1-74d64bb7d7-bcggp (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID fbcbf72a96ada09b68bcdd3fe5f71bcb; Fri, 08 Aug 2025 14:58:12 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.600.51.1.1\)) Subject: RE: git: 66c75fa63aff - main - freebsd-update: Fix the pkgbase check [-r basedir vs. -c basedir use --and the documentation?] Message-Id: Date: Fri, 8 Aug 2025 07:58:01 -0700 Cc: FreeBSD-pkgbase@freebsd.org, FreeBSD-pkg@freebsd.org To: Mark Johnston , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3826.600.51.1.1) References: X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; MV_CASE(0.50)[]; 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)[]; DKIM_TRACE(0.00)[yahoo.com:+]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; FREEMAIL_FROM(0.00)[yahoo.com]; RCPT_COUNT_THREE(0.00)[4]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.65.204:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.65.204:from]; SUBJECT_HAS_QUESTION(0.00)[] X-Rspamd-Queue-Id: 4bz6bb3Mc5z3DLv X-Spamd-Bar: --- Mark Johnston wrote on Date: Fri, 08 Aug 2025 13:00:45 UTC : > The branch main has been updated by markj: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D66c75fa63aff40e9c587345b2cc6b814= 8e396de8 >=20 > commit 66c75fa63aff40e9c587345b2cc6b8148e396de8 > Author: Mark Johnston > AuthorDate: 2025-08-06 20:36:05 +0000 > Commit: Mark Johnston > CommitDate: 2025-08-08 12:51:54 +0000 >=20 > freebsd-update: Fix the pkgbase check >=20 > Even on a pkgbase system, it should be possible to use freebsd-update = -j > to upgrade a non-pkgbase jail, at least for the time being. However, > the check_pkgbase() call came before get_params, so BASEDIR was always > set to /. >=20 > Make check_pkgbase() a pure function and call it after get_params(). > While here, use pkg -r ${BASEDIR} instead of pkg -c ${BASEDIR} since = the > latter requires root privileges. Does this -r vs -c change have consequences such as which /var/cache/pkg/ or whatever is updated (or if such is updated)? In other words, can -r fully substitute for -c? (If it could, I'd wonder why -c even exists.) Might there be uninstended conseqeucnes to the change? May be the pkg man page should be more explicit about when to use -r vs. -c for the base dir? > freebsd-update is supposed to be run > as root, but it doesn't actually check this that I can see, so let's = not > make that assumption here since it affects the result of the function > (i.e., pkg -c ${BASEDIR} always fails as a non-root user). >=20 > Reviewed by: des > Fixes: 856e158dc4aa ("freebsd-update: improve pkgbase check") > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D51770 =3D=3D=3D Mark Millard marklmi at yahoo.com