mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 04:49:01 +02:00
putty: 0.76 -> 0.80
Includes the mitigation for CVE-2023-48795 (Terrapin attack). https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html
This commit is contained in:
parent
7602338f2a
commit
b6a6bca17c
|
@ -1,9 +1,9 @@
|
||||||
{ stdenv, lib, fetchurl, autoconf, automake, pkg-config, libtool
|
{ stdenv, lib, fetchurl, cmake, perl, pkg-config
|
||||||
, gtk2, halibut, ncurses, perl, darwin
|
, gtk3, ncurses, darwin
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "0.76";
|
version = "0.80";
|
||||||
pname = "putty";
|
pname = "putty";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -11,33 +11,12 @@ 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 = "0gvi8phabszqksj2by5jrjmshm7bpirhgavz0dqyz1xaimxdjz2l";
|
hash = "sha256-IBPIOnIbF1NSnpCQ98ODDo/kyAoHDMznZFObrbP2cIE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
# glib-2.62 deprecations
|
nativeBuildInputs = [ cmake perl pkg-config ];
|
||||||
env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
|
|
||||||
|
|
||||||
preConfigure = lib.optionalString stdenv.hostPlatform.isUnix ''
|
|
||||||
perl mkfiles.pl
|
|
||||||
( cd doc ; make );
|
|
||||||
./mkauto.sh
|
|
||||||
cd unix
|
|
||||||
'' + lib.optionalString stdenv.hostPlatform.isWindows ''
|
|
||||||
cd windows
|
|
||||||
'';
|
|
||||||
|
|
||||||
TOOLPATH = stdenv.cc.targetPrefix;
|
|
||||||
makefile = if stdenv.hostPlatform.isWindows then "Makefile.mgw" else null;
|
|
||||||
|
|
||||||
installPhase = if stdenv.hostPlatform.isWindows then ''
|
|
||||||
for exe in *.exe; do
|
|
||||||
install -D $exe $out/bin/$exe
|
|
||||||
done
|
|
||||||
'' else null;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoconf automake halibut libtool perl pkg-config ];
|
|
||||||
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
|
buildInputs = lib.optionals stdenv.hostPlatform.isUnix [
|
||||||
gtk2 ncurses
|
gtk3 ncurses
|
||||||
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
|
] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.libs.utmp;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
|
@ -40855,7 +40855,7 @@ with pkgs;
|
||||||
pwntools = with python3Packages; toPythonApplication pwntools;
|
pwntools = with python3Packages; toPythonApplication pwntools;
|
||||||
|
|
||||||
putty = callPackage ../applications/networking/remote/putty {
|
putty = callPackage ../applications/networking/remote/putty {
|
||||||
gtk2 = gtk2-x11;
|
gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3;
|
||||||
};
|
};
|
||||||
|
|
||||||
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
|
qMasterPassword = qt6Packages.callPackage ../applications/misc/qMasterPassword { };
|
||||||
|
|
Loading…
Reference in a new issue