Merge tag '0.66'

Conflicts:
	Recipe
	windows/window.c
	windows/winutils.c

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 15641 # update this at every release
+set Epoch 15746 # 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
 
@@ -202,6 +202,6 @@ in-dest putty do a=`\find * -type f -print`; md5sum $$a > md5sums && sha1sum $$a
 in-dest putty do echo "AddType application/octet-stream .chm" >> .htaccess
 in-dest putty do echo "AddType application/octet-stream .hlp" >> .htaccess
 in-dest putty do echo "AddType application/octet-stream .cnt" >> .htaccess
-in-dest putty do set -- putty*.tar.gz; for k in '' .DSA .RSA; do echo RedirectMatch temp '(.*/)'putty.tar.gz$$k\$$ '$$1'"$$1$$k" >> .htaccess; done
+in-dest putty do set -- putty*.tar.gz; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty.tar.gz$$k\$$ '$$1'"$$1$$k" >> .htaccess; done
 # And one in the x86 directory, providing a link for the installer.
-in-dest putty/x86 do set -- putty*installer.exe; for k in '' .DSA .RSA; do echo RedirectMatch temp '(.*/)'putty-installer.exe$$k\$$ '$$1'"$$1$$k" >> .htaccess; done
+in-dest putty/x86 do set -- putty*installer.exe; for k in '' .gpg; do echo RedirectMatch temp '(.*/)'putty-installer.exe$$k\$$ '$$1'"$$1$$k" >> .htaccess; done

CHECKLST.txt

@@ -93,7 +93,7 @@ for it:
 
  - Write a release announcement (basically a summary of the changes
    since the last release). Squirrel it away in
-   atreus:src/putty/local/announce-<ver> in case it's needed again
+   atreus:src/putty-local/announce-<ver> in case it's needed again
    within days of the release going out.
 
  - Update the web site, in a local checkout.
@@ -106,11 +106,17 @@ for it:
      pre-releases, if there were any before this release. Comment out
      the big pre-release section at the top, and also adjust the
      sections about source archives at the bottom.
+   + Do the same on the Docs page.
    + Adjust header text on Changelog page. (That includes changing
      `are new' in previous version to `were new'!)
    + .htaccess has an individual redirect for each version number. Add
      a new one.
 
+ - For 0.66 only: if it's not already done, switch the remaining
+   signature links on the Download page over to using the new
+   signature style. Then remove this checklist item, since it'll only
+   need doing this once.
+
  - If there are any last-minute wishlist entries (e.g. security
    vulnerabilities fixed in the new release), write entries for them
    in a local checkout of putty-wishlist.
@@ -121,7 +127,7 @@ for it:
 
  - Build the release, by checking out the release tag:
      git checkout 0.XX
-     bob -F . RELEASE=0.XX
+     bob . RELEASE=0.XX
    This should generate a basically valid release directory as
    `build.out/putty', and provide link maps and sign.sh alongside that
    in build.out.
@@ -134,7 +140,7 @@ for it:
    installer and the Unix source tarball.
 
  - Sign the release: in the `build.out' directory, type
-     sh sign.sh putty Releases
+     sh sign.sh -r putty
    and enter the passphrases a lot of times.
 
 The actual release procedure
@@ -150,7 +156,7 @@ locally, this is the procedure for putting it up on the web.
 
  - Do final checks on the release directory in its new location:
     + verify all the signatures:
-      for i in `find . -name '*.*SA'`; do case $i in *sums*) gpg --verify $i;; *) gpg --verify $i ${i%%.?SA};; esac; done
+      for i in `find . -name '*.gpg'`; do case $i in *sums*) gpg --verify $i;; *) gpg --verify $i ${i%%.gpg};; esac; done
     + check the checksum files:
       md5sum -c md5sums
       sha1sum -c sha1sums

LATEST.VER

@@ -1 +1 @@
-0.65
+0.66

Recipe

@@ -204,13 +204,13 @@ TERMINAL = terminal wcwidth ldiscucs logging tree234 minibidi
 
 # GUI front end and terminal emulator (putty, puttytel).
 GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
-         + winutils wincfg sercfg winhelp winjump
+         + winutils wincfg sercfg winhelp winjump miscucs
          + pickicondialog
          + urlhack urlhack_win regexp
          + cygcfg
 
 # Same thing on Unix.
-UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing urlhack urlhack_unix regexp
+UXTERM   = TERMINAL uxcfg sercfg uxucs uxprint timing callback miscucs urlhack urlhack_unix regexp
 GTKTERM  = UXTERM gtkwin gtkcfg gtkdlg gtkfont gtkcols xkeysym urlhack urlhack_unix regexp
 OSXTERM  = UXTERM osxwin osxdlg osxctrls
 

cmdline.c

@@ -618,6 +618,23 @@ int cmdline_process_param(char *p, char *value, int need_save, Conf *conf)
 	    nextitem += length + skip;
 	}
     }
