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

[Backport release-24.05] heimdal: 7.8.0-unstable-2023-11-29 -> 7.8.0-unstable-2024-09-10 #346965

Merged
merged 3 commits into from
Dec 6, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 6, 2024

Bot-based backport to release-24.05, triggered by a label in #345129.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

@github-actions github-actions bot added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Oct 6, 2024
@ofborg ofborg bot requested a review from h7x4 October 7, 2024 00:49
@h7x4 h7x4 marked this pull request as draft October 7, 2024 09:25
@wolfgangwalther
Copy link
Contributor

@h7x4 what was the intent to mark this as draft here? In #345129 (comment) you mentioned a CVE and the need to backport.

@wolfgangwalther
Copy link
Contributor

Result of nixpkgs-review pr 346965 run on aarch64-darwin 1

4 packages failed to build:
  • heimdal
  • heimdal.dev
  • heimdal.info
  • heimdal.man

1. when db.h provides ndbm compat layer, include db.h not ndbm.h.

Otherwise, compilation fails due to incompatible type declarations
between libSystem and db includes.

2. tell the build system that db_185.h is present.

Otherwise, the code includes db.h as if it's v1 header. (It's not.)

3. link some tests with -lresolv where needed.

All three patches are posted upstream.

Closes: #347616
@wolfgangwalther
Copy link
Contributor

Cherry-picked #348370 as well, let's see whether that fixes darwin.

@wolfgangwalther
Copy link
Contributor

Nope, that didn't do it for me.

…ch to not break patches

(cherry picked from commit b0231c9)
@wegank wegank marked this pull request as ready for review December 6, 2024 17:04
@wegank wegank merged commit f48fad1 into release-24.05 Dec 6, 2024
11 of 12 checks passed
@wegank wegank deleted the backport-345129-to-release-24.05 branch December 6, 2024 17:11
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