diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index fea73c79268b..cdd75e4963f3 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (oldAttrs: { pname = "logiops"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "PixlOne"; repo = "logiops"; rev = "v${oldAttrs.version}"; - sha256 = "sha256-9nFTud5szQN8jpG0e/Bkp+I9ELldfo66SdfVCUTuekg="; + sha256 = "sha256-IL7jQA3lGhxVLYCFRgeXdadaBlQr+Op9cedHBlLUCWY="; # In v0.3.0, the `ipcgull` submodule was added as a dependency # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 fetchSubmodules = true; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 40a46041caa2..a98db9f8b21e 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "jbigkit"; @@ -9,6 +9,19 @@ stdenv.mkDerivation rec { sha256 = "0cnrcdr1dwp7h7m0a56qw09bv08krb37mpf7cml5sjdgpyv0cwfy"; }; + patches = [ + # Archlinux patch: this helps users to reduce denial-of-service risks, as in CVE-2017-9937 + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0013-new-jbig.c-limit-s-maxmem-maximum-decoded-image-size.patch"; + hash = "sha256-Yq5qCTF7KZTrm4oeWbpctb+QLt3shJUGEReZvd0ey9k="; + }) + # Archlinux patch: fix heap overflow + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jbigkit/-/raw/main/0015-jbg_newlen-check-for-end-of-file-within-MARKER_NEWLE.patch"; + hash = "sha256-F3qA/btR9D9NfzrNY76X4Z6vG6NrisI36SjCDjS+F5s="; + }) + ]; + makeFlags = [ "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index ca4595fcd2d1..1ca9d562e07f 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -26,13 +26,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2024.8.6"; + version = "2024.9.27"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-6FUfJryL9nuZwSNzzIftIHNDbDQ35TKQh40PS0ux9mM="; + hash = "sha256-hmBVQuF+LiOtIxRbY37DCBM3YqFaXe2sSuULeXMjcCY="; }; build-system = [ @@ -46,12 +46,15 @@ buildPythonPackage rec { mutagen pycryptodomex requests - secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` + secretstorage # "optional", as in not in requirements.txt, needed for `--cookies-from-browser` urllib3 websockets ]; - pythonRelaxDeps = [ "requests" ]; + pythonRelaxDeps = [ + "requests" + "websockets" + ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support @@ -59,12 +62,15 @@ buildPythonPackage rec { # - atomicparsley: embedding thumbnails makeWrapperArgs = let - packagesToBinPath = [] + packagesToBinPath = + [ ] ++ lib.optional atomicparsleySupport atomicparsley ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional rtmpSupport rtmpdump; - in lib.optionals (packagesToBinPath != []) - [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; + in + lib.optionals (packagesToBinPath != [ ]) [ + ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' + ]; setupPyBuildFlags = [ "build_lazy_extractors" @@ -77,7 +83,10 @@ buildPythonPackage rec { ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; - passthru.updateScript = [ update-python-libraries (toString ./.) ]; + passthru.updateScript = [ + update-python-libraries + (toString ./.) + ]; meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; @@ -92,7 +101,10 @@ buildPythonPackage rec { ''; changelog = "https://github.com/yt-dlp/yt-dlp/releases/tag/${version}"; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; + maintainers = with maintainers; [ + mkg20001 + SuperSandro2000 + ]; mainProgram = "yt-dlp"; }; }