public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

putty: 0.71 -> 0.73 (security)

Browse Source 
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
This commit is contained in:
Robert Scott 2019-10-17 00:36:47 +01:00
parent 8f118b1fa3
commit a3ea286627
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/networking/remote/putty/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool { stdenv, lib, fetchurl, autoconf, automake, pkgconfig, libtool
, gtk2, halibut, ncurses, perl , gtk2, halibut, ncurses, perl, darwin
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.71"; version = "0.73";
pname = "putty"; pname = "putty";
src = fetchurl { src = fetchurl {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
"https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz" "https://the.earth.li/~sgtatham/putty/${version}/${pname}-${version}.tar.gz"
"ftp://ftp.wayne.edu/putty/putty-website-mirror/${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 # glib-2.62 deprecations
@ -20,9 +20,6 @@ stdenv.mkDerivation rec {
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix '' preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
perl mkfiles.pl perl mkfiles.pl
( cd doc ; make ); ( 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 ./mkauto.sh
cd unix cd unix
'' + lib.optionalString stdenv.hostPlatform.isWindows '' '' + lib.optionalString stdenv.hostPlatform.isWindows ''
@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ];
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [ buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
gtk2 ncurses gtk2 ncurses
]; ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
enableParallelBuilding = true; enableParallelBuilding = true;
meta = with lib; { meta = with lib; {