From 0a946167d5856e94204b809fc3ef84135a68ba84 Mon Sep 17 00:00:00 2001 From: Fiona Weber Date: Sat, 11 Nov 2023 23:19:33 +0000 Subject: tor: 0.4.8.7 -> 0.4.8.9 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/security') diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a4c0fc51b64..f9c9b348510 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.7"; + version = "0.4.8.9"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE="; + sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; }; outputs = [ "out" "geoip" ]; -- cgit 1.4.1 From 5aa01c8fe5e834c1a3f42509587001c6500d0619 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 12 Nov 2023 11:11:29 +0100 Subject: tor: enable Proof of Work defense for onion services by allowing inclusion of GPL-licensed code for more details see https://gitlab.torproject.org/tpo/onion-services/onion-support/-/wikis/Documentation/PoW-FAQ#compiling-c-tor-with-the-pow-defense --- pkgs/tools/security/tor/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/security') diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index f9c9b348510..34088e3afbc 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; configureFlags = + # allow inclusion of GPL-licensed code (needed for Proof of Work defense for onion services) + # for more details see + # https://gitlab.torproject.org/tpo/onion-services/onion-support/-/wikis/Documentation/PoW-FAQ#compiling-c-tor-with-the-pow-defense + [ "--enable-gpl" ] + ++ # cross compiles correctly but needs the following lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] ++ @@ -113,7 +118,7 @@ stdenv.mkDerivation rec { the TCP protocol. ''; - license = licenses.bsd3; + license = with licenses; [ bsd3 gpl3Only ]; maintainers = with maintainers; [ thoughtpolice joachifm prusnak ]; -- cgit 1.4.1