opensmtpd: fix interaction with dovecot-2.3.1 #42139
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @obadz @rickynils For the backport to 18.03, I wonder whether it's best to also backport the 6.0.3p1 update, as it appears to not introduce any backward-incompatibility, and the patch doesn't apply cleanly on 6.0.2p1 (even though it would most likely be easily adapted) |
|
Success on x86_64-linux (full log) Attempted: opensmtpd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: opensmtpd Partial log (click to expand)
|
Mic92
reviewed
Jun 18, 2018
| @@ -23,7 +23,7 @@ else stdenv.mkDerivation rec { | |||
| sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81"; | |||
| }; | |||
|
|
|||
| patches = [ ./proc_path.diff ]; | |||
| patches = [ ./proc_path.diff ./return-path-fix.diff ]; | |||
There was a problem hiding this comment.
Can be fetchpatch used here? Then it is more obvious that we can remove this patch in the next version.
There was a problem hiding this comment.
Thanks! I didn't know GitHub provided a .diff URL for fetching commits, grepping for fetchpatch pulled it out. That should be fixed now :)
|
A 6.0.3p1 backport should be fine. |
This has been merged upstream with
OpenSMTPD/OpenSMTPD#847
Ekleog
force-pushed
the
opensmtpd-dovecot-fix
branch
from
05c40fd
to
c068e1c
Compare
8 tasks
|
Just opened #42168 that should do the backport of 6.0.3p1 as well as of this fix :) |
|
Success on x86_64-linux (full log) Attempted: opensmtpd Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: opensmtpd Partial log (click to expand)
|
|
Thanks! |
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This has been merged upstream at
OpenSMTPD/OpenSMTPD#847
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)