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

net/zerotier: Fix building and cleanup existing patches #1465

Merged
merged 5 commits into from
Dec 17, 2023

Conversation

liweitianux
Copy link
Member

  • Add one patch (patch-ext_prometheus-cpp-lite-1.0_core_include_prometheus_text__serializer.h to fix the building of 1.12.2 version.
  • Regenerate the existing patches as a result of make makepatch.
  • Remove unnecessary diffs to files/zerotier.in.
  • Restore the FreeBSD's ZEROTIER_SYSLOG substitution.

Our daemon(8) has been synced with FreeBSD and supports the '-t'
parameter.
Similar to the previous commit, our daemon(8) now supports the '-s' and
'-T' parameters.
No meaningful changes, but update it still.

I'll add one more patch to fix the building, so update the existing
patches as a result of the 'make makepatch'.
The existing patchset only makes ZeroTier build but it doesn't work.
Well, one workaround is required to get it working: manually create the
tapX interface before starting ZeroTier.

The new patchset fixes the TAP code and make it now working the same way
as on FreeBSD.

This is a port of my previous PR to get DragonFly support in ZeroTier:
zerotier/ZeroTierOne#1043
@liweitianux
Copy link
Member Author

See also my previous PR to ZeroTier: zerotier/ZeroTierOne#1043

@tuxillo tuxillo merged commit 4d52dcb into DragonFlyBSD:master Dec 17, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants