Timing discrepancy or simply a misunderstanding with FBSD-HBSD src updates

[Dewayne Geraghty]

The latest FreeBSD 14/stable change
https://cgit.freebsd.org/src/commit/?h=stable/14&id=098e4ecd65492bd23f88f4358f0c6bde13a1e114
but HardenedBSD has this (same) change
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/commit/d8b03c5904faff84656d3a84a25c2b37bcbf8075
as occurring two weeks ago, per
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/tree/hardened/current/master/sys/vm?ref_type=heads

As I'm trying to synchronisation between the two platforms, is there a
reason for this difference.

I'm trying to understand so that I can better track the changes and
maintaining an equivalence between the systems. The reason is that
we're doing quite a bit of development on HardenedBSD, so if something
is breaks or is broken it's helpful to determine whether the fault lies
with hardenedbsd, freebsd or, umm, me.

PS During the Pandemic we did perform perform a diff of HardenedBSD
against FreeBSD. There was surprise at just how many improvements you
and the team had made.

[Shawn Webb]

On Sat, May 03, 2025 at 11:57:02AM +1000, Dewayne Geraghty wrote:
> The latest FreeBSD 14/stable change
> https://cgit.freebsd.org/src/commit/?h=stable/14&id=098e4ecd65492bd23f88f4358f0c6bde13a1e114
> but HardenedBSD has this (same) change
> https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/commit/d8b03c5904faff84656d3a84a25c2b37bcbf8075
> as occurring two weeks ago, per
> https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/tree/hardened/current/master/sys/vm?ref_type=heads

Commit 098e4ecd65492bd23f88f4358f0c6bde13a1e114 is a `git cherry-pick`
of commit d8b03c5904faff84656d3a84a25c2b37bcbf8075 to the stable/14
branch.

So, the d8b03c5904faff84656d3a84a25c2b37bcbf8075 commit landed in
FreeBSD's main branch. After some time, that commit was cherry-picked
into the stable/14 branch. That new commit (in stable/14) is
098e4ecd65492bd23f88f4358f0c6bde13a1e114. You can see the following
text in the commit log for stable/14:

"(cherry picked from commit d8b03c5904faff84656d3a84a25c2b37bcbf8075)"

That is due to FreeBSD running the following (or a similar command) in
the stable/14 branch:

$ git cherry-pick -x d8b03c5904faff84656d3a84a25c2b37bcbf8075

>
> As I'm trying to synchronisation between the two platforms, is there a
> reason for this difference.

Note: We sync with FreeBSD every six hours.

>
> I'm trying to understand so that I can better track the changes and
> maintaining an equivalence between the systems. The reason is that we're
> doing quite a bit of development on HardenedBSD, so if something is breaks
> or is broken it's helpful to determine whether the fault lies with
> hardenedbsd, freebsd or, umm, me.
>
> PS During the Pandemic we did perform perform a diff of HardenedBSD against
> FreeBSD. There was surprise at just how many improvements you and the team
> had made.

We've been busy the past decade. :-)

Please let me know if you have any further questions.

Thanks,

--
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

Signal Username: shawn_webb.74
Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50
https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc