updated to putty 0.76

.gitignore

@@ -1,5 +1,157 @@
 *.o
-windows/putty.map
-windows/make__quickrun.sh
-windows/make__quickrun2.sh
-windows/putty.log
+*.pyc
+.dirstamp
+.deps
+.DS_Store
+/*.pdb
+/*.ilk
+/*.res
+/*.RES
+/*.pch
+/*.rsp
+/*.obj
+/*.exe
+/*.ncb
+/*.plg
+/*.dsw
+/*.opt
+/*.dsp
+/*.tds
+/*.td2
+/*.map
+/Makefile.mgw
+/Makefile.vc
+/Makefile.lcc
+/MSVC
+/*.log
+/*.GID
+/local
+/Output
+/pageant
+/plink
+/pscp
+/psftp
+/putty
+/puttytel
+/puttygen
+/pterm
+/puttyapp
+/ptermapp
+/psusan
+/osxlaunch
+/uppity
+/psocks
+/unix/PuTTY.app
+/unix/Pterm.app
+/fuzzterm
+/testcrypt
+/testsc
+/testzlib
+/cgtest
+/scctest
+/*.DSA
+/*.RSA
+/*.cnt
+/*.hlp
+/.bmake
+/build.log
+/build.out
+/uxconfig.h
+/empty.h
+/config.status
+/Makefile.am
+/Makefile.in
+/Makefile
+/compile
+/config.status
+/configure
+/stamp-h1
+/aclocal.m4
+/ar-lib
+/autom4te.cache
+/depcomp
+/install-sh
+/local
+/missing
+/uxconfig.in
+/uxconfig.in~
+/uxconfig.h
+/licence.h
+/*.a
+/charset/sbcsdat.c
+/contrib/cygtermd/cygtermd.exe
+/doc/*.html
+/doc/*.txt
+/doc/*.cnt
+/doc/*.hlp
+/doc/*.gid
+/doc/*.GID
+/doc/*.chm
+/doc/*.log
+/doc/*.1
+/doc/*.info
+/doc/vstr.but
+/doc/*.hhp
+/doc/*.hhc
+/doc/*.hhk
+/doc/licence.but
+/doc/copy.but
+/icons/*.pam
+/icons/*.png
+/icons/*.ico
+/icons/*.icns
+/icons/*.xpm
+/icons/*.c
+/unix/Makefile.gtk
+/unix/Makefile.ux
+/unix/Makefile.local
+/unix/empty.h
+/unix/plink
+/unix/pterm
+/unix/putty
+/unix/puttytel
+/unix/psftp
+/unix/pscp
+/unix/puttygen
+/unix/stamp-h1
+/unix/*.log
+/unix/.deps
+/windows/*.pdb
+/windows/*.ilk
+/windows/*.res
+/windows/*.RES
+/windows/*.pch
+/windows/*.rsp
+/windows/*.obj
+/windows/*.exe
+/windows/*.ncb
+/windows/*.plg
+/windows/*.dsw
+/windows/*.opt
+/windows/*.dsp
+/windows/*.tds
+/windows/*.td2
+/windows/*.map
+/windows/*.rcpp
+/windows/Makefile.clangcl
+/windows/Makefile.mgw
+/windows/Makefile.vc
+/windows/Makefile.lcc
+/windows/MSVC
+/windows/DEVCPP
+/windows/VS2010
+/windows/VS2012
+/windows/*.log
+/windows/*.GID
+/windows/local
+/windows/Output
+/windows/*.DSA
+/windows/*.RSA
+/windows/*.cnt
+/windows/*.hlp
+/windows/.bmake
+/windows/*.sln
+/windows/*.suo
+/windows/*.msi
+/windows/*.wixobj
+/windows/*.wixpdb

Buildscr

@@ -35,7 +35,7 @@ module putty
 ifeq "$(RELEASE)" "" set Ndate $(!builddate)
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
 ifneq "$(Ndate)" "" read Date date
-set Epoch 17161 # update this at every release
+set Epoch 17818 # update this at every release
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
 ifneq "$(Ndate)" "" read Days days
 
@@ -144,16 +144,15 @@ delegate -
 in putty do ./mkauto.sh
 in putty do ./configure CC=clang CFLAGS="-fsanitize=address -fsanitize=leak"
 in putty do make -j$(nproc)
-in putty do python test/cryptsuite.py
+in putty do python3 test/cryptsuite.py
 enddelegate
 
 # Windowsify LICENCE, since it's going in the Windows installers.
 in putty do perl -i~ -pe 'y/\015//d;s/$$/\015/' LICENCE
 
 # Some gratuitous theming for the MSI installer UI.
 in putty/icons do make -j$(nproc)
-in putty do convert -size 164x312 'gradient:blue-white' -distort SRT -90 -swirl 180 \( -size 329x312 canvas:white \) +append \( icons/putty-48.png -geometry +28+24 \) -composite \( icons/pscp-48.png -geometry +88+96 \) -composite \( icons/puttygen-48.png -geometry +28+168 \) -composite \( icons/pageant-48.png -geometry +88+240 \) -composite windows/msidialog.bmp
-in putty do convert -size 493x58 canvas:white \( icons/putty-48.png -geometry +440+5 \) -composite windows/msibanner.bmp
+in putty do ./windows/make_install_images.sh
 
 mkdir putty/windows/build32
 mkdir putty/windows/build64
@@ -200,10 +199,20 @@ in putty/windows with wixonlinux do candle -arch x64 -dRealPlatform=x64 -dDllOk=
 in putty/windows with wixonlinux do candle -arch x64 -dRealPlatform=Arm -dDllOk=no -dBuilddir=abuild32/ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installera32.msi -spdb
 in putty/windows with wixonlinux do candle -arch x64 -dRealPlatform=Arm64 -dDllOk=no -dBuilddir=abuild64/ -dWinver="$(Winver)" -dPuttytextver="$(Puttytextver)" installer.wxs && light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o installera64.msi -spdb
 
-# Bodge the platform fields for the Windows on Arm installers, since
-# WiX 3 doesn't understand Arm platform names itself.
-in putty/windows do ./msiplatform.py installera32.msi Arm
-in putty/windows do ./msiplatform.py installera64.msi Arm64
+# Change the width field for our dialog background image so that it
+# doesn't stretch across the whole dialog. (WiX's default one does; we
+# replace it with a narrow one so that the text to the right of it
+# shows up on system default background colour, meaning that
+# high-contrast mode doesn't make the text white on white. But that
+# means we also have to modify the width field, and there's nothing in
+# WiX's source syntax to make that happen.)
+#
+# Also bodge the platform fields for the Windows on Arm installers,
+# since WiX 3 doesn't understand Arm platform names itself.
+in putty/windows do ./msifixup.py installer32.msi --dialog-bmp-width=123
+in putty/windows do ./msifixup.py installer64.msi --dialog-bmp-width=123
+in putty/windows do ./msifixup.py installera32.msi --dialog-bmp-width=123 --platform=Arm
+in putty/windows do ./msifixup.py installera64.msi --dialog-bmp-width=123 --platform=Arm64
 
 # Sign the Windows installers.
 ifneq "$(cross_winsigncode)" "" in putty/windows do $(cross_winsigncode) -i https://www.chiark.greenend.org.uk/~sgtatham/putty/ -n "PuTTY Installer" installer32.msi installer64.msi installera32.msi installera64.msi
@@ -232,7 +241,7 @@ in putty/windows with clangcl_a64 do Platform=arm64 make -f Makefile.clangcl BUI
 #
 # There's no installer to go with these, so they must also embed the
 # help file.
-in putty/windows with clangcl32_2003 do Platform=x86 make -f Makefile.clangcl BUILDDIR=buildold/ RCFL=-DEMBED_CHM $(Makeargs) CCTARGET=i386-pc-windows-msvc13.0.0 SUBSYSVER=,4.0 EXTRA_windows=wincrt0.obj EXTRA_console=crt0.obj EXTRA_libs=libcpmt.lib XFLAGS=/arch:IA32 all -j$(nproc)
+in putty/windows with clangcl32_2003 do Platform=x86 make -f Makefile.clangcl BUILDDIR=buildold/ RCFL=-DEMBED_CHM $(Makeargs) CCTARGET=i386-pc-windows-msvc13.0.0 SUBSYSVER=,4.0 EXTRA_windows=wincrt0.obj EXTRA_console=crt0.obj EXTRA_libs=libcpmt.lib XFLAGS="/arch:IA32 -Wno-pragma-pack" all -j$(nproc)
 
 # Remove test programs again.
 in putty/windows do make -f Makefile.clangcl BUILDDIR=build32/ cleantestprogs

Buildscr.cv

@@ -25,7 +25,7 @@ enddelegate
 # Windows scanner for download).
 delegate covscan32wine
   in putty do tar xzvf cov-int.tar.gz
-  in putty/windows do cov-build --dir ../cov-int make -f Makefile.mgw CC=winegcc RC=wrc XFLAGS="-DCOVERITY -DNO_SECUREZEROMEMORY -D_FORCE_SOFTWARE_AES"
+  in putty/windows do cov-build --dir ../cov-int make -f Makefile.mgw CC=winegcc RC=wrc
   in putty do tar czvf cov-int.tar.gz cov-int
   return putty/cov-int.tar.gz
 enddelegate

CHECKLST.txt

@@ -109,8 +109,18 @@ Making a release candidate build
     * check they report the right version number
     * if there's any easily observable behaviour difference between
       the release branch and master, arrange to observe it
-    * test the Windows installer
-    * test the Unix source tarball.
+    * test that the Windows installer installs successfully
+       + on x86 and Arm, and test that putty.exe runs in both cases
+    * test that the Unix source tarball unpacks and builds
+       + on at least a reasonably current stable Linux distro, and
+         also try Debian sid
+       + test-build with all of GTK 1, 2 and 3
+       + test-build with -DNOT_X_WINDOWS
+    * feed the release-candidate source to Coverity and make sure it
+      didn't turn up any last-minute problems
+    * make sure we have a clean run of sctest
+    * do some testing on a system with a completely clean slate (no
+      prior saved session data)
 
 Preparing to make the release
 -----------------------------

LATEST.VER

@@ -1 +1 @@
-0.73
+0.76

LICENCE

@@ -1,11 +1,12 @@
-PuTTY is copyright 1997-2019 Simon Tatham.
+PuTTY is copyright 1997-2021 Simon Tatham.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
 Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus
 Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian
 Brabandt, Jeff Smith, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav
-Kuzmich, Nico Williams, Viktor Dukhovni, and CORE SDI S.A.
+Kuzmich, Nico Williams, Viktor Dukhovni, Josh Dersch, Lars Brinkhoff,
+and CORE SDI S.A.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files