On Apr 23, 2025, at 13:59, Mark Millard <mark...@yahoo.com> wrote: > On Apr 23, 2025, at 12:01, Mark Millard <mark...@yahoo.com> wrote: > >> On Apr 23, 2025, at 11:44, Mark Millard <mark...@yahoo.com> wrote: >> >>> pkg 2.1.1 used: 0e22efc407eaaaf0154cde4507fba27c9e3ca237 >> >> I did this comparison in a likely confusing way, mixing >> 2.1.99.2 references and 2.1.1 references. >> >> (2.1.1 is missing something so that can not be referenced >> via 2.1.1 .) >> >>> The prior 2.1.99.2 used: 01165121d076dfd090b101ce2915d786fea85381 >>> (which is newer and has the fix that avoids the recursive install >>> of the same port indefinately) >> >> >> Trying again: >> >> https://github.com/freebsd/pkg/commits/2.1.1/ >> >> shows: >> >> Release 2.1.1 >> (as c3a391e431b788500ace2da21259389d077aa325) >> >> prevent undefined behaviour (detected by UBSAN) >> (as d3bc2b95860d06192aaebb4e7ff20e1137f7f004) >> >> It does not show an: >> >> abi: fix shlibs_required skipped by accident >> >> >> By contrast: >> >> https://github.com/freebsd/pkg/commits/main/ >> >> does show that abi fix (as 01165121d076dfd090b101ce2915d786fea85381) >> It also shows an earlier: >> >> prevent undefined behaviour (detected by UBSAN) >> (as f8eb92999ee8e0509ceef357329c32517dca6436) >> > > Looks like pkg 2.1.1 is almost identical to pkg 2.1.99.1 > (not 2.1.99.2). 2.2.2 has the UCL_COUNT in the below
2.2.2: I should have typed 2.1.1 > ( libpkg/private/pkg.h ) but 2.1.99.1 does not. (I > ignore auto.def and NEWS here.) > > #include "private/utils.h" > #include "private/fetch.h" > #include "pkghash.h" > > #define UCL_COUNT(obj) ((obj)?((obj)->len):0) > > #define PKG_NUM_SCRIPTS 9 > #define PKG_NUM_LUA_SCRIPTS 5 The changes in 2.1.99.2's pkg_abi.c , pkg_add.c , pkg_ports.c , pkgdb_iterator.c , pkgdb_query.c , pkgdb.c , and utils.c are not present. Nor are the the tests/lib/ file changes in shlibs.c and vec.c . === Mark Millard marklmi at yahoo.com
