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

[20.09] rspamd: 2.5 -> 2.6 #103139

Merged
merged 2 commits into from Nov 8, 2020
Merged

Conversation

mweinelt
Copy link
Member

@mweinelt mweinelt commented Nov 8, 2020

Motivation for this change

Backport #100207

rspamadm configtest segfaults on 2.5.

rspamd/rspamd#3475

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.

(cherry picked from commit ff7792d)
(cherry picked from commit 1c20e2c)
@mweinelt mweinelt requested review from maralorn and nh2 November 8, 2020 14:56
@maralorn
Copy link
Member

maralorn commented Nov 8, 2020

@mweinelt Does the test you enable there exist in 20.09? Why would it exist but not be enabled?

@mweinelt
Copy link
Member Author

mweinelt commented Nov 8, 2020

It exists, it was only added as passthru recently.

Copy link
Contributor

@nh2 nh2 left a comment

Choose a reason for hiding this comment

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

Upgrades past point releases aren't great on stable releases, but given the fact that segfaults at start make rspamd not very reliable (it'll eventually work because of systemd restarts, but may give up if you're unlucky and it happens too many times in a row, and given that rspamd upstream doesn't really make it clear which commit in 2.6 fixes this specific problem, and given that I also use 2.6 for a while now on NixOS 20.09 to make it practical as a mailserver, I think we should do this backport.

@maralorn
Copy link
Member

maralorn commented Nov 8, 2020

Result of nixpkgs-review pr 103139 1

1 package built:
  • rspamd

@maralorn
Copy link
Member

maralorn commented Nov 8, 2020

I ran the tests locally. They pass.

@maralorn maralorn merged commit 7bcc7b6 into NixOS:release-20.09 Nov 8, 2020
@mweinelt mweinelt deleted the 20.09/rspamd branch November 8, 2020 16:38
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