Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c43ef1fa8b93
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 46f46a0fa84d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jan 29, 2021

  1. doas: add patch for CVE-2019-25016

    @cole-h
    cole-h committed Jan 29, 2021
    Copy the full SHA
    46f46a0 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/tools/security/doas/default.nix
7 changes: 7 additions & 0 deletions pkgs/tools/security/doas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, bison
, pam

@@ -30,6 +31,12 @@ stdenv.mkDerivation rec {
# Allow doas to discover binaries in /run/current-system/sw/{s,}bin and
# /run/wrappers/bin
./0001-add-NixOS-specific-dirs-to-safe-PATH.patch

(fetchpatch {
name = "CVE-2019-25016.patch";
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/9e259950190c924b4a17825aad2d7cee87fbd75b/main/doas/reset-path.patch";
sha256 = "sha256-Nx+i2+HOtCQ65AC6aJGAq12Pxr2BLDrKlt1PTUstDug=";
})
];

postPatch = ''