From nobody Sun Aug 17 03:41:24 2025 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 4c4M8m4m05z645yC for ; Sun, 17 Aug 2025 03:41:44 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic317-21.consmr.mail.gq1.yahoo.com (sonic317-21.consmr.mail.gq1.yahoo.com [98.137.66.147]) (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 4c4M8k5cxfz3f4G for ; Sun, 17 Aug 2025 03:41:42 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=W6XOxyk1; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.66.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1755402100; bh=iKII37fONOTlJN9IshpoG8kUFIV1OWMpa7x35L/Z87s=; h=From:Subject:Date:References:To:In-Reply-To:From:Subject:Reply-To; b=W6XOxyk1BY6tAZG5IDDG9+iqogz4ConcZDRlwAJN1VoEjkcunVUK2pFKEyil6cOOlXo4xSBL2IIHbc0/FEL5onKbsOVb4Dk8eTgjO2RbS1l8Rcu0PbXR0HTTCQ+/QejpAn1Lhyx16Cn8rjOIBZRSmpg1a/2Q4bVzIQlfJ3RaKiYYGpQZD03+nc/Y3yiwmHizID58EQNBx7UKTElEkPaS4aeAFci3ZTfOewvapcAsrMbBLSaC16RU9/DbSqfsimMfupXm5cez2WVkTZx1ak/fMXcHjQLcOIxrz1O+cakO6IvEjbGy7UgSiYVe7nu97jZtYHqYwbQJnTCE5aCiOYKa0w== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1755402100; bh=y39lnNtv6Tfbmr7IItnsf+Tr6PQ1OM2rOS36CNadPQs=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=f5W7vJGtkT67kzYyz7q1EWZyfnqDhWkUaE44S0xWBk4W7h7VrCCIPkOyRGlQFQ9MNJ7ms1u3N6cttnJ3Qw40LRDwBTUOFerpOUWJOf+lXCUPFk4he6/UWc9rYQFcf1xbS+LPS7z5S0yzy2leWTLWatUhH/EQL/yRlNzGpqiLFS5PbXuITUDnWRgLW+b5h4G5btJNYx+oQFTUOwArXVCWWvPVdg9w2AMHPjjIpfKad3A3OI9UIUr0Wi8pmA/x0JeWnwuHQ1ximu66Pv4lxc4hpw6oK/p1Q0QlifNTnFZXzfvsmecbZNlMjHgu0fG/gIMh2u8ZLrKgoDgBy98E9Jx9/w== X-YMail-OSG: VYbYsBgVM1kM7dERY_AVwuEU2DV3LNwvxcBihbB7J8mg_5tQbj6MKJAuyXfowf3 cmcGDTHnEOFQonG2_3yK0FFGSqzYDyTHpvxGb87CtQgZUzXcrrOW3gMXpdUw.vRfV4Qcr7dkUBQ9 pa0X_p_PYv3uXDnRUK7PnzpCyhnjNB05bPuoMau4ag.E2ZSd1M18fNEAQcNLaow7N4Mjn_VaGE8d wJbeZWV6Z_u8x455YO9I2smJstHjCCiaqB8nOxqvViacM0mKG8Atb4s8X9jvZXYmMk1.wUneS1gR biKBfcvMUJAJhl.sfOrFzs3pK9IFZOZxNpcb4VlIsSJbRx1InAcmhxC09uG9hPFmboviaNXEncGX Tddn1qAuPEbnlWsanF6A5TEvKRqlcCmlluYqE3qD6lrgamcF1y4vBi.ZHQejGihe2g0GlE.zQSqu 5uj9AUo3nJaoTbbyduhGnOIKSUvxQjmHjFK9WbxWb7n5EJWUXE.lGihwlECkRED0GTvSdRXHZkkq d80FTQbVSbOXIc73W1B3lCr2gQypAhmTmjc1OmI6_ZMSpm3dcBih5fYw.UEsEdd3mNXOdjy4NDWi S.pnoxlddCvsxOTvagH7I.sxahYAyo319pcQR3ruQJ5Elc622C4gRlBy7tS6Ib0ZX9Vn1vKnM5NY mlIxsIIq0rZd5Je6vLOR__HG1tP4lIqGwd99pmwqbwn86I.pD_bTSQDjwxrvGE0vhbr.c2jyJpo7 n4rt.577iZNEoKX88CEXdmphjTib9fYDYe390wvV4Z9DrdGFHupvsjJNu6Mof40vF9yZ_0FleyXj LqS7N1XaMRYELMS5Pc9RSnB89q9c.XKM6TffGGNZpKs44rLPPuake02Nj7hrLtKbu2MNxpOkoF7l vQ95wzBQhPsVw32S0yWs3ADL51nAsNmK6gpILGjFoGtd6zJjp.2SZOKzaMEw8dGZcQf4QCU2Icy9 281YLXy8ri43qHAPD1jgyonPB_wlR6xsoI0bl07ex9h04inLesLdML6WrTqjGoZpQJk1Ie5aMr3o oVxi12fGNDOeE_QSjWfs7bdZkggYVXW00ONXSy_B5JZNmxt7A0JPuMaY2_5jLzOMgDfuScYJBEh9 YPFMaPMKIw6H9nh9AhbKry61EtJvD5cJRqPFB2dxJHr0KK9XbF108He927FIOj9D.Ba3pKVJgT6p zTorpxBF22gOkRaO6BuJFJXkNcNRMwb_iv4PDYnDT71GNQdQxl.GbnmtNeol9NXOLu2GT_H_lLzK YBTkGW7fMebMO85bQTmjepagnlKbIlNmkuc.ajzCbr8Qf8fSzaXXGvzArkYG.T.w2cU0ggLDcJPC BpeVLLEK4wB_9Pw2Pb8FyxkYsXY23.RsaHs4d2105Dy1bxdy6PO_hRcQZHlL8ORw2togA2RPMdHF eY5THeTvYOrL4d3EfvNpM0Z_AY5UbbZP4rFRWC39kONRC6acYnEksUGs1GkRErYuIhPjVQNQBXhy 2SXLcJo319KpopRgZmMjNGAuZwCTmVw9YwffBJSwsK_yr2_cwE2oPhIfPd7Y0E0GeajbCAXPFtS5 l53iZ9jwo.MYMUI7tttONMCJxM3.gmyMrUijbZtbLkJ97u4jmXBRP88NOV6LZ3JVnCMn_VKjv5KE mnRUM6egWVTgMXQxeTQKJlzCKP2GWBhEycN2YShOwgbrZhpKxh0KdeD6dSQ9aXLyZ_NZebt7Y9au Cb_UiNuetV_fbWwYkf5v4qdif3jJxQPRXTw6xYN3dYVNSPWOyw1FzrxV5smbIVUduuy9jcROlOr0 H6EcwZHTYmpiHV5.myYkTkmiXLhHbJUXyCVUOUXImaOGK_9v0wlLDf5B5Agx4GjzKDjTB4jUzTe2 KVH09c1_mtEouRRNtKl.xYZ5fpyp5BBUu8kQ7C7V6AIFz2ut26Slr1ei4MGptBWWiWZVIeh_FSlD 7VwF5MO156sXHCpwM0kvxquGgmN0LGmH9IrB.HZ3G9AgPeS.l0FWVujaFCTEJV_9lgK0rhnu24px ZZ3lgmFkiS_WN6D0pKW.NF1C7PAwihAtSAGRGq4HcqOFzEF_MMwQ4lohHcU.QNzVnN8DrtYLwMQr zjdKmE0v7gJL4GU4R7l6590yKwYT2yjWgEo19z1hkhYNHnWvZ8cBFSGF9SZGHLJfYluz1yYEqhxC e8HK7hOV5zuj82yluAI_g45LtoCfTFOFZLaxVgKSx2g1MT4fQa4G1yVbJcugffOdU9.NJc6Pro7v I5WMtPowam6lXy8NOdoCxKsMuYGXMigh6AWmfpMdrPUDEfyRDPEqz8Qj_Km9gZyQ- X-Sonic-MF: X-Sonic-ID: 4047d000-da5e-4a7f-b628-559eb10ac7d0 Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.gq1.yahoo.com with HTTP; Sun, 17 Aug 2025 03:41:40 +0000 Received: by hermes--production-gq1-74d64bb7d7-6nlps (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 79ceb98414119bc1ee3f423bae9f8efd; Sun, 17 Aug 2025 03:41:35 +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 \(3826.700.81\)) Subject: Re: FYI: Example of pkgbase /usr/src/ files with differences vs. what uname -apKU reports for the commit hash Date: Sat, 16 Aug 2025 20:41:24 -0700 References: To: FreeBSD-pkgbase@freebsd.org In-Reply-To: Message-Id: X-Mailer: Apple Mail (2.3826.700.81) X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; 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_DN_NONE(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.66.147:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.66.147:from] X-Rspamd-Queue-Id: 4c4M8k5cxfz3f4G On Aug 12, 2025, at 18:39, Mark Millard wrote: > =46rom a recent pkgbase upgrade: >=20 > # uname -apKU > FreeBSD 7950X3D-ZFS 15.0-PRERELEASE FreeBSD 15.0-PRERELEASE = main-n279547-b89104dfd5cf GENERIC-NODEBUG amd64 amd64 1500059 1500059 >=20 > That upgrade sequence established its own /usr/src/ update. >=20 > Then: >=20 > # cd /usr/ > # git clone -b main https://git.freebsd.org/src.git src-alt > # cd /usr/src-alt/ > # git checkout b89104dfd5cf > . . . >=20 > # diff -rq -x .git /usr/src/ /usr/src-alt/ > Files /usr/src/ObsoleteFiles.inc and /usr/src-alt/ObsoleteFiles.inc = differ > Only in /usr/src/contrib/sqlite3/tea: tclconfig > Only in /usr/src/contrib/sqlite3/tea: win > Only in /usr/src/crypto/krb5/src/kadmin: kdbkeys > Only in /usr/src/crypto/krb5/src/kadmin: scripts > Only in /usr/src/crypto/krb5/src/lib/crypto/crypto_tests: test > Only in /usr/src/crypto/krb5/src/lib/krb5: posix > Only in /usr/src/crypto/krb5/src/tests: softpkcs11 > Only in /usr/src/krb5/include: krb5_private > Files /usr/src/krb5/usr.bin/ksu/Makefile and = /usr/src-alt/krb5/usr.bin/ksu/Makefile differ > Only in /usr/src/lib/libprocstat: zfs > Only in /usr/src/share/doc/legal: intel_iwlwififw > Only in /usr/src/stand/i386: zfsboot > Only in /usr/src/sys/arm/ti: omap4 > Only in /usr/src/sys/arm/ti: twl > Only in /usr/src/sys/arm/ti: usb > Only in /usr/src/sys/contrib/dev: iwlwififw > Only in /usr/src/sys/contrib/openzfs/lib/libzpool: include > Only in /usr/src/sys/modules/dtb: omap4 > Only in /usr/src/sys/modules: iwlwififw > Only in /usr/src/tools/tools/net80211: wlanstats > Only in /usr/src/usr.bin: objcopy > Only in /usr/src/usr.bin: shar > Only in /usr/src/usr.sbin: nvmfd > Only in /usr/src/usr.sbin: rpc.ypupdated >=20 > # diff -u /usr/src/ObsoleteFiles.inc /usr/src-alt/ObsoleteFiles.inc > --- /usr/src/ObsoleteFiles.inc 2025-08-11 15:40:54.000000000 -0700 > +++ /usr/src-alt/ObsoleteFiles.inc 2025-08-12 12:07:44.279492000 -0700 > @@ -61,8 +61,6 @@ >=20 > # 20250807: Replace lib/libgssapi with krb5/lib/gssapi > OLD_FILES+=3Dusr/include/gssapi_krb5/gssapi.h > -OLD_FILES+=3Dusr/include/gssapi_krb5/gssapi/gssapi.h > -OLD_FILES+=3Dusr/include/gssapi_krb5/gssapi/mechglue.h > OLD_DIRS+=3Dusr/include/gssapi_krb5/gssapi > OLD_DIRS+=3Dusr/include/gssapi_krb5 > OLD_FILES+=3Detc/gssapi/qop >=20 > # diff -u /usr/src/krb5/usr.bin/ksu/Makefile = /usr/src-alt/krb5/usr.bin/ksu/Makefile > --- /usr/src/krb5/usr.bin/ksu/Makefile 2025-08-11 15:40:54.000000000 = -0700 > +++ /usr/src-alt/krb5/usr.bin/ksu/Makefile 2025-08-12 = 12:07:44.279733000 -0700 > @@ -23,8 +23,7 @@ > xmalloc.c >=20 > CFLAGS+=3D-I${KRB5_DIR}/include \ > - -I${KRB5_SRCTOP}/include \ > - -DGET_TGT_VIA_PASSWD > + -I${KRB5_SRCTOP}/include >=20 > MAN=3D ksu.1 Another example, /usr/src/ is as established by pkgbase : # uname -apKU FreeBSD 7950X3D-ZFS 15.0-PRERELEASE FreeBSD 15.0-PRERELEASE = main-n279648-3f94fb8d6a76 GENERIC-NODEBUG amd64 amd64 1500061 1500061 # git -C /usr/src-alt/ switch main . . . # git -C /usr/src-alt/ fetch . . . # git -C /usr/src-alt/ merge --ff-only . . . # git -C /usr/src-alt/ checkout 3f94fb8d6a76 # diff -rq -x .git /usr/src-alt/ /usr/src/ Files /usr/src-alt/Makefile.libcompat and /usr/src/Makefile.libcompat = differ Files /usr/src-alt/UPDATING and /usr/src/UPDATING differ Files /usr/src-alt/contrib/kyua/doc/kyuafile.5.in and = /usr/src/contrib/kyua/doc/kyuafile.5.in differ Files /usr/src-alt/contrib/kyua/drivers/report_junit_test.cpp and = /usr/src/contrib/kyua/drivers/report_junit_test.cpp differ Files /usr/src-alt/contrib/kyua/engine/atf_list.cpp and = /usr/src/contrib/kyua/engine/atf_list.cpp differ Files /usr/src-alt/contrib/kyua/engine/requirements.cpp and = /usr/src/contrib/kyua/engine/requirements.cpp differ Files /usr/src-alt/contrib/kyua/engine/requirements.hpp and = /usr/src/contrib/kyua/engine/requirements.hpp differ Files /usr/src-alt/contrib/kyua/integration/cmd_report_junit_test.sh and = /usr/src/contrib/kyua/integration/cmd_report_junit_test.sh differ Files /usr/src-alt/contrib/kyua/integration/cmd_report_test.sh and = /usr/src/contrib/kyua/integration/cmd_report_test.sh differ Files /usr/src-alt/contrib/kyua/model/metadata.cpp and = /usr/src/contrib/kyua/model/metadata.cpp differ Files /usr/src-alt/contrib/kyua/model/metadata.hpp and = /usr/src/contrib/kyua/model/metadata.hpp differ Files /usr/src-alt/contrib/kyua/model/metadata_test.cpp and = /usr/src/contrib/kyua/model/metadata_test.cpp differ Files /usr/src-alt/contrib/kyua/model/test_case_test.cpp and = /usr/src/contrib/kyua/model/test_case_test.cpp differ Files /usr/src-alt/contrib/kyua/model/test_program_test.cpp and = /usr/src/contrib/kyua/model/test_program_test.cpp differ Files /usr/src-alt/contrib/kyua/os/freebsd/main.cpp and = /usr/src/contrib/kyua/os/freebsd/main.cpp differ Only in /usr/src/contrib/kyua/os/freebsd: reqs_checker_kmods.cpp Only in /usr/src/contrib/kyua/os/freebsd: reqs_checker_kmods.hpp Only in /usr/src/contrib/sqlite3/tea: tclconfig Only in /usr/src/contrib/sqlite3/tea: win Only in /usr/src/crypto/krb5/src/kadmin: kdbkeys Only in /usr/src/crypto/krb5/src/kadmin: scripts Only in /usr/src/crypto/krb5/src/lib/crypto/crypto_tests: test Only in /usr/src/crypto/krb5/src/lib/krb5: posix Only in /usr/src/crypto/krb5/src/tests: softpkcs11 Only in /usr/src/krb5/include: krb5_private Files /usr/src-alt/lib/libmilter/Makefile and = /usr/src/lib/libmilter/Makefile differ Only in /usr/src/lib/libprocstat: zfs Only in /usr/src/release/packages/ucl: libmilter-all.ucl Only in /usr/src/share/doc/legal: intel_iwlwififw Only in /usr/src/stand/i386: zfsboot Only in /usr/src/sys/arm/ti: omap4 Only in /usr/src/sys/arm/ti: twl Only in /usr/src/sys/arm/ti: usb Only in /usr/src/sys/contrib/dev: iwlwififw Only in /usr/src/sys/contrib/openzfs/lib/libzpool: include Only in /usr/src/sys/modules/dtb: omap4 Only in /usr/src/sys/modules: iwlwififw Only in /usr/src/tools/tools/net80211: wlanstats Files /usr/src-alt/usr.bin/kyua/Makefile and = /usr/src/usr.bin/kyua/Makefile differ Only in /usr/src/usr.bin: objcopy Only in /usr/src/usr.bin: shar Only in /usr/src/usr.sbin: nvmfd An example diff is: # diff -u /usr/src-alt/lib/libmilter/Makefile = /usr/src/lib/libmilter/Makefile --- /usr/src-alt/lib/libmilter/Makefile 2025-08-16 20:23:45.038906000 = -0700 +++ /usr/src/lib/libmilter/Makefile 2025-08-16 16:19:43.000000000 = -0700 @@ -1,6 +1,6 @@ .include =20 -PACKAGE=3Dsendmail +PACKAGE=3Dlib${LIB} SENDMAIL_DIR=3D${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm =20 For the pkgbase build, /usr/src/sys/ can be somewhat older than /usr/src/ outside sys/ . The likes of main-n279648-3f94fb8d6a76 from the uname -apKU output is for the /usr/src/sys/ . Figuring out what commit corresponds to the /usr/src/ outside sys/ is not necessarily trivial. =3D=3D=3D Mark Millard marklmi at yahoo.com