From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 6 Jul 2009 14:08:15 +0000 (-0700)
Subject: setup: increase requirement on pycryptopp to >= 0.5.15
X-Git-Url: https://git.rkrishnan.org/maximilian?a=commitdiff_plain;h=9578e70161009035866502a895a342e37054ba4e;p=tahoe-lafs%2Ftahoe-lafs.git

setup: increase requirement on pycryptopp to >= 0.5.15
---

diff --git a/_auto_deps.py b/_auto_deps.py
index a2711b55..472d3a50 100644
--- a/_auto_deps.py
+++ b/_auto_deps.py
@@ -14,24 +14,26 @@ install_requires=[
                   "Nevow >= 0.6.0",
                   ]
 
-import platform, sys
-if sys.version_info >= (2, 6) and (platform.system() == "Windows"):
-    # pycryptopp v0.5.14 patched the embedded Crypto++ to remove the usages of
-    # time functions, thus allowing mingw to build and link it for Python 2.6.
-    # If I knew a convenient, reliable way to test whether the compiler that
-    # builds pycryptopp will be mingw then I guess I would add that, along with
-    # the Python >= v2.6 and the platform == Windows.  This is to work-around
-    # http://sourceforge.net/tracker/?func=detail&aid=2805976&group_id=2435&atid=302435
-    # .
-    install_requires.append( "pycryptopp >= 0.5.14")
-else:
-    # pycryptopp < 0.5 had a bug which, using a Microsoft compiler, or using
-    # some versions of g++ while linking against certain older versions of
-    # Crypto++, would cause incorrect AES results.
-    install_requires.append( "pycryptopp >= 0.5")
+# pycryptopp v0.5.15 applied a patch from Wei Dai to fix an error in x86
+# assembly on CPUs that can't do SSE2.  Fixes
+# http://allmydata.org/trac/pycryptopp/ticket/24 .
+
+# pycryptopp v0.5.14 patched the embedded Crypto++ to remove the usages of time
+# functions, thus allowing mingw to build and link it for Python 2.6.  If I
+# knew a convenient, reliable way to test whether the compiler that builds
+# pycryptopp will be mingw then I guess I would add that, along with the Python
+# >= v2.6 and the platform == Windows.  This is to work-around
+# http://sourceforge.net/tracker/?func=detail&aid=2805976&group_id=2435&atid=302435
+# .
+
+# pycryptopp < 0.5 had a bug which, using a Microsoft compiler, or using some
+# versions of g++ while linking against certain older versions of Crypto++,
+# would cause incorrect AES results.
+install_requires.append( "pycryptopp >= 0.5.15")
 
 # Sqlite comes built into Python >= 2.5, and is provided by the "pysqlite"
 # distribution for Python 2.4.
+import sys
 if sys.version_info < (2, 5):
     # pysqlite v2.0.5 was shipped in Ubuntu 6.06 LTS "dapper" and Nexenta NCP 1.
     install_requires.append("pysqlite >= 2.0.5")