Unverified Commit 315e42d0 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #311015 from annaleeleaves/ip2unix-fix 

ip2unix: upstream PR for out of range access
parents 6046e880 4a74c4cf

pkgs/tools/networking/ip2unix/default.nix

+10 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, yaml-cpp, systemd

{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, yaml-cpp, systemd

, python3Packages, asciidoc, libxslt, docbook_xml_dtd_45, docbook_xsl

, libxml2, docbook5

}:
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec { 
    hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";

  };



  patches = [

    # https://github.com/nixcloud/ip2unix/pull/35

    # fix out of range string_view access

    (fetchpatch {

      url = "https://github.com/nixcloud/ip2unix/commit/050ddf76b4b925f27e255fbb820b0700407ceb2b.patch";

      hash = "sha256-5vaLmZmwuiMGV4KnVhuDSnXG1a390aBU51TShwpaMLs=";

    })

  ];



  nativeBuildInputs = [

    meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl

    libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout