simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  009ab4a Initial 'merge -s ours' from 0.66 release branch.
  8fdeb3a Merge tag '0.66'
  503061e Post-0.66 release checklist updates.
  2057f7a Merge Ben's branch on which he's been fuzzing PuTTY.
  fe16b57 Fix a build failure coming from the fuzzing branch.
  f14382c Make 'make install' ignore the new 'fuzzterm' binary.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-11-07 15:06:24

commit 009ab4a20cfd685ff20b8f922068ffa6900b92c7
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=009ab4a20cfd685ff20b8f922068ffa6900b92c7;hp=323c3c70c98072213b9aff1d04bc91e96632d260
Merge: 323c3c7 3a43bec
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 09:14:42 2015 +0000

    Initial 'merge -s ours' from 0.66 release branch.
    
    Everything up to here on the release branch is cherry-picks from
    master anyway, and some of their cherry-picked forms conflict with the
    current state of master due to further work, so here I'm just
    recording an ancestry relation to indicate that there's nothing up to
    here on 0.66 that master hasn't got.

commit 8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d;hp=009ab4a20cfd685ff20b8f922068ffa6900b92c7
Merge: 009ab4a 07af4ed
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 09:54:05 2015 +0000

    Merge tag '0.66'
    
    This brings in the rest of the 0.66 branch, including some changes new
    on master.
    
    Conflicts:
            doc/plink.but
            sshrsa.c
    
    (The conflicts were both trivial: in one, the addition of an extra
    parameter to rsa2_newkey on master happened on the line next to 0.66's
    addition of a check for NULL return value, and in the other, I'd got
    the version number in the plink -h transcript messed up on master.)

commit 503061e569af091b9c31f75e5e17c6f39a70f72f
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=503061e569af091b9c31f75e5e17c6f39a70f72f;hp=8fdeb3a95cc3d7dce5629fc22e309eb3c996f44d
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 10:12:00 2015 +0000

    Post-0.66 release checklist updates.
    
    The one-off reminder to finish the key rollover is now done, so I can
    remove it.

 CHECKLST.txt |    5 -----
 1 file changed, 5 deletions(-)

commit 2057f7a9f8ab56bca2aa4d827758dec21a13394c
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=2057f7a9f8ab56bca2aa4d827758dec21a13394c;hp=503061e569af091b9c31f75e5e17c6f39a70f72f
Merge: 503061e 6627c1c
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 13:29:53 2015 +0000

    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.

commit fe16b577efd7f649828cfe18c1666eb2607bfa9a
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=fe16b577efd7f649828cfe18c1666eb2607bfa9a;hp=2057f7a9f8ab56bca2aa4d827758dec21a13394c
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 13:34:14 2015 +0000

    Fix a build failure coming from the fuzzing branch.
    
    Apparently if you maintain a branch for a long time where you only
    compile with a non-default ifdef enabled, it becomes possible to not
    notice a typo you left in the default branch :-)

 ssh.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit f14382ccce3452a9a90c3e3eb811d30bb7d25e5c
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f14382ccce3452a9a90c3e3eb811d30bb7d25e5c;hp=fe16b577efd7f649828cfe18c1666eb2607bfa9a
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 7 14:45:20 2015 +0000

    Make 'make install' ignore the new 'fuzzterm' binary.
    
    It's for regression testing and fuzzing, so there's no use for it if
    you're not a developer working on the source.
    
    Leaving it out of the 'make install' target in Makefile.gtk is no
    trouble because that's already handled manually in Recipe by inserting
    a giant hairy Makefile fragment to do the installation. But
    Makefile.am was just setting bin_PROGRAMS to the full set of binaries
    built, so for that one, I had to invent a new Recipe program category
    [UT] which moves a particular binary into noinst_PROGRAMS.
    
    While I was at it, I've retired the [M] program category, which has
    been lying around unused since Ben's old Mac OS pre-X port.

 Recipe     |    2 +-
 mkfiles.pl |   32 ++++++++++++++++++++------------
 2 files changed, 21 insertions(+), 13 deletions(-)