-
-
Notifications
You must be signed in to change notification settings - Fork 15.3k
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
🙈️ Remove webkitgtk24x #75040
🙈️ Remove webkitgtk24x #75040
Conversation
#18312 basically did this in an elegant way, but we can for sure remove this now. |
541e8d0
to
9568d61
Compare
#18312 basically did this in an elegant way, but we can for sure remove this now. |
9568d61
to
b32ce1f
Compare
It uses insecure webkitgtk24x.
You know cannot enable optional withWebKit when withGtk2 is enabled.
b32ce1f
to
7822d83
Compare
7822d83
to
7ecd894
Compare
Looks like there is no interest claws upstream https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=3763 But emacs should support that: https://git.savannah.gnu.org/cgit/emacs.git/commit/configure.ac?id=d781662873f228b110a128f7a2b6583a4d5e0a3a |
https://gist.github.com/GrahamcOfBorg/e121c3e97e1dfd6adf83bab9f193f157, is rather interesting... |
See mmex in all-packages |
@jtojnar Running
So I think the source in nixpkgs predates this commit. |
uzbl/uzbl#408 Frightening version of webkitgtk used here.
😀. This for sure has been superseded in the present. Nothing uses this in nixpkgs also.
It goes without saying that we should remove this 😅️.
3e1ee5b
to
06553f3
Compare
https://git.savannah.gnu.org/cgit/emacs.git/commit/src/xwidget.c?id=a36ed9b5e95afea5716256bac24d883263aefbaf seems to build: diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
index f3989be52c0..15e9fbdd726 100644
--- a/pkgs/applications/editors/emacs/25.nix
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -48,7 +48,16 @@ stdenv.mkDerivation rec {
})
] ++ [
# Backport patch so we can use webkitgtk with xwidgets.
- ./0001-xwidget-Use-WebKit2-API.patch
+ (fetchurl {
+ name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
+ url = "https://git.savannah.gnu.org/cgit/emacs.git/patch?id=a36ed9b5e95afea5716256bac24d883263aefbaf";
+ sha256 = "0a4ax1kjcn6g4c59a0wikplx47r6r3lh5igc9vrlqkpk5lw30j0j";
+ })
+ (fetchurl {
+ name = "0002-xwidget-Use-WebKit2-API.patch";
+ url = "https://git.savannah.gnu.org/cgit/emacs.git/patch?id=d781662873f228b110a128f7a2b6583a4d5e0a3a";
+ sha256 = "1m2fnblsk4dg3scxiawz6vsa83bvyg9bxis9mhrjd5f7cdmcnn4z";
+ })
];
nativeBuildInputs = [ pkgconfig autoconf automake texinfo ] |
06553f3
to
eda1ea5
Compare
@jtojnar Fetched those patches. I had to do it from the GitHub mirror because of the ongoing DOS (or maybe I'm blacklisted). |
Claws Mail will build with a supported WebKit once it switches to GTK 3, which seems to progress well: |
I have tried the litehtml plugin — it is as simple as adding |
It seems the only mostly working solution would be a gtk3 variant package. Though it's not good to distribute non-released/non-production code (some people even request that you don't), it's an option. |
While disabling JavaScript will reduce the attack surface greatly, I doubt JavaScriptCore is the only vulnerable component. |
This branch currently seems an almost adequate replacement for gtk2 claws-mail, except that clicking links in the web view opens them in the email window even when "open links with external browser" is enabled. Related: #75040
This branch currently seems an almost adequate replacement for gtk2 claws-mail, except that clicking links in the web view opens them in the email window even when "open links with external browser" is enabled. Related: NixOS#75040 (cherry picked from commit b0d9764)
Motivation for this change
I hope it goes without saying, but please 😂️
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)