Page MenuHomeFreeBSD

Synchronize OpenBSM github repository with the FreeBSD sources
ClosedPublic

Authored by gbe on May 27 2020, 8:13 AM.

Details

Summary

The following cherry picks where obtained from the OpenBSM github repository. This is
a prerequisite for D23572.

cherry-pick d268b82e3f35a21d97b89d0e609d9ab425c8b262 from OpenBSM: Fix typos in Manpages
cherry-pick 8b1533f59be6f41d06cafb17e01396599b5c56bf aecb5fc5f8219077e1760718156c8e07d66ecfd8 from OpenBSM: Update CREDITS
cherry-pick 2806aade9c9c3d9db95820fc0aa1eba488edc384 from OpenBSM: Add a missing ai_flags to the struct auditinfo_addr
cherry-pick 345a6b12eb4f3539c483c9ae9dc90b30f8ad623e from OpenBSM: Fix a Typo
cherry-pick 25333cd875f47bd886f5ad1b356673bc6654d331 from OpenBSM: Fix a Typo in Comment
cherry-pick 89e9a6f35c920d25dc6bc89592d14202c199d704 from OpenBSM: Fix a Typos and Whitespaces
cherry-pick 71ce9751cd369da29a336f2fc5b03894f010c2a9 from OpenBSM: Fix a Typos
cherry-pick 2e4308c8d3726ca5d01651963dc96eda637f5513 from OpenBSM: Grammar
cherry-pick 93d34345456499b4f996767b30c363e5dbf3634c from OpenBSM: Fix Record Version Number in manpage
cherry-pick 48eccb98bef5baf6ebf90437fb79649709e8d935 from OpenBSM: Correct size of Terminal Address typ/Lenght field
cherry-pick 53631a790f4006405308f1842d67fed985bb658d from OpenBSM: Fix Typo in a warning message

PR 243322

Test Plan

make world

Diff Detail

Repository
rS FreeBSD src repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

gbe requested review of this revision.May 27 2020, 8:13 AM
gbe created this revision.
gbe added a reviewer: rwatson.
bcr added a subscriber: bcr.

OK from manpages.

I'm a little confused, should this not just be a vendor update of OpenBSM? In come circumstances we might cherry-pick an individual fix or two into contrib/, but in general I'd expect to see a wholesale update to a newer release/snapshot.

I'm a little confused, should this not just be a vendor update of OpenBSM? In come circumstances we might cherry-pick an individual fix or two into contrib/, but in general I'd expect to see a wholesale update to a newer release/snapshot.

The FreeBSD OpenBSM sources already have local additions that weren't upstreamed, So my intention was to get the OpenBSM sources from upstream as close as possible and then upstream the FreeBSD changes. I have used cherry-picks since most of the changes within OpenBSM are mostly updates to the manpages or code comments.

Adding Contributor Reviews (base) as reviewer in the hope to speedup the approval process.

I am ok with this diff.

I do think we ought to do a vendor import sooner than later though. @gbe I merged a couple of syscall identifiers here: https://github.com/openbsm/openbsm/pull/63 Can you point me to specifically which changes have been made to FreeBSD that haven't been upstreamed? I can work on getting those in. The diffs between default github branch for OpenBSM and base are extensive, so we need to make sure we get it tested and merged in a responsible manner.

This revision is now accepted and ready to land.Jul 1 2020, 3:37 AM
contrib/openbsm/man/getaudit.2
65 ↗(On Diff #72301)

space issue here

In D25021#564243, @csjp wrote:

I am ok with this diff.

I do think we ought to do a vendor import sooner than later though. @gbe I merged a couple of syscall identifiers here: https://github.com/openbsm/openbsm/pull/63 Can you point me to specifically which changes have been made to FreeBSD that haven't been upstreamed? I can work on getting those in. The diffs between default github branch for OpenBSM and base are extensive, so we need to make sure we get it tested and merged in a responsible manner.

As far as I can remember the changes were the following,

https://github.com/freebsd/freebsd/commit/4faee8fc9d06b64dbc8feb25b3a84b269b99723f#diff-28a31957ccf3af81d1fd1d12abf5131e
https://github.com/freebsd/freebsd/commit/72a21ba0f62da5e86a1c0b462aeb3f5ff849a1b7#diff-28a31957ccf3af81d1fd1d12abf5131e
https://github.com/freebsd/freebsd/commit/cdf255bc9fa08a632659986088fe11f9747c326c#diff-28a31957ccf3af81d1fd1d12abf5131e
https://github.com/freebsd/freebsd/commit/3c25eec2c353aafe1b3338c66bfbaed78075ef43#diff-28a31957ccf3af81d1fd1d12abf5131e

If the diff is integrated we could simple diff our version with the OpenBSM sources on GitHub and upstream it accordingly.

Could you commit this differential? I only have a doc commit bit.

OK for the doc side of the change.

@emaste could take care of the commit?

Thats are mostly documentation updates to man pages and source code comments and manpages has reviewed them.

I will take care of this commit. I thought this was done already

Thanks!

In D25021#570777, @csjp wrote:

I will take care of this commit. I thought this was done already

Thanks!

ping? ;-)

Working on this right now BTW, just waiting for CI to finish