Commit f29bdc10 authored by ghpzin's avatar ghpzin
Browse files

pesign: fix build with gcc14 

- add patch from upstream commit:
https://github.com/rhboot/pesign/commit/1f9e2fa0b4d872fdd01ca3ba81b04dfb1211a187
that fixes `calloc-transposed-args` error with gcc14:
```
pesigcheck.c: In function 'check_signature':
pesigcheck.c:243:34: error: 'calloc' sizes specified with 'sizeof' in the
earlier argument and not in the later argument
[-Werror=calloc-transposed-args]
  243 |         reasonps = calloc(sizeof(struct reason), 512);
      |                                  ^~~~~~
pesigcheck.c:243:34: note: earlier argument should specify number of
elements, later size of each element
pesigcheck.c:284:53: error: 'calloc' sizes specified with 'sizeof' in the
 earlier argument and not in the later argument
[-Werror=calloc-transposed-args]
  284 |                         new_reasons = calloc(sizeof(struct reason), num_reasons);
      |                                                     ^~~~~~
pesigcheck.c:284:53: note: earlier argument should specify number of
elements, later size of each element
```
parent a793ee39

pkgs/by-name/pe/pesign/package.nix

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch2,

  pkg-config,

  nss,

  efivar,
@@ -22,6 +23,15 @@ stdenv.mkDerivation rec { 
    hash = "sha256-cuOSD/ZHkilgguDFJviIZCG8kceRWw2JgssQuWN02Do=";

  };



  patches = [

    # fix build with gcc14

    # https://github.com/rhboot/pesign/pull/119

    (fetchpatch2 {

      url = "https://github.com/rhboot/pesign/commit/1f9e2fa0b4d872fdd01ca3ba81b04dfb1211a187.patch?full_index=1";

      hash = "sha256-viVM4Z0jAEAWC3EdJVHcWe21aQskH5XE85lOd6Xd/qU=";

    })

  ];



  # nss-util is missing because it is already contained in nss

  # Red Hat seems to be shipping a separate nss-util:

  # https://centos.pkgs.org/7/centos-x86_64/nss-util-devel-3.44.0-4.el7_7.x86_64.rpm.html