mutt/neomutt: work around S/MIME issues with application/pgp-encrypted
#50927
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 @flokli |
@c0bw3b I figured that, but I orignally thought that it would be best to use the default MIME database distributed with the package. I'll have a deeper look at |
Ma27
force-pushed
the
fix-smime-for-mutt-and-neomutt
branch
from
e4bde7e
to
6fc611b
Compare
|
@c0bw3b I updated the |
|
No problem. Actually your PR made me wonder where Nixpkgs/NixOS was sourcing its /etc/mime.types and look at other distros. FWIW Arch seem to use On a side note: Debian sources moved to their GitLab on https://salsa.debian.org |
Ma27
force-pushed
the
fix-smime-for-mutt-and-neomutt
branch
from
6fc611b
to
8d101a4
Compare
|
@c0bw3b thanks for the note, I updated the PR accordingly. (I've seen salsa before, but I wasn't sure if this applies for all of their packages ^^) |
The original issue can be reproduced when sending with an unpatched
`mutt` or `neomutt` an email with an attachement which as han `.asc`
extension. This will be interpreted as `application/pgp-encrypted` which
experiences special logic, in the end the attachement will contain
"Version: 1"[1][2][3]
Right now, there are the following issues in the {,neo}mutt packages:
* `mutt.override { smimeSupport = true }` fails to build since the
Debian patch results in a 404. Debian moved their packages to
`salsa.debian.org`.
However we can't use a versioned URL for this as Debian only tracks
the Mutt versions that are available in their releases. The patch
doesn't touch Mutt's core and is therefore simple to rebase, so
sticking to the 1.10.2 patch for now should be sufficient.
* The original issue was never fixed in NeoMutt, currently we use the
S/MIME database from `pkgs.mime-types` which contains the issue with
`application/pgp-encrypted` as well.
After some discussion[4] it seems to be the best decision to use the
`mailcap` database distributed by Fedora[5] which fixes the issue
rather than `mime-types` v9 from 2012.
[1] https://bugs.archlinux.org/task/43319
[2] https://bugs.gentoo.org/534658
[3] https://github.com/neomutt/neomutt/blob/neomutt-20180716/sendlib.c#L490-L496
[4] NixOS#50927 (comment)
[5] https://pagure.io/mailcap
Ma27
force-pushed
the
fix-smime-for-mutt-and-neomutt
branch
from
8d101a4
to
991d4bf
Compare
|
@GrahamcOfBorg build mutt |
|
Success on x86_64-linux (full log) Attempted: mutt Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: mutt Partial log (click to expand)
|
|
@c0bw3b is there anything that keeps us from merging? |
|
One last check |
|
Success on x86_64-linux (full log) Attempted: neomutt Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: neomutt Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: neomutt Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: neomutt Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: neomutt Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: neomutt Partial log (click to expand)
|
|
( so I edited my message to correct a typo and it duplicated ofBorg jobs... that's dangerous :p ) LGTM |
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.
Motivation for this change
The original issue can be reproduced when sending with an unpatched
muttorneomuttan email with an attachement which as han.ascextension. This will be interpreted as
application/pgp-encryptedwhichexperiences special logic, in the end the attachement will contain
"Version: 1"[1][2][3]
Right now, there are the following issues in the {,neo}mutt packages:
mutt.override { smimeSupport = true }fails to build since theDebian patch results in a 404. Debian moved their packages to
salsa.debian.org.However we can't use a versioned URL for this as Debian only tracks
the Mutt versions that are available in their releases. The patch
doesn't touch Mutt's core and is therefore simple to rebase, so
sticking to the 1.10.2 patch for now should be sufficient.
The original issue was never fixed in NeoMutt, currently we use the
S/MIME database from
pkgs.mime-typeswhich contains the issue withapplication/pgp-encryptedas well.It seems as it's more reliable to use the default
neomuttdatabasefor now which lives in
doc/mime.typesand place it intoPKGDATADIR($out/share/neomutt).
[1] https://bugs.archlinux.org/task/43319
[2] https://bugs.gentoo.org/534658
[3] https://github.com/neomutt/neomutt/blob/neomutt-20180716/sendlib.c#L490-L496
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)