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: 88264b3b2f68
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 511957a4d4fe
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 19, 2019

  1. putty: add patch for CVE-2019-17069

    @risicle
    risicle committed Oct 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    thoughtpolice Austin Seipp
    GPG key ID: 25D2038DEB08021D
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7370ddd View commit details

Commits on Oct 20, 2019

  1. putty: fix build on darwin

    @risicle
    risicle committed Oct 20, 2019
    Copy the full SHA
    1a5c8cc View commit details

Commits on Oct 22, 2019

  1. Merge pull request #71411 from risicle/ris-putty-CVE-2019-17069-r19.09 

    [r19.09] putty: add patch for CVE-2019-17069
    @globin
    globin authored Oct 22, 2019
    Copy the full SHA
    511957a View commit details
Showing with 11 additions and 3 deletions.
  1. +11 −3 pkgs/applications/networking/remote/putty/default.nix
14 changes: 11 additions & 3 deletions pkgs/applications/networking/remote/putty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl
{ stdenv, lib, fetchurl, fetchpatch, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl, darwin
}:

stdenv.mkDerivation rec {
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
};

patches = [
(fetchpatch {
name = "CVE-2019-17069.patch";
url = "https://git.tartarus.org/?p=simon/putty.git;a=patch;h=69201ad8936fe0ff1b8723b7a43accb5e9f1c888";
sha256 = "1gblwc2r26ikb26b22f2r61b2lkjf80pbclfb5dhhkkqal6kbvga";
})
];

preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
@@ -38,7 +46,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk2 ncurses
];
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true;

meta = with lib; {