Merge branch '3.1' into 3.2
This commit is contained in:
Danny Rawlins
commit
83c3107be4
|
|
@ -3,14 +3,14 @@ drwxr-xr-x root/root usr/lib/
|
|||
drwxr-xr-x root/root usr/lib/python2.7/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
|
||||
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/_cffi_backend.so
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/PKG-INFO
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/SOURCES.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/dependency_links.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/entry_points.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/not-zip-safe
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/requires.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.2.1-py2.7.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/PKG-INFO
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/SOURCES.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/dependency_links.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/entry_points.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/not-zip-safe
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/requires.txt
|
||||
-rw-rw-r-- root/root usr/lib/python2.7/site-packages/cffi-1.3.1-py2.7.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi/__init__.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi/__init__.pyc
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
faca1e420e80433db409bb1bdd0a3f45 cffi-1.2.1.tar.gz
|
||||
deeba7c1fd32a66f1db587988d760c11 cffi-1.3.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Depends on: libffi pycparser
|
||||
|
||||
name=cffi
|
||||
version=1.2.1
|
||||
version=1.3.1
|
||||
release=1
|
||||
source=(http://pypi.python.org/packages/source/c/$name/$name-$version.tar.gz)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ drwxr-xr-x root/root usr/
|
|||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/entry_points.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/not-zip-safe
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/requires.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.0.1-py2.7.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/entry_points.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/not-zip-safe
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/requires.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography-1.1.1-py2.7.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cryptography/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/__about__.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/__about__.pyc
|
||||
|
|
@ -179,6 +179,12 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primiti
|
|||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/pbkdf2.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/pbkdf2.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/pbkdf2.pyo
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/x963kdf.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/x963kdf.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/kdf/x963kdf.pyo
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/keywrap.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/keywrap.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/keywrap.pyo
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/padding.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/padding.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cryptography/hazmat/primitives/padding.pyo
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
437adf65ab9c0ec98b2a07dd425d239d cryptography-1.0.1.tar.gz
|
||||
6ec05b916c52d8668cd3a3f6f1cea084 cryptography-1.1.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Depends on: six cffi enum34 pyasn1
|
||||
|
||||
name=cryptography
|
||||
version=1.0.1
|
||||
version=1.1.1
|
||||
release=1
|
||||
source=(http://pypi.python.org/packages/source/c/$name/$name-$version.tar.gz)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@ drwxr-xr-x root/root usr/
|
|||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/top_level.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.8-py2.7.egg-info/zip-safe
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/top_level.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1-0.1.9-py2.7.egg-info/zip-safe
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/pyasn1/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/__init__.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/__init__.pyc
|
||||
|
|
@ -56,9 +56,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/pyasn1/compat/
|
|||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/binary.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/binary.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/binary.pyo
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/iterfunc.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/iterfunc.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/iterfunc.pyo
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/octets.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/octets.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/pyasn1/compat/octets.pyo
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
7f6526f968986a789b1e5e372f0b7065 pyasn1-0.1.8.tar.gz
|
||||
f00a02a631d4016818659d1cc38d229a pyasn1-0.1.9.tar.gz
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Depends on: setuptools
|
||||
|
||||
name=pyasn1
|
||||
version=0.1.8
|
||||
version=0.1.9
|
||||
release=1
|
||||
source=(http://pypi.python.org/packages/source/p/$name/$name-$version.tar.gz)
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ drwxr-xr-x root/root usr/
|
|||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/six-1.9.0-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.9.0-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.9.0-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.9.0-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.9.0-py2.7.egg-info/top_level.txt
|
||||
drwxr-xr-x root/root usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg-info/
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg-info/PKG-INFO
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg-info/SOURCES.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg-info/dependency_links.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg-info/top_level.txt
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six.py
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six.pyc
|
||||
-rw-r--r-- root/root usr/lib/python2.7/site-packages/six.pyo
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
476881ef4012262dfc8adc645ee786c4 six-1.9.0.tar.gz
|
||||
34eed507548117b2ab523ab14b2f8b55 six-1.10.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# Depends on: setuptools
|
||||
|
||||
name=six
|
||||
version=1.9.0
|
||||
version=1.10.0
|
||||
release=1
|
||||
source=(http://pypi.python.org/packages/source/s/$name/$name-$version.tar.gz)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user