dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

tor-browser-bundle-bin: deprecate useHardenedMalloc

Browse Source 
Set useHardenedMalloc to false by default & add deprecation warning.
graphene-hardened-malloc cannot fully replace Tor Browser's statically linked jemalloc & can cause issues.
This commit is contained in:
Felix Schröter 2023-08-09 01:24:40 +02:00
parent 9047000354
commit 4823d1bf38
No known key found for this signature in database
GPG Key ID: 671E39E6744C807D
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -47,7 +47,7 @@
# Hardening # Hardening
, graphene-hardened-malloc , graphene-hardened-malloc
# Whether to use graphene-hardened-malloc # Whether to use graphene-hardened-malloc
, useHardenedMalloc ? true , useHardenedMalloc ? null
# Whether to disable multiprocess support # Whether to disable multiprocess support
, disableContentSandbox ? false , disableContentSandbox ? false
@ -56,7 +56,10 @@
, extraPrefs ? "" , extraPrefs ? ""
}: }:
let lib.warnIf (useHardenedMalloc != null)
"tor-browser-bundle-bin: useHardenedMalloc is deprecated and enabling it can cause issues"
(let
libPath = lib.makeLibraryPath libPkgs; libPath = lib.makeLibraryPath libPkgs;
libPkgs = [ libPkgs = [
@ -268,7 +271,7 @@ stdenv.mkDerivation rec {
GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
EOF EOF
WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true)
"${graphene-hardened-malloc}/lib/libhardened_malloc.so"} "${graphene-hardened-malloc}/lib/libhardened_malloc.so"}
WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [
@ -477,4 +480,4 @@ stdenv.mkDerivation rec {
license = licenses.free; license = licenses.free;
sourceProvenance = with sourceTypes; [ binaryNativeCode ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ];
}; };
} })