Guest User

Untitled

a guest
Jul 3rd, 2011
538
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.57 KB | None | 0 0
  1. >diff -Narqs 1 2
  2. Files 1/License.txt and 2/License.txt differ
  3. Files 1/truecrypt-x64.sys and 2/truecrypt-x64.sys are identical
  4. Files 1/TrueCrypt Format.exe and 2/TrueCrypt Format.exe are identical
  5. Files 1/TrueCrypt User Guide.pdf and 2/TrueCrypt User Guide.pdf are identical
  6. Files 1/TrueCrypt.exe and 2/TrueCrypt.exe are identical
  7. Files 1/truecrypt.sys and 2/truecrypt.sys are identical
  8.  
  9. >diff -Naur 1 2
  10. diff -Naur 1/License.txt 2/License.txt
  11. --- 1/License.txt 2011-07-03 08:36:19.775867600 +0300
  12. +++ 2/License.txt 2011-07-03 08:36:55.790927500 +0300
  13. @@ -1,4 +1,4 @@
  14. -TrueCrypt Collective License Version 1.3
  15. +TrueCrypt Collective License Version 1.4
  16.  
  17. Software distributed under this license is distributed on an "AS IS" BASIS
  18. WITHOUT WARRANTIES OF ANY KIND. THE LIABILITY OF THE AUTHORS AND DISTRIBUTORS
  19. @@ -6,9 +6,10 @@
  20.  
  21. ANYONE WHO USES, COPIES, MODIFIES, OR (RE)DISTRIBUTES ANY PART(S) OF A WORK
  22. MADE AVAILABLE UNDER THIS VERSION OF THE TRUECRYPT COLLECTIVE LICENSE, IS, BY
  23. -SUCH ACTION(S), ACCEPTING ALL TERMS OF THE COMPONENT LICENSES (SEE BELLOW) THAT
  24. -APPLY TO THE CORRESPONDING PART(S) OF THE WORK. IF YOU DO NOT ACCEPT THEM, DO
  25. -NOT USE, COPY, MODIFY, NOR (RE)DISTRIBUTE THE WORK, NOR ANY PART(S) THEREOF.
  26. +SUCH ACTION(S), ACCEPTING ALL TERMS AND CONDITIONS OF THE COMPONENT LICENSES
  27. +(SEE BELOW) THAT APPLY TO THE CORRESPONDING PART(S) OF THE WORK. IF YOU DO NOT
  28. +ACCEPT THEM, DO NOT USE, COPY, MODIFY, NOR (RE)DISTRIBUTE THE WORK, NOR ANY
  29. +PART(S) THEREOF.
  30.  
  31. The TrueCrypt Collective License consists of several distinct licenses, which
  32. are contained in this document (separated by lines consisting of underscores)
  33. @@ -26,7 +27,7 @@
  34.  
  35. This software is copyright (c) 2003-2008 TrueCrypt Foundation
  36.  
  37. -TrueCrypt License Version 2.4
  38. +TrueCrypt License Version 2.5
  39.  
  40.  
  41. I. Definitions
  42. @@ -140,24 +141,31 @@
  43. available (for exceptions, see Sections III.2 and III.3) at least until You
  44. cease to distribute Your Product. To meet this condition, it is sufficient
  45. that You merely include the source code with every copy of Your Product
  46. - that You make and distribute; it is also sufficient that You merely include
  47. - information (valid and correct at least until You cease to distribute Your
  48. - Product) about where the source code can be freely obtained (e.g., an
  49. - Internet address, etc.) with every copy of Your Product that You make and
  50. - distribute. Portions of the source code that were created by You (e.g. Your
  51. - additions to This Product) must be available under license(s) that are/is
  52. - compatible with this version of the TrueCrypt License (however, see also
  53. - Subsection III.1.e) and that allow(s) anyone to modify and derive new works
  54. - from Your Product (and portions thereof) and to use, copy, and redistribute
  55. - such modifications and/or derivative works. The license(s) must be
  56. - perpetual, non-exclusive, royalty-free, no-charge, and worldwide, and must
  57. - not invalidate, weaken, restrict, interpret, amend, modify, interfere with
  58. - or otherwise affect any part, term, provision, or clause of this License.
  59. - The text of the license(s) must be included with every copy of Your Product
  60. - that You make and distribute. The source code must not be deliberately
  61. - obfuscated, and it must not be in an intermediate form (e.g., the output of
  62. - a preprocessor). Source code means the preferred form in which a programmer
  63. - would usually modify the program.
  64. + that You make and distribute (see also below in this Subsection III.1.d for
  65. + conditions that licenses governing the source code must meet) provided that
  66. + You make the copies available to the general public free of charge; it is
  67. + also sufficient that You merely include information (valid and correct at
  68. + least until You cease to distribute Your Product) about where the source
  69. + code can be freely obtained (e.g., an Internet address, etc.) with every
  70. + copy of Your Product that You make and distribute (see also below in this
  71. + Subsection III.1.d for conditions that licenses governing the source code
  72. + must meet) provided that You make the copies available to the general
  73. + public free of charge.
  74. +
  75. + Portions of the source code that were created by You (e.g. Your additions
  76. + to This Product) must be available under license(s) that are/is compatible
  77. + with this version of the TrueCrypt License (however, see also Subsection
  78. + III.1.e) and that allow(s) anyone to modify and derive new works from the
  79. + portions of the source code that were created by You and to use, copy, and
  80. + redistribute such modifications and/or derivative works. The license(s)
  81. + must be perpetual, non-exclusive, royalty-free, no-charge, and worldwide,
  82. + and must not invalidate, weaken, restrict, interpret, amend, modify,
  83. + interfere with or otherwise affect any part, term, provision, or clause of
  84. + this License. The text of the license(s) must be included with every copy
  85. + of Your Product that You make and distribute. The source code must not be
  86. + deliberately obfuscated, and it must not be in an intermediate form (e.g.,
  87. + the output of a preprocessor). Source code means the preferred form in
  88. + which a programmer would usually modify the program.
  89.  
  90. Note: If you cannot comply with the above requirements, we may grant an
  91. exception under certain conditions. You may request an exception at:
  92. @@ -195,7 +203,7 @@
  93. software distribution (such as a cover CD-ROM of a magazine) containing
  94. products from different sources, in which You include either This Product
  95. without any modifications or file(s) which You obtain by compiling the
  96. - unmodified source code of This Product.
  97. + unmodified source code of This Product (see also Section VI.4).
  98.  
  99. b. You include This Product in its entirety and without any modifications
  100. (You may omit the source code of This Product) as non-integral part of Your
  101. @@ -211,6 +219,10 @@
  102. is any) of Your Product (e.g., an "About" window, etc.) and the way in
  103. which Your Product will display the respective phrase.
  104.  
  105. + Note: If you cannot comply with Subsection III.1.d, we may grant an
  106. + exception under certain conditions. You may request an exception at:
  107. +
  108.  
  109. 3. You are not obligated to comply with Subsection III.1.d if Your Product is
  110. not distributed (i.e., Your Product is available only to You).
  111. @@ -253,11 +265,13 @@
  112. LAWS.
  113.  
  114. 4. YOU SHALL INDEMNIFY, DEFEND AND HOLD ALL (CO)AUTHORS OF THIS PRODUCT, THEIR
  115. -AGENTS AND ASSOCIATES, AND APPLICABLE COPYRIGHT/TRADEMARK OWNERS, HARMLESS
  116. -FROM/AGAINST ANY LIABILITY, LOSS, EXPENSE, DAMAGES, CLAIMS OR CAUSES OF ACTION,
  117. -ARISING OUT OF YOUR USE, INABILITY TO USE, COPYING, (RE)DISTRIBUTION, IMPORT
  118. -AND/OR (RE)EXPORT OF THIS PRODUCT (OR PORTIONS THEREOF) AND/OR YOUR BREACH OF
  119. -ANY TERM OF THIS LICENSE.
  120. +AGENTS AND ASSOCIATES, AND APPLICABLE COPYRIGHT/TRADEMARK OWNERS, HARMLESS FROM
  121. +AND AGAINST ANY AND ALL LIABILITY, DAMAGES, LOSSES, SETTLEMENTS, PENALTIES,
  122. +FINES, COSTS, EXPENSES (INCLUDING REASONABLE ATTORNEYS' FEES), DEMANDS, CAUSES
  123. +OF ACTION, CLAIMS, ACTIONS, PROCEEDINGS, AND SUITS, RELATED TO OR ARISING OUT
  124. +OF YOUR USE, INABILITY TO USE, COPYING, (RE)DISTRIBUTION, IMPORT AND/OR
  125. +(RE)EXPORT OF THIS PRODUCT (OR PORTIONS THEREOF) AND/OR YOUR BREACH OF ANY TERM
  126. +OF THIS LICENSE.
  127.  
  128.  
  129.  
  130. @@ -283,15 +297,15 @@
  131.  
  132.  
  133.  
  134. -VI. General Terms
  135. +VI. General Terms and Conditions, Miscellaneous Provisions
  136.  
  137. 1. ANYONE WHO USES AND/OR COPIES AND/OR MODIFIES AND/OR CREATES DERIVATIVE
  138. WORKS OF AND/OR (RE)DISTRIBUTES THIS PRODUCT, OR ANY PORTION(S) THEREOF, IS, BY
  139. -SUCH ACTION(S), AGREEING TO BE BOUND BY AND ACCEPTING ALL TERMS OF THIS LICENSE
  140. -(AND THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN THIS LICENSE). IF YOU DO
  141. -NOT ACCEPT (AND AGREE TO BE BOUND BY) ALL TERMS OF THIS LICENSE, DO NOT USE,
  142. -COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR
  143. -ANY PORTION(S) THEREOF.
  144. +SUCH ACTION(S), AGREEING TO BE BOUND BY AND ACCEPTING ALL TERMS AND CONDITIONS
  145. +OF THIS LICENSE (AND THE RESPONSIBILITIES AND OBLIGATIONS CONTAINED IN THIS
  146. +LICENSE). IF YOU DO NOT ACCEPT (AND AGREE TO BE BOUND BY) ALL TERMS AND
  147. +CONDITIONS OF THIS LICENSE, DO NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS
  148. +OF, NOR (RE)DISTRIBUTE THIS PRODUCT, NOR ANY PORTION(S) THEREOF.
  149.  
  150. 2. YOU MAY NOT USE, MODIFY, COPY, CREATE DERIVATIVE WORKS OF, (RE)DISTRIBUTE,
  151. OR SUBLICENSE THIS PRODUCT, OR PORTION(S) THEREOF, EXCEPT AS EXPRESSLY PROVIDED
  152. @@ -314,22 +328,23 @@
  153. intellectual property rights (e.g., it does not transfer ownership of
  154. copyrights or trademarks).
  155.  
  156. -4. Subject to the terms of this License, You may allow a third party to use
  157. -Your copy of This Product (or a copy that you make and distribute, or Your
  158. -Product, or respective parts thereof) provided that the third party explicitly
  159. -accepts and agrees to be bound by all terms of this License and the third party
  160. -is not prohibited from using This Product (or portions thereof) by this License
  161. -(see, e.g., Section VI.6) or by applicable law. However, You are not obligated
  162. -to ensure that the third party accepts (and agrees to be bound by all terms of)
  163. -this License if You distribute only the self-extracting package (containing
  164. -This Product) that does not allow the user to install (nor extract) the files
  165. -contained in the package until he or she accepts and agrees to be bound by all
  166. -terms of this License.
  167. +4. Subject to the terms and conditions of this License, You may allow a third
  168. +party to use Your copy of This Product (or a copy that you make and distribute,
  169. +or Your Product, or respective parts thereof) provided that the third party
  170. +overtly accepts and agrees to be bound by all terms and conditions of this
  171. +License and the third party is not prohibited from using This Product (or
  172. +portions thereof) by this License (see, e.g., Section VI.6) or by applicable
  173. +law. However, You are not obligated to ensure that the third party accepts (and
  174. +agrees to be bound by all terms of) this License if You distribute only the
  175. +self-extracting package (containing This Product) that does not allow the user
  176. +to install (nor extract) the files contained in the package until he or she
  177. +accepts and agrees to be bound by all terms and conditions of this License.
  178.  
  179. 5. IF YOU ARE NOT SURE WHETHER YOU UNDERSTAND ALL PARTS OF THIS LICENSE OR IF
  180. -YOU ARE NOT SURE WHETHER YOU CAN COMPLY WITH ALL TERMS OF THIS LICENSE, YOU
  181. -MUST NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR (RE)DISTRIBUTE THIS
  182. -PRODUCT, NOR ANY PORTION(S) OF IT. YOU SHOULD CONSULT WITH A LAWYER.
  183. +YOU ARE NOT SURE WHETHER YOU CAN COMPLY WITH ALL TERMS AND CONDITIONS OF THIS
  184. +LICENSE, YOU MUST NOT USE, COPY, MODIFY, CREATE DERIVATIVE WORKS OF, NOR
  185. +(RE)DISTRIBUTE THIS PRODUCT, NOR ANY PORTION(S) OF IT. YOU SHOULD CONSULT WITH
  186. +A LAWYER.
  187.  
  188. 6. IF (IN RELEVANT CONTEXT) ANY PROVISION OF CHAPTER IV OF THIS LICENSE IS
  189. UNENFORCEABLE, INVALID, OR PROHIBITED UNDER APPLICABLE LAW IN YOUR
  190. @@ -341,8 +356,8 @@
  191. invalid or unenforceable under applicable law, it shall not affect the validity
  192. or enforceability of the remainder of this License, and such invalid or
  193. unenforceable provision shall be construed to reflect the original intent of
  194. -such provision and shall be enforced to the maximum extent permitted by
  195. -applicable law so as to effect the original intent of such provision as closely
  196. +the provision and shall be enforced to the maximum extent permitted by
  197. +applicable law so as to effect the original intent of the provision as closely
  198. as possible.
  199.  
  200. ____________________________________________________________
Advertisement
Add Comment
Please, Sign In to add comment