Skip to content

[Backport release-26.05] keepassxc: fix CVE-2026-69150 - #575370

Merged
SigmaSquadron merged 1 commit into
NixOS:release-26.05from
herbetom:backport-575169-to-release-26.05
Oct 18, 2026
Merged

SigmaSquadron merged 1 commit into
NixOS:release-26.05from
herbetom:backport-575169-to-release-26.05

Conversation

@herbetom

@herbetom herbetom commented Oct 17, 2026 •

Copy link
Copy Markdown
Member

Backport of #575169

Things done

(cherry picked from commit 1b2cf58)
@herbetom
herbetom force-pushed the backport-575169-to-release-26.05 branch from 7f752bd to 1b3e3b7 Compare October 17, 2026 19:23

@nixpkgs-commit-check nixpkgs-commit-check Bot left a comment •

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between 1b3e3b7 and original 1b2cf58 may warrant inspection.

Show diff
@@ Metadata
  ## Commit message ##
     keepassxc: fix CVE-2026-69150
 
+    (cherry picked from commit 1b2cf585dabdd27a02bfde2b1bba2194b6bb3f53)
+
  ## pkgs/by-name/ke/keepassxc/package.nix ##
 @@
    lib,
@@ pkgs/by-name/ke/keepassxc/package.nix
    libsForQt5,
  
 @@ pkgs/by-name/ke/keepassxc/package.nix: stdenv.mkDerivation (finalAttrs: {
-       ];
-     };
  
--  patches = [ ./darwin-remove-macdeployqt.patch ];
-+  patches = [
-+    ./darwin-remove-macdeployqt.patch
+   patches = [
+     ./darwin.patch
 +
 +    (fetchpatch2 {
 +      name = "CVE-2026-69150.patch";
 +      url = "https://github.com/keepassxreboot/keepassxc/commit/6a534f38c61295d60b0e937739a12511e76dbfeb.patch?full_index=1";
 +      hash = "sha256-izHjFIqtBcMXK3XMPvSKv1d/1I5It59ClGrrcCz6lL4=";
 +    })
-+  ];
+   ];
  
-   # Upstream develops against a build of PCSC from Xcode.
-   # The types are incompatible with nixpkgs pcsclite.
+   cmakeFlags = [

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@herbetom
herbetom marked this pull request as ready for review October 17, 2026 19:25
@nixpkgs-ci nixpkgs-ci Bot added the 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". label Oct 17, 2026
@nixpkgs-ci
nixpkgs-ci Bot requested review from SigmaSquadron and ryand56 October 17, 2026 19:30
@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Oct 17, 2026

@ryand56 ryand56 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (can't use the merge bot because of commit check bot)

@nixpkgs-ci nixpkgs-ci Bot added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Oct 18, 2026
@SigmaSquadron
SigmaSquadron dismissed nixpkgs-commit-check[bot]’s stale review October 18, 2026 01:05

stable derivation differs from unstable

@SigmaSquadron

Copy link
Copy Markdown
Contributor

LGTM (can't use the merge bot because of commit check bot)

We need to get you your commit bit

@SigmaSquadron
SigmaSquadron added this pull request to the merge queue Oct 18, 2026
Merged via the queue into NixOS:release-26.05 with commit 21691b7 Oct 18, 2026
41 checks passed
@herbetom
herbetom deleted the backport-575169-to-release-26.05 branch October 18, 2026 01:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants