Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / Recipe

diff --git a/Recipe b/Recipe
index ac7171c..7987049 100644 (file)
--- a/Recipe
+++ b/Recipe
@@ -72,6 +72,11 @@
 #      build, since at the time of writing this <multimon.h> is
 #      known not to be available in Cygwin.
 #
+#  - COMPAT=/DNO_IPV6
+#      Disables PuTTY's ability to make IPv6 connections, enabling
+#      it to compile under development environments which do not
+#      support IPv6 in their header files.
+#
 #  - COMPAT=/DMSVC4
 #  - RCFL=/DMSVC4
 #      Makes a couple of minor changes so that PuTTY compiles using
@@ -182,14 +187,15 @@ GUITERM  = TERMINAL window windlg winctrls sizetip winucs winprint
 
 # Same thing on Unix.
 UXTERM   = TERMINAL pterm uxcfg gtkdlg gtkcols gtkpanel uxucs uxprint xkeysym
+         + timing
 
 # Non-SSH back ends (putty, puttytel, plink).
-NONSSH   = telnet raw rlogin ldisc
+NONSSH   = telnet raw rlogin ldisc pinger
 
 # SSH back end (putty, plink, pscp, psftp).
 SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
-         + sshaes sshsh512 sshbn wildcard
+         + sshaes sshsh512 sshbn wildcard pinger
 WINSSH   = SSH winnoise winpgntc
 UXSSH    = SSH uxnoise uxagentc
 MACSSH   = SSH macnoise
@@ -199,12 +205,10 @@ SFTP     = sftp int64 logging
 
 # Miscellaneous objects appearing in all the network utilities (not
 # Pageant or PuTTYgen).
-WINMISC  = misc version winstore settings tree234 winnet proxy cmdline
-         + windefs winmisc pproxy
-UXMISC   = misc version uxstore settings tree234 uxsel uxnet proxy cmdline
-         + uxmisc uxproxy
-MACMISC  = misc version macstore settings tree234 macnet mtcpnet otnet proxy
-         + macmisc macabout pproxy
+MISC     = timing misc version settings tree234 proxy
+WINMISC  = MISC winstore winnet cmdline windefs winmisc pproxy
+UXMISC   = MISC uxstore uxsel uxnet cmdline uxmisc uxproxy
+MACMISC  = MISC macstore macnet mtcpnet otnet macmisc macabout pproxy
 
 # Character set library, for use in pterm.
 CHARSET  = sbcsdat slookup sbcs utf8 toucs fromucs xenc mimeenc macenc localenc
@@ -230,9 +234,9 @@ putty    : [G] GUITERM NONSSH WINSSH BE_ALL WINMISC win_res.res LIBS
 puttytel : [G] GUITERM NONSSH BE_NOSSH WINMISC win_res.res LIBS
 plink    : [C] winplink wincons NONSSH WINSSH BE_ALL logging WINMISC
          + plink.res LIBS
-pscp     : [C] scp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
-         + scp.res LIBS
-psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP WINMISC scp.res LIBS
+pscp     : [C] pscp winsftp wincons WINSSH BE_SSH SFTP wildcard WINMISC
+         + pscp.res LIBS
+psftp    : [C] psftp winsftp wincons WINSSH BE_SSH SFTP WINMISC pscp.res LIBS
 
 pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
          + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc
@@ -240,7 +244,8 @@ pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
 
 puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
-         + sshpubk sshaes sshsh512 import winutils puttygen.res tree234 LIBS
+         + sshpubk sshaes sshsh512 import winutils puttygen.res tree234
+        + notiming LIBS
 
 pterm    : [X] UXTERM uxmisc misc ldisc settings pty uxsel BE_NONE uxstore
          + signal CHARSET cmdline ptermm version
@@ -253,9 +258,9 @@ plink    : [U] uxplink uxcons NONSSH UXSSH BE_ALL logging UXMISC signal ux_x11
 
 puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
          + sshrand uxnoise sshsha misc sshrsa sshdss uxcons uxstore uxmisc
-         + sshpubk sshaes sshsh512 import puttygen.res tree234 uxgen
+         + sshpubk sshaes sshsh512 import puttygen.res tree234 uxgen notiming
 
-pscp     : [U] scp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
+pscp     : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
 psftp    : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP UXMISC
 
 PuTTY    : [M] terminal wcwidth ldiscucs logging BE_ALL mac macdlg macevlog