HardenedBSD auto-sync with upstream

82 views
Skip to first unread message

Shawn Webb

unread,
Dec 18, 2020, 11:35:23 AM12/18/20
to HardenedBSD Users
Hey all,

Every six hours, we run a set of scripts to sync with our upstream,
FreeBSD.

Starting later today, FreeBSD will work on switching from subversion
to git. FreeBSD is taking the opportunity to resolve issues with
historical commits. That means that the history of the repo, and its
associated commit hashes, will change.

I've run some early tests to pull in the new FreeBSD repo. git becomes
very confused and thinks every single file that we in HardenedBSD have
changed conflicts. That effectively means that we/I have to re-apply
our changes to each and every file. After 7.5 years of development, a
lot of files have been changed. Because of git's confusion, I need to
reimplement much (all?) of HardenedBSD's changes across multiple
branches (hardened/current/master, hardened/12-stable/master, and
hardened/12.2-releng/master).

I expect this reimplementation work will take weeks. Of course, I will
disable the auto-sync later today (after the next sync in 30 minutes
from this writing). I'll keep the community updated as to my progress.

I'd like to take a moment and give gratitude to the community. It's a
pleasure to serve you. I'm grateful for the support you, the
community, provides. We just received a very gracious donation of
$6,600 USD. I plan to budget that towards a new server to host our
self-hosted git service, one or more smaller arm64 devices, and
possibly a risc-v dev board.

Whether monetary, advocacy, bug report submissions, or other ways to
contribute, I'm grateful for your contributions. Your contributions
enable the project's continued development efforts.

Thanks,

--
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

GPG Key ID: 0xFF2E67A277F8E1FA
GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
signature.asc

The HardenedBSD Project

unread,
Dec 20, 2020, 7:54:00 AM12/20/20
to HardenedBSD Users
a

GPG Key ID:?? ?? ?? ?? ?? 0xFF2E67A277F8E1FA
GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9?? 3633 C85B 0AF8 AB23 0FB2
https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc

vv

unread,
Dec 20, 2020, 10:51:02 AM12/20/20
to HardenedBSD Users
That's great news! Keep doing your thing, Shawn!

Thank you.

||
On 12/20/20 6:53 AM, The HardenedBSD Project wrote:
> From FreeBSD's svn commit log (r368820):
>
> Mark the repository as being converted to Git.
>
> This is the last Subversion commit to src.
>
> https://svnweb.freebsd.org/base?view=revision&revision=368820
>
> Ben La Monica from the HardenedBSD Foundation Board of Directors is
> helping me in this effort to migrate to the new FreeBSD git repo.
> We're still in the very early stages of this migration. We haven't yet
> formulated a plan of action. That may come later this coming week.
>
> Thanks,
>
> --
> Shawn Webb
> Cofounder / Security Engineer
> HardenedBSD
>
> GPG Key ID: 0xFF2E67A277F8E1FA
> GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
> https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
>
>> GPG Key ID: 0xFF2E67A277F8E1FA
>> GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
>>
>> https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
>>
>
>

Shawn Webb

unread,
Dec 20, 2020, 12:33:56 PM12/20/20
to HardenedBSD Users
It's looking like the command posted below might've actually worked as
desired. I'm doing some test builds right now.

git merge -X ours --allow-unrelated-histories freebsd/main

On Sun, Dec 20, 2020 at 07:53:57AM -0500, The HardenedBSD Project wrote:
> From FreeBSD's svn commit log (r368820):
>
> Mark the repository as being converted to Git.
>
> This is the last Subversion commit to src.
>
> https://svnweb.freebsd.org/base?view=revision&revision=368820
>
> Ben La Monica from the HardenedBSD Foundation Board of Directors is
> helping me in this effort to migrate to the new FreeBSD git repo.
> We're still in the very early stages of this migration. We haven't yet
> formulated a plan of action. That may come later this coming week.
>
> Thanks,
>
> --
> Shawn Webb
> Cofounder / Security Engineer
> HardenedBSD
>
> GPG Key ID: 0xFF2E67A277F8E1FA
> GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
> https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
>
> > GPG Key ID: 0xFF2E67A277F8E1FA
> > GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
> >
> > https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
> >



--
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

GPG Key ID: 0xFF2E67A277F8E1FA
GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2
https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
signature.asc

Shawn Webb

unread,
Dec 26, 2020, 2:58:10 PM12/26/20
to HardenedBSD Users
Hey all,

I have now finished up our 13-current branch
(hardened/current/master). I will soon work on our 12-stable branch
(hardened/12-stable/master).

For the next week or so, I plan to keep the repos up-to-date manually
in case there's any fallout. I will do my best to sync the repos at
least once per day.

Now that 13-current is taken care of, I will start a new
13-current/amd64 package build later today or tomorrow. I'll do the
same for 12-stable, when I'm finished working on that branch, too.

I'll send another email once 12-stable is fixed up.
signature.asc

Shawn Webb

unread,
Dec 28, 2020, 12:40:11 PM12/28/20
to HardenedBSD Users
I've fixed up the 12-stable branch now, too. I've published binary
updates for both 13-current/amd64 and 12-stable/amd64. I've also
kicked off package builds for them.

The auto-sync scripts remain disabled until I get time to adjust the
sync to use the new upstream and its branches.
signature.asc

Shawn Webb

unread,
Dec 29, 2020, 1:49:43 PM12/29/20
to HardenedBSD Users
I've re-enabled the auto-sync scripts for 13-current and 12-stable. I
haven't had the opportunity to work on 12.1-releng and 12.2-releng.
signature.asc
Reply all
Reply to author
Forward
0 new messages