diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-10-27 15:55:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-27 15:55:03 +0100 |
| commit | 1235e6a9364d90607c06bdeed671bd4388331d1d (patch) | |
| tree | 4b8f70f8f2c6073e9ec175e844c8ded86f663d80 /pkgs/applications/networking/remote | |
| parent | aa06cb3782de8ca81b00721a610bf181d50fdae8 (diff) | |
| parent | a3ea2866279eb82b79c721146583e40bea3605f2 (diff) | |
| download | nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar.gz nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar.bz2 nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar.lz nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar.xz nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.tar.zst nixpkgs-1235e6a9364d90607c06bdeed671bd4388331d1d.zip | |
Merge pull request #71270 from risicle/ris-putty-CVE-2019-17069
putty: 0.71 -> 0.73, fixing CVE-2019-17069
Diffstat (limited to 'pkgs/applications/networking/remote')
| -rw-r--r-- | pkgs/applications/networking/remote/putty/default.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index d8dc33c944e..8c2d9ac36e9 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,9 +1,9 @@ { 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 { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { "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; { |