Attachment #108569 for bug #149423

View | Details | Raw Unified | Return to bug 149423
Collapse All | Expand All

Lines 6-13 Link Here

(-)py-pycrypto/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= pycrypto	8	PORTNAME= pycrypto
9	PORTVERSION= 2.1.0	9	PORTVERSION= 2.2
10	PORTREVISION= 1
11	CATEGORIES= security python	10	CATEGORIES= security python
12	MASTER_SITES= http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/	11	MASTER_SITES= http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/
13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	12	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)py-pycrypto/distinfo (-3 / +3 lines)
1	MD5 (pycrypto-2.1.0.tar.gz) = 1d3eb04f06e6f09a080bc37fb019f9bf	1	MD5 (pycrypto-2.2.tar.gz) = 4f0ed728b14b98f09120cb2ec461ec98
2	SHA256 (pycrypto-2.1.0.tar.gz) = 253e1c22ea0249f0429df4f7e2eb973b119c83b146c0f421298f5e8e6822d8a2	2	SHA256 (pycrypto-2.2.tar.gz) = 9219449bc85ab4f4ff61fc83b0cbe0ec23d46943caab3d5413c6ba52da6f922c
3	SIZE (pycrypto-2.1.0.tar.gz) = 265388	3	SIZE (pycrypto-2.2.tar.gz) = 331270




--- setup.py.orig	2010-08-08 14:02:23.895825034 +0200
+++ setup.py	2010-08-08 14:04:31.663792751 +0200
@@ -139,6 +139,7 @@
                 # especially helps the DES modules.
                 self.__add_compiler_option("-O3")
                 self.__add_compiler_option("-fomit-frame-pointer")
+		self.__add_compiler_option("-D_WCHAR_T_DEFINED")
                 # Don't include debug symbols unless debugging
                 self.__remove_compiler_option("-g")
                 # Don't include profiling information (incompatible with -fomit-frame-pointer)
@@ -157,7 +158,7 @@
             self.compiler.include_dirs.insert(0, "src/inc-msvc/")
 
         # Detect libgmp and don't build _fastmath if it is missing.

         if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
             print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."
             self.__remove_extensions(["Crypto.PublicKey._fastmath"])
@@ -264,6 +265,7 @@
             Extension("Crypto.PublicKey._fastmath",
                       include_dirs=['src/'],
                       libraries=['gmp'],
+		      library_dirs=['%%LOCALBASE%%/lib'],
                       sources=["src/_fastmath.c"]),
 
             # Hash functions

Return to bug 149423

Lines 1-14 Link Here

(-)py-pycrypto/files/patch-setup.py (-8 / +8 lines)
1	--- ./setup.py.orig 2009-12-13 21:39:29.000000000 +0100	1	--- setup.py.orig 2010-08-08 14:02:23.895825034 +0200
2	+++ ./setup.py 2009-12-14 16:48:47.000000000 +0100	2	+++ setup.py 2010-08-08 14:04:31.663792751 +0200
3	@@ -136,6 +136,7 @@	3	@@ -139,6 +139,7 @@
4	# especially helps the DES modules.	4	# especially helps the DES modules.
5	self.__add_compiler_option("-O3")	5	self.__add_compiler_option("-O3")
6	self.__add_compiler_option("-fomit-frame-pointer")	6	self.__add_compiler_option("-fomit-frame-pointer")
7	+ self.__add_compiler_option("-D_WCHAR_T_DEFINED")	7	+ self.__add_compiler_option("-D_WCHAR_T_DEFINED")
8	# Don't include debug symbols unless debugging	8	# Don't include debug symbols unless debugging
9	self.__remove_compiler_option("-g")	9	self.__remove_compiler_option("-g")
10	if USE_GCOV:	10	# Don't include profiling information (incompatible with -fomit-frame-pointer)
11	@@ -152,7 +153,7 @@	11	@@ -157,7 +158,7 @@
12	self.compiler.include_dirs.insert(0, "src/inc-msvc/")	12	self.compiler.include_dirs.insert(0, "src/inc-msvc/")
13		13
14	# Detect libgmp and don't build _fastmath if it is missing.	14	# Detect libgmp and don't build _fastmath if it is missing.
Lines 17-27 Link Here
17	if not (self.compiler.find_library_file(lib_dirs, 'gmp')):	17	if not (self.compiler.find_library_file(lib_dirs, 'gmp')):
18	print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."	18	print >>sys.stderr, "warning: GMP library not found; Not building Crypto.PublicKey._fastmath."
19	self.__remove_extensions(["Crypto.PublicKey._fastmath"])	19	self.__remove_extensions(["Crypto.PublicKey._fastmath"])
20	@@ -259,6 +260,7 @@	20	@@ -264,6 +265,7 @@
21	Extension("Crypto.PublicKey._fastmath",	21	Extension("Crypto.PublicKey._fastmath",
22	include_dirs=['src/'],	22	include_dirs=['src/'],
23	libraries=['gmp'],	23	libraries=['gmp'],
24	+ library_dirs=['%%LOCALBASE%%/lib'],	24	+ library_dirs=['%%LOCALBASE%%/lib'],
25	sources=["src/_fastmath.c"]),	25	sources=["src/_fastmath.c"]),
26		26
27	# Hash functions	27	# Hash functions

Lines 175-180 Link Here

(-)py-pycrypto/pkg-plist (+9 lines)
175	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.py	175	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.py
176	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyc	176	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyc
177	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyo	177	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_RSA.pyo
		178	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_importKey.py
		179	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_importKey.pyc
		180	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/PublicKey/test_importKey.pyo
178	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.py	181	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.py
179	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyc	182	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyc
180	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyo	183	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Random/Fortuna/__init__.pyo
Lines 217-222 Link Here
217	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.py	220	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.py
218	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyc	221	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyc
219	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyo	222	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/__init__.pyo
		223	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.py
		224	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyc
		225	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_asn1.pyo
220	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.py	226	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.py
221	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyc	227	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyc
222	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyo	228	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/Util/test_Counter.pyo
Lines 232-237 Link Here
232	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.py	238	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.py
233	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyc	239	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyc
234	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyo	240	%%PYTHON_SITELIBDIR%%/Crypto/SelfTest/st_common.pyo
		241	%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.py
		242	%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyc
		243	%%PYTHON_SITELIBDIR%%/Crypto/Util/asn1.pyo
235	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.py	244	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.py
236	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyc	245	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyc
237	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyo	246	%%PYTHON_SITELIBDIR%%/Crypto/Util/Counter.pyo