[ttssh2-commit] [10824] PuTTY のソースの入手についての調整

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2023年 8月 11日 (金) 17:09:25 JST


Revision: 10824
          https://osdn.net/projects/ttssh2/scm/svn/commits/10824
Author:   nmaya
Date:     2023-08-11 17:09:25 +0900 (Fri, 11 Aug 2023)
Log Message:
-----------
PuTTY のソースの入手についての調整

- 独自実装になったため、PuTTY のソースをダウンロード・展開しなくてよくなった。
  r10750
  ticket #45653
- ビルド時にソースからコピーできないのでライセンスファイルを追加

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/10750

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/45653

Modified Paths:
--------------
    trunk/doc/convtext.bat
    trunk/doc/en/html/reference/develop.html
    trunk/doc/ja/html/reference/develop.html

Added Paths:
-----------
    trunk/doc/en/html/reference/PuTTY-LICENSE.txt
    trunk/doc/ja/html/reference/PuTTY-LICENSE.txt

Property Changed:
----------------
    trunk/doc/en/html/reference/
    trunk/doc/ja/html/reference/

-------------- next part --------------
Modified: trunk/doc/convtext.bat
===================================================================
--- trunk/doc/convtext.bat	2023-08-11 07:38:07 UTC (rev 10823)
+++ trunk/doc/convtext.bat	2023-08-11 08:09:25 UTC (rev 10824)
@@ -7,8 +7,6 @@
 %TOSJIS% -i ..\libs\oniguruma\doc\RE.ja -o %REF_J%\RE.txt      -c utf8   -l unix
 %TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_E%\LibreSSL-LICENSE.txt  -l unix
 %TOSJIS% -i ..\libs\libressl\COPYING    -o %REF_J%\LibreSSL-LICENSE.txt  -l unix
-%TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_E%\PuTTY-LICENSE.txt     -l crlf
-%TOSJIS% -i ..\libs\putty\LICENCE       -o %REF_J%\PuTTY-LICENSE.txt     -l crlf
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_E%\SFMT-LICENSE.txt      -l unix
 %TOSJIS% -i ..\libs\SFMT\LICENSE.txt    -o %REF_J%\SFMT-LICENSE.txt      -l unix
 %TOSJIS% -i ..\cygwin\cygterm\COPYING   -o %REF_E%\CygTerm+-LICENSE.txt  -l unix

Index: trunk/doc/en/html/reference
===================================================================
--- trunk/doc/en/html/reference	2023-08-11 07:38:07 UTC (rev 10823)
+++ trunk/doc/en/html/reference	2023-08-11 08:09:25 UTC (rev 10824)

Property changes on: trunk/doc/en/html/reference
___________________________________________________________________
Modified: svn:ignore
## -1,7 +1,6 ##
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
-PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt
 zlib-LICENSE.txt
Added: trunk/doc/en/html/reference/PuTTY-LICENSE.txt
===================================================================
--- trunk/doc/en/html/reference/PuTTY-LICENSE.txt	                        (rev 0)
+++ trunk/doc/en/html/reference/PuTTY-LICENSE.txt	2023-08-11 08:09:25 UTC (rev 10824)
@@ -0,0 +1,28 @@
+PuTTY is copyright 1997-2022 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, 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
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: trunk/doc/en/html/reference/develop.html
===================================================================
--- trunk/doc/en/html/reference/develop.html	2023-08-11 07:38:07 UTC (rev 10823)
+++ trunk/doc/en/html/reference/develop.html	2023-08-11 08:09:25 UTC (rev 10824)
@@ -137,9 +137,11 @@
   <li>zlib 1.2.13 (<a href="https://www.zlib.net/">https://www.zlib.net/</a>)<br />
     For compress. Used by TTSSH.
   </li>
+  <!--
   <li>PuTTY 0.76 (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)<br />
     For communicate to Pageant. Used by TTSSH.
   </li>
+  -->
   <li>The reference C implementation of Argon2 20190702 (<a href="https://github.com/P-H-C/phc-winner-argon2/">https://github.com/P-H-C/phc-winner-argon2/</a>)<br />
     For read PuTTY private key file format version 3 (PPK3). Used by TTSSH.
   </li>
@@ -234,11 +236,13 @@
       <li>Run buildzlib.bat. *</li>
     </ol>
   </li>
+  <!--
   <li>PuTTY
     <ol>
       <li>Extract PuTTY source into libs/putty directory.</li>
     </ol>
   </li>
+  -->
   <li>The reference C implementation of Argon2
     <ol>
       <li>Extract argon2 source into libs/argon2 directory.</li>
@@ -819,7 +823,9 @@
       <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
       <li>LibreSSL (<a href="https://www.libressl.org/">https://www.libressl.org/</a>)</li>
       <li>zlib (<a href="https://www.zlib.net/">http://www.zlib.net/</a>)</li>
+      <!--
       <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      -->
       <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2/">https://github.com/P-H-C/phc-winner-argon2/</a>)</li>
       <li>cJSON (<a href="https://github.com/DaveGamble/cJSON/">https://github.com/DaveGamble/cJSON/</a>)</li>
       <li>Unicode (<a href="https://www.unicode.org/versions/latest/">https://www.unicode.org/versions/latest/</a>)</li>

Index: trunk/doc/ja/html/reference
===================================================================
--- trunk/doc/ja/html/reference	2023-08-11 07:38:07 UTC (rev 10823)
+++ trunk/doc/ja/html/reference	2023-08-11 08:09:25 UTC (rev 10824)

Property changes on: trunk/doc/ja/html/reference
___________________________________________________________________
Modified: svn:ignore
## -1,7 +1,6 ##
 CygTerm+-LICENSE.txt
 Oniguruma-LICENSE.txt
 OpenSSL-LICENSE.txt
-PuTTY-LICENSE.txt
 RE.txt
 SFMT-LICENSE.txt
 zlib-LICENSE.txt
Added: trunk/doc/ja/html/reference/PuTTY-LICENSE.txt
===================================================================
--- trunk/doc/ja/html/reference/PuTTY-LICENSE.txt	                        (rev 0)
+++ trunk/doc/ja/html/reference/PuTTY-LICENSE.txt	2023-08-11 08:09:25 UTC (rev 10824)
@@ -0,0 +1,28 @@
+PuTTY is copyright 1997-2022 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, 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
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT.  IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: trunk/doc/ja/html/reference/develop.html
===================================================================
--- trunk/doc/ja/html/reference/develop.html	2023-08-11 07:38:07 UTC (rev 10823)
+++ trunk/doc/ja/html/reference/develop.html	2023-08-11 08:09:25 UTC (rev 10824)
@@ -137,9 +137,11 @@
   <li>zlib 1.2.13 (<a href="https://www.zlib.net/">https://www.zlib.net/</a>)<br />
     TTSSH \x82ň\xB3\x8Fk\x82̂\xBD\x82߂Ɏg\x97p\x82\xB5\x82܂\xB7\x81B
   </li>
+  <!--
   <li>PuTTY 0.76 (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">https://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)<br />
     TTSSH \x82\xC5 Pageant \x82Ƃ̒ʐM\x82Ɏg\x97p\x82\xB5\x82܂\xB7\x81B
   </li>
+  -->
   <li>The reference C implementation of Argon2 20190702 (<a href="https://github.com/P-H-C/phc-winner-argon2/">https://github.com/P-H-C/phc-winner-argon2/</a>)<br />
     TTSSH \x82\xC5 PuTTY \x82̔閧\x8C\xAE\x83t\x83@\x83C\x83\x8B\x8C`\x8E\xAE\x83o\x81[\x83W\x83\x87\x83\x933 (PPK3) \x82̓ǂݍ\x9E\x82݂Ɏg\x97p\x82\xB5\x82܂\xB7\x81B
   </li>
@@ -234,6 +236,7 @@
       <li>buildzlib.bat \x82\xF0\x8E\xC0\x8Ds\x82\xB7\x82\xE9\x81B*</li>
     </ol>
   </li>
+  <!--
   <li>PuTTY
     <ol>
       <li>PuTTY \x82̃\\x81[\x83X\x82\xF0 libs/putty \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
@@ -240,6 +243,7 @@
           ttssh \x83\\x83\x8A\x83\x85\x81[\x83V\x83\x87\x83\x93\x94z\x89\xBA\x82\xCC putty \x83v\x83\x8D\x83W\x83F\x83N\x83g\x82ɂ\xE6\x82\xE8\x95K\x97v\x82ȋ@\x94\\x82݂̂\xAA\x90ÓI\x83\x89\x83C\x83u\x83\x89\x83\x8A\x89\xBB\x82\xB3\x82\xEA\x81Attxssh.dll \x82Ƀ\x8A\x83\x93\x83N\x82\xB3\x82\xEA\x82邽\x82߁A\x93W\x8AJ\x82\xB7\x82邾\x82\xAF\x82ł悢\x81B</li>
     </ol>
   </li>
+  -->
   <li>The reference C implementation of Argon2
     <ol>
       <li>argon2 \x82̃\\x81[\x83X\x82\xF0 libs/argon2 \x82̒\x86\x82ɓW\x8AJ\x82\xB7\x82\xE9\x81B<br />
@@ -818,7 +822,9 @@
       <li>SFMT (<a href="http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html">http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html</a>)</li>
       <li>LibreSSL (<a href="https://www.libressl.org/">https://www.libressl.org/</a>)</li>
       <li>zlib (<a href="https://www.zlib.net/">http://www.zlib.net/</a>)</li>
+      <!--
       <li>PuTTY (<a href="https://www.chiark.greenend.org.uk/~sgtatham/putty/">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>)</li>
+      -->
       <li>The reference C implementation of Argon2 (<a href="https://github.com/P-H-C/phc-winner-argon2/">https://github.com/P-H-C/phc-winner-argon2/</a>)</li>
       <li>cJSON (<a href="https://github.com/DaveGamble/cJSON/">https://github.com/DaveGamble/cJSON/</a>)</li>
       <li>Unicode (<a href="https://www.unicode.org/versions/latest/">https://www.unicode.org/versions/latest/</a>)</li>


ttssh2-commit メーリングリストの案内
Back to archive index