From: Simon Tatham <anakin@pobox.com>
Date: Sat, 7 Nov 2015 13:29:53 +0000 (+0000)
Subject: Merge Ben's branch on which he's been fuzzing PuTTY.
X-Git-Tag: 0.68~333
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2057f7a9f8ab56bca2aa4d827758dec21a13394c;hp=6627c1ce1390ab14b16cb84ee0605e52ad91f0b5;p=PuTTY.git

Merge Ben's branch on which he's been fuzzing PuTTY.

This includes fixes arising from the fuzzing, and also changes to make
the code compile into usefully fuzzable forms.
---

diff --git a/Buildscr b/Buildscr
index bc606ca4..466571bc 100644
--- a/Buildscr
+++ b/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
 
diff --git a/CHECKLST.txt b/CHECKLST.txt
index 78e9d223..93996f8d 100644
--- a/CHECKLST.txt
+++ b/CHECKLST.txt
@@ -112,11 +112,6 @@ for it:
    + .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.
diff --git a/LATEST.VER b/LATEST.VER
index f429be05..ceee7dd5 100644
--- a/LATEST.VER
+++ b/LATEST.VER
@@ -1 +1 @@
-0.65
+0.66
diff --git a/doc/plink.but b/doc/plink.but
index 553639e6..889d3b6a 100644
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -41,7 +41,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c Plink: command-line connection utility
-\c Release 0.XX
+\c Release 0.66
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
diff --git a/doc/pscp.but b/doc/pscp.but
index 01b4aacd..89ca90b5 100644
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -39,7 +39,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.65
+\c Release 0.66
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec
diff --git a/doc/using.but b/doc/using.but
index a2d8c271..5448b81a 100644
--- a/doc/using.but
+++ b/doc/using.but
@@ -953,3 +953,20 @@ DSR/DTR.
 
 For example, \cq{-sercfg 19200,8,n,1,N} denotes a baud rate of
 19200, 8 data bits, no parity, 1 stop bit and no flow control.
+
+\S2{using-cmdline-sshlog} \i\c{-sessionlog}, \i\c{-sshlog},
+\i\c{-sshrawlog}: specify session logging
+
+These options cause the PuTTY network tools to write out a \i{log
+file}. Each of them expects a file name as an argument, e.g.
+\cq{-sshlog putty.log} causes an SSH packet log to be written to a
+file called \cq{putty.log}. The three different options select
+different logging modes, all available from the GUI too:
+
+\b \c{-sessionlog} selects \q{All session output} logging mode.
+
+\b \c{-sshlog} selects \q{SSH packets} logging mode.
+
+\b \c{-sshrawlog} selects \q{SSH packets and raw data} logging mode.
+
+For more information on logging configuration, see \k{config-logging}.
diff --git a/windows/putty.iss b/windows/putty.iss
index cb84e1ac..67c92d0f 100644
--- a/windows/putty.iss
+++ b/windows/putty.iss
@@ -13,10 +13,10 @@
 
 [Setup]
 AppName=PuTTY
-AppVerName=PuTTY version 0.65
-VersionInfoTextVersion=Release 0.65
-AppVersion=0.65
-VersionInfoVersion=0.65.0.0
+AppVerName=PuTTY version 0.66
+VersionInfoTextVersion=Release 0.66
+AppVersion=0.66
+VersionInfoVersion=0.66.0.0
 AppPublisher=Simon Tatham
 AppPublisherURL=http://www.chiark.greenend.org.uk/~sgtatham/putty/
 AppReadmeFile={app}\README.txt