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

Staging 20.03 #88077

Merged
merged 6 commits into from May 22, 2020
Merged

Staging 20.03 #88077

merged 6 commits into from May 22, 2020

Conversation

roberth
Copy link
Member

@roberth roberth commented May 18, 2020

Motivation for this change

Staging was built so its changes should become available.

@flokli Does #87968 require any manual testing?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

elohmeier and others added 4 commits May 16, 2020 21:51
Allow the darwin links code to overwrite libs that were already
copied, because C dependencies can occur multiple times.

Solves errors like

    ln: failed to create symbolic link '/nix/store/higpc9xavwcjjzdipz7m9ly03bh7iy2z-hercules-ci-agent-source-0.7.0/lib/links/libboost_context.dylib': File exists

(cherry picked from commit a9373cd)
…-darwin-c-lib-links

[20.03] backport haskell/generic-builder.nix: Fix C lib multiple inclusions
https://www.nlnetlabs.nl/news/2020/May/19/unbound-1.10.1-released/
It fixes DoS CVEs; details e.g. on http://www.nxnsattack.com/

On each Linux platform this should be around 8k rebuilds,
so as a compromise I'm pushing to staging-next.

(cherry picked from commit 73390e3)
The change from 1.9.5 to 1.10.0 also seems basically without backwards
incompatibilities; so I took it whole.  Perhaps just this minor thing:
- Renamed statistic `num.zero_ttl` to `num.expired` as expired replies
  come with a configurable TTL value (`serve-expired-reply-ttl`).
https://lists.nlnetlabs.nl/pipermail/unbound-users/2020-February/006711.html
@roberth roberth merged commit 6a5e279 into release-20.03 May 22, 2020
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

3 participants