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

sasquatch: 4.5.1-5 -> 4.5.1-6 (#484387)

parents af1a49be 272af01b
Loading
Loading
Loading
Loading
+0 −22
Original line number Diff line number Diff line
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
index ed5096b32d..adb6a91c7e 100644
--- a/squashfs-tools/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -146,7 +146,7 @@
 
 #define MAX_LINE 16384
 
-void sigwinch_handler()
+void sigwinch_handler(int _signal)
 {
 	struct winsize winsize;
 
@@ -160,7 +160,7 @@
 }
 
 
-void sigalrm_handler()
+void sigalrm_handler(int _signal)
 {
 	rotate = (rotate + 1) % 4;
 }
+3 −8
Original line number Diff line number Diff line
@@ -14,21 +14,16 @@
let
  drv = stdenv.mkDerivation (finalAttrs: {
    pname = "sasquatch";
    version = "4.5.1-5";
    version = "4.5.1-6";

    src = fetchFromGitHub {
      owner = "onekey-sec";
      repo = "sasquatch";
      rev = "sasquatch-v${finalAttrs.version}";
      hash = "sha256-4Mltt0yFt4oh9hsrHL8/ch5n7nZYiXIJ1UgLktPvlKQ=";
      hash = "sha256-qwbrpm7df35fHLbCJvGkmYY7cb6twt9dGBK+yXlQviU=";
    };

    patches = [
      # Fix build for GCC 15/C23 by adding parameters to unsquashfs signal
      # handlers instead of relying on an empty parameter list.
      ./gcc15-fix-prototypes.patch
    ]
    ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;
    patches = lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch;

    strictDeps = true;
    nativeBuildInputs = [ which ];