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

Fix ASP services to work with 3.x codebase. #1355

Merged
merged 1 commit into from
Aug 2, 2024

Conversation

NJRoadfan
Copy link
Contributor

There were some changes to server_child.h in the 3.x codebase. This updates the ASP routines to work with the newer code. Please note that this is untested until AppleTalk support is re-added into afpd.

With this PR, one can now enable AppleTalk and build main successfully.

@NJRoadfan NJRoadfan requested a review from rdmark as a code owner July 31, 2024 02:03
@rdmark
Copy link
Member

rdmark commented Jul 31, 2024

This might be a good time to turn on -Dwith-appletalk=true for the GitHub CI workflow jobs to start continuously testing the code. Do you want to make that change in this PR?

@NJRoadfan
Copy link
Contributor Author

Added -Dwith-appletalk=true to CI actions. Several platforms are failing with weird errors. Alpine is failing on values that are coming from built in libraries.

.github/workflows/build.yml Outdated Show resolved Hide resolved
@rdmark
Copy link
Member

rdmark commented Jul 31, 2024

Added -Dwith-appletalk=true to CI actions. Several platforms are failing with weird errors. Alpine is failing on values that are coming from built in libraries.

Alpine and OmniOS are failing in a similar way with missing O_RDWR and similar symbols.

All of the BSDs are failing in papd with a missing WNOHANG symbol.

Off the top of my head: probably due to some missing platform or capability macro.

BTW, OpenBSD is passing just because there's a hard coded cdata.set('NO_DDP', 1) for this OS in the main meson.build. This originates with a hotfix from 2011 and should probably be removed because it is better controlled at configure time, in my opinion.

@NJRoadfan
Copy link
Contributor Author

Looks like there are a few obsolete platform macros remaining in the 2.x code base causing the failures. The two in question are HAVE_SYS_WAIT_H and HAVE_FCNTL_H . I also ran into HAVE_ERRNO_H with the earlier commit. The 3.x codebase assumes all these headers are included, so it is likely safe to remove these macros.

@rdmark
Copy link
Member

rdmark commented Aug 2, 2024

@NJRoadfan This looks good to me now. I think it would be cleaner to rebase this changeset into a single commit.

There were some changes to `server_child.h` in the 3.x codebase. This updates the ASP routines to work with the newer code. Please note that this is untested until AppleTalk support is re-added into afpd.

Misc. fixes to allow building on multiple platforms

Remove some obsolete platform macros.

With this PR, one can now enable AppleTalk and build main successfully.
@rdmark rdmark merged commit 727eb68 into Netatalk:main Aug 2, 2024
14 checks passed
@NJRoadfan NJRoadfan deleted the njroadfan-fix-asp-services branch August 17, 2024 18:41
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