From f204c88ac28ef36969a29ae3b671fd3f2d790ba6 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Mar 12 2014 17:27:33 +0000 Subject: Retire package in Fedora. Only needed in epel6 at the moment --- diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 627fe47..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pycrypto-2.6.1.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..f236b6a --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This is a forward compat package for use on EPEL6. No need for it in Fedora at the moment diff --git a/pycrypto-setuptools-for-compat-package.patch b/pycrypto-setuptools-for-compat-package.patch deleted file mode 100644 index d14b7c7..0000000 --- a/pycrypto-setuptools-for-compat-package.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: pycrypto-2.6.1/setup.py -=================================================================== ---- pycrypto-2.6.1.orig/setup.py -+++ pycrypto-2.6.1/setup.py -@@ -38,9 +38,11 @@ __revision__ = "$Id$" - - from distutils import core - from distutils.ccompiler import new_compiler --from distutils.core import Extension, Command -+from distutils.core import Command - from distutils.command.build import build - from distutils.command.build_ext import build_ext -+from setuptools.extension import Extension -+from setuptools import setup - import os, sys, re - import struct - -@@ -80,7 +82,7 @@ if sys.version_info[0] == 2: - else: - EXCLUDE_PY = [ - # We don't want Py3k to choke on the 2.x compat code -- ('Crypto.Util', 'py21compat'), -+ ('Crypto.Util', 'py21compat'), - ] - if sys.platform != "win32": # Avoid nt.py, as 2to3 can't fix it w/o winrandom - EXCLUDE_PY += [('Crypto.Random.OSRNG','nt')] -@@ -431,7 +433,7 @@ if hasattr(core, 'setup_keywords'): - 'Programming Language :: Python :: 3', - ] - --core.setup(**kw) -+setup(**kw) - - def touch(path): - import os, time diff --git a/python-crypto-2.4-fix-pubkey-size-divisions.patch b/python-crypto-2.4-fix-pubkey-size-divisions.patch deleted file mode 100644 index 9f3323b..0000000 --- a/python-crypto-2.4-fix-pubkey-size-divisions.patch +++ /dev/null @@ -1,46 +0,0 @@ -setup.py for Python 3 doesn't invoke 2to3 on pct-speedtest.py, which runs -into problems: - -Traceback (most recent call last): - File "pct-speedtest.py", line 218, in - Benchmark().run() - File "pct-speedtest.py", line 200, in run - self.test_pubkey_setup(pubkey_name, module, key_bytes) - File "pct-speedtest.py", line 85, in test_pubkey_setup - keys = self.random_keys(key_bytes)[:5] - File "pct-speedtest.py", line 49, in random_keys - return self.random_blocks(bytes, 10**5) # 100k - File "pct-speedtest.py", line 53, in random_blocks - data = self.random_data(bytes) - File "pct-speedtest.py", line 62, in random_data - self.__random_data = self._random_bytes(bytes) - File "pct-speedtest.py", line 73, in _random_bytes - return os.urandom(b) - File "/usr/lib64/python3.2/os.py", line 777, in urandom - bs += read(_urandomfd, n - len(bs)) -TypeError: integer argument expected, got float - -This is due to the divisions in the pubkey_specs table, which in Python 3 is -true division, returning a float. - -As it happens, 2to3 can't convert these divisions, see: -http://bugs.python.org/issue12831 - -Change them to explicitly be floor divisions (supported in Python 2.2 -onwards; see PEP 0238) - ---- pycrypto/pct-speedtest.py -+++ pycrypto/pct-speedtest.py -@@ -165,9 +165,9 @@ - - def run(self): - pubkey_specs = [ -- ("RSA(1024)", RSA, 1024/8), -- ("RSA(2048)", RSA, 2048/8), -- ("RSA(4096)", RSA, 4096/8), -+ ("RSA(1024)", RSA, 1024//8), -+ ("RSA(2048)", RSA, 2048//8), -+ ("RSA(4096)", RSA, 4096//8), - ] - block_specs = [ - ("DES", DES, 8), diff --git a/python-crypto-2.4-optflags.patch b/python-crypto-2.4-optflags.patch deleted file mode 100644 index c0f57ce..0000000 --- a/python-crypto-2.4-optflags.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- pycrypto/setup.py -+++ pycrypto/setup.py -@@ -165,28 +165,6 @@ - # Make assert() statements always work - self.__remove_compiler_option("-DNDEBUG") - -- # Choose our own optimization options -- for opt in ["-O", "-O0", "-O1", "-O2", "-O3", "-Os"]: -- self.__remove_compiler_option(opt) -- if self.debug: -- # Basic optimization is still needed when debugging to compile -- # the libtomcrypt code. -- self.__add_compiler_option("-O") -- else: -- # Speed up execution by tweaking compiler options. This -- # especially helps the DES modules. -- self.__add_compiler_option("-O3") -- self.__add_compiler_option("-fomit-frame-pointer") -- # Don't include debug symbols unless debugging -- self.__remove_compiler_option("-g") -- # Don't include profiling information (incompatible with -- # -fomit-frame-pointer) -- self.__remove_compiler_option("-pg") -- if USE_GCOV: -- self.__add_compiler_option("-fprofile-arcs") -- self.__add_compiler_option("-ftest-coverage") -- self.compiler.libraries += ['gcov'] -- - # Call the superclass's build_extensions method - build_ext.build_extensions(self) - diff --git a/python-crypto2.6.spec b/python-crypto2.6.spec deleted file mode 100644 index aa3c393..0000000 --- a/python-crypto2.6.spec +++ /dev/null @@ -1,419 +0,0 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - -# Python3 introduced in Fedora 13. This package is only destined for EPEL6 -%global with_python3 0 - -Summary: Cryptography library for Python -Name: python-crypto2.6 -Version: 2.6.1 -Release: 1%{?dist} -# Mostly Public Domain apart from parts of HMAC.py and setup.py, which are Python -License: Public Domain and Python -Group: Development/Libraries -URL: http://www.pycrypto.org/ -Source0: http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-%{version}.tar.gz -Patch0: python-crypto-2.4-optflags.patch -Patch1: python-crypto-2.4-fix-pubkey-size-divisions.patch -# Use setuptools to build so that we can create an egg -Patch100: pycrypto-setuptools-for-compat-package.patch -Provides: pycrypto = %{version}-%{release} -BuildRequires: python2-devel >= 2.2 -BuildRequires: gmp-devel >= 4.1 -BuildRequires: python-setuptools -%if %{with_python3} -BuildRequires: python-tools -BuildRequires: python3-devel -BuildRequires: python3-setuptools -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot-%(id -nu) - -# Don't want provides for python shared objects -%{?filter_provides_in: %filter_provides_in %{python2_sitearch}/Crypto/.*\.so} -%if %{with_python3} -%{?filter_provides_in: %filter_provides_in %{python3_sitearch}/Crypto/.*\.so} -%endif -%{?filter_setup} - -%description -PyCrypto is a collection of both secure hash functions (such as MD5 and -SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). - -This package provides the 2.6.x version of PyCrypto - -%if %{with_python3} -%package -n python3-crypto2.6 -Summary: Cryptography library for Python 3 -Group: Development/Libraries - -%description -n python3-crypto2.6 -PyCrypto is a collection of both secure hash functions (such as MD5 and -SHA), and various encryption algorithms (AES, DES, RSA, ElGamal, etc.). - -This is the Python 3 build of the package. - -This package provides the 2.6.x version of PyCrypto -%endif - -%prep -%setup -n pycrypto-%{version} -q - -# Use distribution compiler flags rather than upstream's -%patch0 -p1 - -# Fix divisions within benchmarking suite: -%patch1 -p1 - -# Build with setuptools -%patch100 -p1 - -# Prepare python3 build (setup.py doesn't run 2to3 on pct-speedtest.py) -%if %{with_python3} -cp -a . %{py3dir} -2to3 -wn %{py3dir}/pct-speedtest.py -%endif - -%build -CFLAGS="%{optflags} -fno-strict-aliasing" %{__python2} setup.py bdist_egg - -%if %{with_python3} -cd %{py3dir} -CFLAGS="%{optflags} -fno-strict-aliasing" %{__python3} setup.py bdist_egg -cd - -%endif - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot}%{python2_sitelib} -mkdir -p %{buildroot}%{python2_sitearch} -easy_install -m --prefix %{buildroot}%{_usr} -Z dist/*.egg - -# easy_install doesn't understand platlib (aka sitearch) -if [ x'%{_lib}' = x'lib64' ] ; then -mv %{buildroot}%{python2_sitelib}/* %{buildroot}%{python2_sitearch} -fi - -# Remove group write permissions on shared objects -find %{buildroot}%{python2_sitearch} -name '*.so' -exec chmod -c g-w {} \; - -# Remove execute from python module files -find %{buildroot}%{python2_sitearch} -name '*.py' -type f -exec chmod 0644 {} \; - -# Build for python3 too -%if %{with_python3} -cd %{py3dir} -mkdir -p %{buildroot}%{python3_sitelib} -mkdir -p %{buildroot}%{python3_sitearch} -easy_install-%{python3_version} -m --prefix %{buildroot}%{_usr} -Z dist/*.egg - -# easy_install doesn't understand platlib (aka sitearch) -if [ x'%{_lib}' = x'lib64' ] ; then -mv %{buildroot}%{python3_sitelib}/* %{buildroot}%{python3_sitearch} -fi - -cd - -find %{buildroot}%{python3_sitearch} -name '*.so' -exec chmod -c g-w {} \; - -# Remove execute from python module files -find %{buildroot}%{python3_sitearch} -name '*.py' -type f -exec chmod 0644 {} \; -%endif - - -%check -%{__python2} setup.py test - -# Test the python3 build too -%if %{with_python3} -cd %{py3dir} -%{__python3} setup.py test -cd - -%endif - -%clean -rm -rf %{buildroot} - -%files -%defattr(-,root,root,-) -%doc README TODO ACKS ChangeLog LEGAL/ COPYRIGHT Doc/ -%{python2_sitearch}/*egg*/ - -%if %{with_python3} -%files -n python3-crypto2.6 -%defattr(-,root,root,-) -%doc README TODO ACKS ChangeLog LEGAL/ COPYRIGHT Doc/ -%{python3_sitearch}/*egg*/ -%endif - -%changelog -* Mon Mar 10 2014 Toshio Kuratomi - 2.6.1-1 -- First build of python-crypto2.6 - -* Fri Oct 18 2013 Paul Howarth - 2.6.1-1 -- Update to 2.6.1 - - Fix PRNG not correctly reseeded in some situations (CVE-2013-1445) - -* Sun Aug 04 2013 Fedora Release Engineering - 2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Aug 03 2012 David Malcolm - 2.6-4 -- rebuild for https://fedoraproject.org/wiki/Features/Python_3.3 - -* Fri Aug 3 2012 David Malcolm - 2.6-3 -- remove rhel logic from with_python3 conditional - -* Sat Jul 21 2012 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu May 24 2012 Paul Howarth - 2.6-1 -- Update to 2.6 - - Fix insecure ElGamal key generation (launchpad bug #985164, CVE-2012-2417) - - Huge documentation cleanup - - Added more tests, including test vectors from NIST 800-38A - - Remove broken MODE_PGP, which never actually worked properly - - A new mode, MODE_OPENPGP, has been added for people wishing to write - OpenPGP implementations (see also launchpad bug #996814) - - Fix: getPrime with invalid input causes Python to abort with fatal error - (launchpad bug #988431) - - Fix: Segfaults within error-handling paths (launchpad bug #934294) - - Fix: Block ciphers allow empty string as IV (launchpad bug #997464) - - Fix DevURandomRNG to work with Python3's new I/O stack - - Remove automagic dependencies on libgmp and libmpir; let the caller - disable them using args - - Many other minor bug fixes and improvements -- Drop upstream patches - -* Sat Feb 18 2012 Paul Howarth - 2.5-2 -- Add upstream fixes for issues found by Dave Malcolm's experimental static - analysis tool (#790584) - -* Mon Jan 16 2012 Paul Howarth - 2.5-1 -- Update to 2.5 - - Added PKCS#1 encryption schemes (v1.5 and OAEP); we now have a decent, - easy-to-use non-textbook RSA implementation - - Added PKCS#1 signature schemes (v1.5 and PSS); v1.5 required some - extensive changes to Hash modules to contain the algorithm-specific ASN.1 - OID, and to that end we now always have a (thin) Python module to hide the - one in pure C - - Added 2 standard Key Derivation Functions (PBKDF1 and PBKDF2) - - Added export/import of RSA keys in OpenSSH and PKCS#8 formats - - Added password-protected export/import of RSA keys (one old method for - PKCS#8 PEM only) - - Added ability to generate RSA key pairs with configurable public - exponent e - - Added ability to construct an RSA key pair even if only the private - exponent d is known, and not p and q - - Added SHA-2 C source code (fully from Lorenz Quack) - - Unit tests for all the above - - Updates to documentation (both inline and in Doc/pycrypt.rst) - - Minor bug fixes (setup.py and tests) -- Upstream no longer ships python-3-changes.txt - -* Sat Jan 7 2012 Paul Howarth - 2.4.1-2 -- Rebuild with gcc 4.7 - -* Mon Nov 7 2011 Paul Howarth - 2.4.1-1 -- Update to 2.4.1 - - Fix "error: Setup script exited with error: src/config.h: No such file or - directory" when installing via easy_install - -* Wed Oct 26 2011 Marcela Mašláňová - 2.4-2.1 -- Rebuild with new gmp without compat lib - -* Tue Oct 25 2011 Paul Howarth - 2.4-2 -- Add python3-crypto subpackage (based on patch from Dave Malcolm - #748529) - -* Mon Oct 24 2011 Paul Howarth - 2.4-1 -- Update to 2.4 - - Python 3 support! PyCrypto now supports every version of Python from 2.1 - through to 3.2 - - Timing-attack countermeasures in _fastmath: when built against libgmp - version 5 or later, we use mpz_powm_sec instead of mpz_powm, which should - prevent the timing attack described by Geremy Condra at PyCon 2011 - - New hash modules (for Python ≥ 2.5 only): SHA224, SHA384 and SHA512 - - Configuration using GNU autoconf, which should help fix a bunch of build - issues - - Support using MPIR as an alternative to GMP - - Improve the test command in setup.py, by allowing tests to be performed on - a single sub-package or module only - - Fix double-decref of "counter" when Cipher object initialization fails - - Apply patches from Debian's python-crypto 2.3-3 package: - - fix-RSA-generate-exception.patch - - epydoc-exclude-introspect.patch - - no-usr-local.patch - - Fix launchpad bug #702835: "Import key code is not compatible with GMP - library" - - More tests, better documentation, various bugfixes -- Update patch for imposing our own compiler optimization flags -- Drop lib64 patch, no longer needed -- No longer need to fix up permissions and remove shellbangs - -* Wed Oct 12 2011 Peter Schiffer - 2.3-5.1 -- Rebuild with new gmp - -* Wed May 11 2011 Paul Howarth - 2.3-5 -- Upstream rolled new tarball with top-level directory restored -- Nobody else likes macros for commands - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 2.3-3 -- Rebuilt for gcc bug 634757 - -* Fri Sep 24 2010 David Malcolm - 2.3-2 -- Add "-fno-strict-aliasing" to compilation flags - -* Fri Aug 27 2010 Paul Howarth - 2.3-1 -- Update to 2.3 - - Fix NameError when attempting to use deprecated getRandomNumber() function - - _slowmath: Compute RSA u parameter when it's not given to RSA.construct; - this makes _slowmath behave the same as _fastmath in this regard - - Make RSA.generate raise a more user-friendly exception message when the - user tries to generate a bogus-length key -- Add -c option to %%setup because upstream tarball has dropped the top-level - directory -- Run benchmark as part of %%check if we have python 2.4 or later -- BR: python2-devel rather than just python-devel -- Add patch to make sure we can find libgmp in 64-bit multilib environments - -* Tue Aug 3 2010 Paul Howarth - 2.2-1 -- Update to 2.2 - - Deprecated Crypto.Util.number.getRandomNumber() - - It's been replaced by getRandomNBitInteger and getRandomInteger - - Better isPrime() and getPrime() implementations - - getStrongPrime() implementation for generating RSA primes - - Support for importing and exporting RSA keys in DER and PEM format - - Fix PyCrypto when floor division (python -Qnew) is enabled - - When building using gcc, use -std=c99 for compilation -- Update optflags patch - -* Thu Jul 22 2010 David Malcolm - 2.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Tue Feb 16 2010 Paul Howarth - 2.1.0-1 -- Update to 2.1.0 (see ChangeLog for details) -- Remove patches (no longer needed) -- Use new upstream URLs -- Upstream has replaced LICENSE with LEGAL/ and COPYRIGHT -- Clarify that license is mostly Public Domain, partly Python -- Add %%check section and run the test suite in it -- Remove upstream's fiddling with compiler optimization flags so we get - usable debuginfo -- Filter out unwanted provides for python shared objects -- Tidy up egg-info handling -- Simplify %%files list -- Pacify rpmlint as much as is reasonable -- Add dist tag - -* Sun Jul 26 2009 Fedora Release Engineering - 2.0.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 2.0.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 13 2009 Stewart Adam - 2.0.1-17 -- Use patches in upstream git to fix #484473 - -* Fri Feb 13 2009 Thorsten Leemhuis - 2.0.1-16.1 -- add patch to fix #485298 / CVE-2009-0544 - -* Sat Feb 7 2009 Stewart Adam - 2.0.1-15.1 -- Oops, actually apply the patch -- Modify patch so modules remain compatible with PEP 247 - -* Sat Feb 7 2009 Stewart Adam - 2.0.1-15 -- Add patch to hashlib instead of deprecated md5 and sha modules (#484473) - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 2.0.1-14.1 -- Rebuild for Python 2.6 - -* Sun May 04 2008 Thorsten Leemhuis - 2.0.1-13 -- provide pycrypto - -* Sat Feb 09 2008 Thorsten Leemhuis - 2.0.1-12 -- rebuilt - -* Fri Jan 04 2008 Thorsten Leemhuis - 2.0.1-11 -- egg-info file in python_sitearch and not in python_sitelib - -* Fri Jan 04 2008 Thorsten Leemhuis - 2.0.1-10 -- ship egg-file - -* Tue Aug 21 2007 Thorsten Leemhuis - 2.0.1-9 -- Remove the old and outdated python-abi hack - -* Fri Aug 03 2007 Thorsten Leemhuis -- Update License field due to the "Licensing guidelines changes" - -* Mon Jun 04 2007 David Woodhouse - 2.0.1-8 -- Fix libdir handling so it works on more arches than x86_64 - -* Wed Apr 18 2007 Thorsten Leemhuis - 2.0.1-7 -- Fix typo - -* Wed Apr 18 2007 Thorsten Leemhuis - 2.0.1-6 -- Remove dist -- rebuild, because the older version was much bigger, as it was build when - distutils was doing static links of libpython - -* Sat Dec 09 2006 Thorsten Leemhuis - 2.0.1-5 -- Rebuild for python 2.5 - -* Thu Sep 07 2006 Thorsten Leemhuis - 2.0.1-4 -- Don't ghost pyo files (#205408) - -* Tue Aug 29 2006 Thorsten Leemhuis - 2.0.1-3 -- Rebuild for Fedora Extras 6 - -* Mon Feb 13 2006 Thorsten Leemhuis - 2.0.1-2 -- Rebuild for Fedora Extras 5 - -* Wed Aug 17 2005 Thorsten Leemhuis - 0:2.0.1-1 -- Update to 2.0.1 -- Use Dist -- Drop python-crypto-64bit-unclean.patch, similar patch was applied - upstream - -* Thu May 05 2005 Thorsten Leemhuis - 0:2.0-4 -- add python-crypto-64bit-unclean.patch (#156173) - -* Mon Mar 21 2005 Seth Vidal - 0:2.0-3 -- iterate release for build on python 2.4 based systems - -* Sat Dec 18 2004 Thorsten Leemhuis - 0:2.0-2 -- Fix build on x86_64: use python_sitearch for files and patch source - to find gmp - -* Thu Aug 26 2004 Thorsten Leemhuis - 0:2.0-0.fdr.1 -- Update to 2.00 - -* Fri Aug 13 2004 Ville Skytta - 0:1.9-0.fdr.6.a6 -- Don't use get_python_version(), it's available in Python >= 2.3 only. - -* Thu Aug 12 2004 Thorsten Leemhuis 0:1.9-0.fdr.5.a6 -- Own dir python_sitearch/Crypto/ - -* Wed Aug 11 2004 Thorsten Leemhuis 0:1.9-0.fdr.4.a6 -- Match python spec template more - -* Sat Jul 17 2004 Thorsten Leemhuis 0:1.9-0.fdr.3.a6 -- Own _libdir/python/site-packages/Crypto/ - -* Wed Mar 24 2004 Panu Matilainen 0.3.2-0.fdr.2.a6 -- generate .pyo files during install -- require exact version of python used to build the package -- include more docs + demos -- fix dependency on /usr/local/bin/python -- use fedora.us style buildroot -- buildrequires gmp-devel -- use description from README - -* Sun Jan 11 2004 Ryan Boder 0.3.2-0.fdr.1.a6 -- Initial build. - diff --git a/sources b/sources deleted file mode 100644 index e90c708..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -55a61a054aa66812daf5161a0d5d7eda pycrypto-2.6.1.tar.gz