Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #17300 to 7.7: Restore patched version of gopacket #17317

Merged
merged 1 commit into from
Apr 8, 2020

Conversation

adriansr
Copy link
Contributor

@adriansr adriansr commented Mar 30, 2020

Cherry-pick of PR #17300 to 7.7 branch. Original message:

What does this PR do?

This replaces github.com/google/gopacket with github.com/adriansr/gopacket which includes a fix to make af_packet work on 32bit x86 platforms.

This patched version was already vendored but lost during the migration to Go modules.

This patch is on review at google/gopacket#720 to hopefully get it merged upstream.

Why is it important?

This is necessary so that Auditbeat's system/socket works in 32bit Linux.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc. -> no changelog entry needed as this regression has not been released.

Related issues

This replaces github.com/google/gopacket with
github.com/adriansr/gopacket which includes a fix to make af_packet work
on 32bit x86.

This patched version was already vendored but lost during the migration
to Go modules.

This patch is on review at google/gopacket#720

(cherry picked from commit 002b9c5)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@adriansr
Copy link
Contributor Author

adriansr commented Apr 7, 2020

jenkins, test this

1 similar comment
@adriansr
Copy link
Contributor Author

adriansr commented Apr 8, 2020

jenkins, test this

@mikemadden42 mikemadden42 merged commit 1d95e36 into elastic:7.7 Apr 8, 2020
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
This replaces github.com/google/gopacket with
github.com/adriansr/gopacket which includes a fix to make af_packet work
on 32bit x86.

This patched version was already vendored but lost during the migration
to Go modules.

This patch is on review at google/gopacket#720

(cherry picked from commit 7a65724)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants