From 047dd2576c99b836a550a43f25f9e2d127c802e3 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 2 Sep 2024 12:23:31 +0000 Subject: [PATCH 1/2] audiobookshelf: use built-in mechanism to skip binaries check --- pkgs/by-name/au/audiobookshelf/package.nix | 8 -------- pkgs/by-name/au/audiobookshelf/wrapper.nix | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix index 91008472059b..efa34166f093 100644 --- a/pkgs/by-name/au/audiobookshelf/package.nix +++ b/pkgs/by-name/au/audiobookshelf/package.nix @@ -56,14 +56,6 @@ buildNpmPackage { inherit pname src; inherit (source) version; - postPatch = '' - # Always skip version checks of the binary manager. - # We provide our own binaries, and don't want to trigger downloads. - substituteInPlace server/managers/BinaryManager.js --replace-fail \ - 'if (!this.validVersions.length) return true' \ - 'return true' - ''; - buildInputs = [ util-linux ]; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/by-name/au/audiobookshelf/wrapper.nix b/pkgs/by-name/au/audiobookshelf/wrapper.nix index d8f16829ffb5..87d3358a425c 100644 --- a/pkgs/by-name/au/audiobookshelf/wrapper.nix +++ b/pkgs/by-name/au/audiobookshelf/wrapper.nix @@ -52,6 +52,7 @@ NODE_ENV=production \ SOURCE=nixpkgs \ + SKIP_BINARIES_CHECK=1 \ FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \ FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \ CONFIG_PATH="$config" \ From 01a72981037e7b6f6dde2c64cd4e6dad3bf697e8 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Mon, 2 Sep 2024 12:23:32 +0000 Subject: [PATCH 2/2] audiobookshelf: 2.12.3 -> 2.13.2 fixes CVE-2024-43797 https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.0 https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.1 https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.2 https://github.com/advplyr/audiobookshelf/compare/v2.13.2..v2.12.3 --- pkgs/by-name/au/audiobookshelf/source.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 384ef51404f7..6c761aac6a5a 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "52a3bc224ae7c79fbb543716a25b731c65a8f76a", - "hash": "sha256-SbpoCtd5PJ6fU9muy58J4VxlbKiJM0OfMALHC5DUqFc=", - "version": "2.12.3", - "depsHash": "sha256-8YUGM+MPYFLpLwWe3W+eObxH4ZklDVGj8bDYkSWTzQg=", - "clientDepsHash": "sha256-8xE1M7InH+Rxjpb2rsdvC3LcLV+k8a83BKWCis5P+tY=" + "rev": "48f232790a5026ac886564ef57660a338a168187", + "hash": "sha256-2/lUByeWMZlxk7i+mvzBuxlxD97C+JEtmf/ajht5AOs=", + "version": "2.13.2", + "depsHash": "sha256-kU5Nrhy6AePwD2/kmvTXvrvGUH8uz3qm3ZvD3kC9EmE=", + "clientDepsHash": "sha256-1haujBoC9KyusE52HeepOcvmb6v7EG5XWD4dq1wPfe4=" }