Unverified Commit fda10193 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #265743 from iblech/patch-privoxy-glibc

privoxy: fix socks4 and socks4a support under glibc's source fortification
parents f9dd9c31 fdf23b92
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
{ lib, stdenv
, nixosTests
, fetchpatch
, fetchurl, autoreconfHook
, zlib, pcre, w3m, man
, openssl, brotli
@@ -15,6 +16,15 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-5sy8oWVvTmFrRlf4UU4zpw9ml+nXKUNWV3g5Mio8XSw=";
  };

  # Patch to fix socks4 and socks4a support under glibc's source fortification
  # (enabled by default since glibc 2.38-0)
  patches = [
    (fetchpatch {
      url = "https://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=19d7684ca10f6c1279568aa19e9a9da2276851f1";
      sha256 = "sha256-bCb0RUVrWeGfqZYFHXDEEx+76xiNyVqehtLvk9C1j+4=";
    })
  ];

  hardeningEnable = [ "pie" ];

  nativeBuildInputs = [ autoreconfHook w3m man ];