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

Commits on Oct 18, 2019

  1. putty: 0.71 -> 0.73 (security) 

    fixing CVE-2019-17069

the AM subsitutions appear to be very old - they break 0.73's build and
modern releases seem to do without them fine
    @risicle
    risicle committed Oct 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jluttine Jaakko Luttinen
    GPG key ID: 7B1CE13152E6B964
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a3ea286 View commit details

Commits on Oct 27, 2019

  1. Merge pull request #71270 from risicle/ris-putty-CVE-2019-17069 

    putty: 0.71 -> 0.73, fixing CVE-2019-17069
    @mmahut
    mmahut authored Oct 27, 2019
    Copy the full SHA
    1235e6a View commit details
Showing with 4 additions and 7 deletions.
  1. +4 −7 pkgs/applications/networking/remote/putty/default.nix
11 changes: 4 additions & 7 deletions pkgs/applications/networking/remote/putty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl
, gtk2, halibut, ncurses, perl, darwin
}:

stdenv.mkDerivation rec {
version = "0.71";
version = "0.73";
pname = "putty";

src = fetchurl {
urls = [
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${version}/${pname}-${version}.tar.gz"
];
sha256 = "1f66iss0kqk982azmxbk4xfm2i1csby91vdvly6cr04pz3i1r4rg";
sha256 = "076z34jpik2dmlwxicvf1djjgnahcqv12rjhmb9yq6ml7x0bbc1x";
};

# glib-2.62 deprecations
@@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl
( cd doc ; make );
sed -e '/AM_PATH_GTK(/d' \
-e '/AC_OUTPUT/iAM_PROG_CC_C_O' \
-e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac
./mkauto.sh
cd unix
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
@@ -41,7 +38,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; {