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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

unbound: 1.19.2 pkg-config for protobuf-c #289979

Merged
merged 1 commit into from
Mar 11, 2024

Conversation

haraldh
Copy link
Contributor

@haraldh haraldh commented Feb 19, 2024

Description of changes

Patched configure script with:
NLnetLabs/unbound@59d98b9 Credits: @NickCao

Enables multiple outputs for protobuf-c as in #283783

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 馃憤 reaction to pull requests you find important.

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I apply this to master and set withDNSTAP ? true, I get a failure

checking for library containing protobuf_c_message_pack... no
configure: error: The protobuf-c library was not found. Please install the development libraries for protobuf-c!

@NickCao
Copy link
Member

NickCao commented Feb 29, 2024

There was a followup: NLnetLabs/unbound#1006

@SuperSandro2000
Copy link
Member

I think the fix is NLnetLabs/unbound@3f51755

@haraldh
Copy link
Contributor Author

haraldh commented Mar 1, 2024

added both followup patches

@haraldh haraldh force-pushed the unbound_pkg_config branch 2 times, most recently from ff244ac to 40aa666 Compare March 1, 2024 14:06
@haraldh haraldh requested a review from vcunat March 1, 2024 14:08
@haraldh haraldh force-pushed the unbound_pkg_config branch 3 times, most recently from 1340595 to acf5295 Compare March 1, 2024 14:33
@haraldh
Copy link
Contributor Author

haraldh commented Mar 1, 2024

hmm.. ofborg-eval seems to be broken after rebasing to current staging

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Mar 1, 2024

@ofborg build unbound

@vcunat
Copy link
Member

vcunat commented Mar 2, 2024

The eval problem (llvmPackages.mlir) has been fixed. But you may need to rebase past the fix to make the issue disappear here.

@NickCao
Copy link
Member

NickCao commented Mar 2, 2024

@ofborg eval

@haraldh
Copy link
Contributor Author

haraldh commented Mar 8, 2024

error: building of '/nix/store/j1ylkl7kc54pgrxpl9mlyzh3x10k92wk-llvm-16.0.6.drv^dev' from .drv file timed out after 3600 seconds

@haraldh
Copy link
Contributor Author

haraldh commented Mar 8, 2024

rebased on current staging

@vcunat
Copy link
Member

vcunat commented Mar 9, 2024

Maybe update to .2 instead of applying patches? Notably I see in announcement:

Fix CVE-2024-1931, Denial of service when trimming EDE text on positive replies.

(I just assume that these patches are included; maybe they aren't. Anyway, that update sounds good to include.)

Patched configure script with:
NLnetLabs/unbound@59d98b9
Credits: @NickCao

and followup patches fixing the patch.

Enables multiple outputs for protobuf-c

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
@haraldh haraldh changed the title unbound: 1.19.1 pkg-config for protobuf-c unbound: 1.19.2 pkg-config for protobuf-c Mar 11, 2024
@haraldh
Copy link
Contributor Author

haraldh commented Mar 11, 2024

rebased on 1.19.2

@SuperSandro2000 SuperSandro2000 merged commit b4a23ce into NixOS:staging Mar 11, 2024
24 of 29 checks passed
@SuperSandro2000
Copy link
Member

Works on linux, darwin we can only reasonable test in staging-next, anyway

@haraldh haraldh deleted the unbound_pkg_config branch March 11, 2024 14:51
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.

None yet

4 participants