+
+    if (!strcmp(p, "-sessionlog") ||
+        !strcmp(p, "-sshlog") ||
+        !strcmp(p, "-sshrawlog")) {
+	Filename *fn;
+	RETURN(2);
+	UNAVAILABLE_IN(TOOLTYPE_NONNETWORK);
+	SAVEABLE(0);
+	fn = filename_from_str(value);
+	conf_set_filename(conf, CONF_logfilename, fn);
+	conf_set_int(conf, CONF_logtype,
+                     !strcmp(p, "-sessionlog") ? LGTYP_DEBUG :
+                     !strcmp(p, "-sshlog") ? LGTYP_PACKETS :
+                     /* !strcmp(p, "-sshrawlog") ? */ LGTYP_SSHRAW);
+        filename_free(fn);
+    }
+
     return ret;			       /* unrecognised */
 }
 

config.c

@@ -1540,7 +1540,7 @@ void setup_config_box(struct controlbox *b, int midsession,
 		 HELPCTX(logging_filename),
 		 conf_filesel_handler, I(CONF_logfilename));
     ctrl_text(s, "(Log file name can contain &Y, &M, &D for date,"
-	      " &T for time, and &H for host name)",
+	      " &T for time, &H for host name, and &P for port number)",
 	      HELPCTX(logging_filename));
     ctrl_radiobuttons(s, "What to do if the log file already exists:", 'e', 1,
 		      HELPCTX(logging_exists),

doc/config.but

@@ -207,6 +207,9 @@ digits.
 
 \b \c{&H} will be replaced by the host name you are connecting to.
 
+\b \c{&P} will be replaced by the port number you are connecting to on
+the target host.
+
 For example, if you enter the host name
 \c{c:\\puttylogs\\log-&h-&y&m&d-&t.dat}, you will end up with files looking
 like

doc/faq.but

@@ -1490,6 +1490,38 @@ suppliers so that it clearly distinguishes paid vendors who know about
 you from free software developers who don't have any idea who you are.
 Then, only send out these mass mailings to the former.
 
+\S{faq-checksums}{Question} The \c{sha1sums} / \c{sha256sums} / etc
+files on your download page don't match the binaries.
+
+People report this every so often, and usually the reason turns out to
+be that they've matched up the wrong checksums file with the wrong
+binaries.
+
+The PuTTY download page contains more than one version of the
+software. There's a \e{latest release} version; there are the
+\e{development snapshots}; and when we're in the run-up to making a
+release, there are also \e{pre-release} builds of the upcoming new
+version. Each one has its own collection of binaries, and its own
+collection of checksums files to go with them.
+
+So if you've downloaded the release version of the actual program, you
+need the release version of the checksums too, otherwise you will see
+a mismatch. Similarly, the development snapshot binaries go with the
+development snapshot checksums, and so on. (We've colour-coded the
+download page in an effort to reduce this confusion a bit.)
+
+If you have double-checked that, and you still think there's a real
+mismatch, then please send us a report carefully quoting everything
+relevant:
+
+\b the exact URL you got your binary from
+
+\b the checksum of the binary after you downloaded
+
+\b the exact URL you got your checksums file from
+
+\b the checksum that file says the binary should have.
+
 \H{faq-misc} Miscellaneous questions
 
 \S{faq-openssh}{Question} Is PuTTY a port of \i{OpenSSH}, or based on

doc/index.but

@@ -843,8 +843,9 @@ saved sessions from
 
 \IM{version of PuTTY} version, of PuTTY
 
-\IM{PGP signatures} PGP signatures, of PuTTY binaries
-\IM{PGP signatures} signatures, of PuTTY binaries
+\IM{GPG signatures} PGP signatures, of PuTTY binaries
+\IM{GPG signatures} GPG signatures, of PuTTY binaries
+\IM{GPG signatures} signatures, of PuTTY binaries
 
 \IM{logical host name} logical host name
 \IM{logical host name} host name, logical

doc/man-pg.but

@@ -58,7 +58,7 @@ generate SSH-1 keys).
 
 \dt \cw{\-b} \e{bits}
 
-\dd Specify the size of the key to generate, in bits. Default is 1024.
+\dd Specify the size of the key to generate, in bits. Default is 2048.
 
 \dt \cw{\-q}
 
@@ -173,9 +173,9 @@ To generate an SSH-2 RSA key pair and save it in PuTTY's own format
 
 \c puttygen -t rsa -C "my home key" -o mykey.ppk
 
-To generate a larger (2048-bit) key:
+To generate a larger (4096-bit) key:
 
-\c puttygen -t rsa -b 2048 -C "my home key" -o mykey.ppk
+\c puttygen -t rsa -b 4096 -C "my home key" -o mykey.ppk
 
 To change the passphrase on a key (you will be prompted for the old
 and new passphrases):