Control: tags -1 + patch

On 2021-01-10 23:39:22 +0100, Sebastian Ramacher wrote:
> Control: reopen -1
> Control: severity -1 serious
> Control: block 971303 by -1
> 
> It looks like the fix wasn't enough. The binary package still depends on 
> python3-crypto.

The attached patch should fix the issue.

Cheers
-- 
Sebastian Ramacher
diff -Nru python-file-encryptor-0.2.9/debian/control python-file-encryptor-0.2.9/debian/control
--- python-file-encryptor-0.2.9/debian/control	2020-09-29 03:32:40.000000000 +0200
+++ python-file-encryptor-0.2.9/debian/control	2021-01-10 23:58:13.000000000 +0100
@@ -5,6 +5,7 @@
 Build-Depends: debhelper-compat (= 13),
  dh-python,
  python3-all,
+ python3-pycryptodome,
  python3-setuptools
 Standards-Version: 4.5.0
 Homepage: https://pypi.python.org/pypi/file_encryptor
@@ -15,8 +16,7 @@
 
 Package: python3-file-encryptor
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends},
- python3-pycryptodome
+Depends: ${misc:Depends}, ${python3:Depends}
 Description: Python 3 module to convergently encrypt and decrypt files
  This Python 3 module contains helper methods to encrypt and decrypt files
  inline (without using extra space) and to decrypt streams.
diff -Nru python-file-encryptor-0.2.9/debian/patches/pycryptodome.patch python-file-encryptor-0.2.9/debian/patches/pycryptodome.patch
--- python-file-encryptor-0.2.9/debian/patches/pycryptodome.patch	1970-01-01 01:00:00.000000000 +0100
+++ python-file-encryptor-0.2.9/debian/patches/pycryptodome.patch	2021-01-10 23:58:13.000000000 +0100
@@ -0,0 +1,24 @@
+--- python-file-encryptor-0.2.9.orig/file_encryptor/convergence.py
++++ python-file-encryptor-0.2.9/file_encryptor/convergence.py
+@@ -23,8 +23,8 @@
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ # SOFTWARE.
+ 
+-from Crypto.Cipher import AES
+-from Crypto.Util import Counter
++from Cryptodome.Cipher import AES
++from Cryptodome.Util import Counter
+ from file_encryptor.settings import CHUNK_SIZE
+ 
+ from file_encryptor import key_generators
+--- python-file-encryptor-0.2.9.orig/setup.py
++++ python-file-encryptor-0.2.9/setup.py
+@@ -38,7 +38,7 @@ else:
+ VERSION = '0.2.9'
+ 
+ install_requirements = [
+-    'pycrypto>=2.6.1'
++    'pycryptodomex'
+ ]
+ 
+ test_requirements = [
diff -Nru python-file-encryptor-0.2.9/debian/patches/series python-file-encryptor-0.2.9/debian/patches/series
--- python-file-encryptor-0.2.9/debian/patches/series	2020-09-29 03:32:40.000000000 +0200
+++ python-file-encryptor-0.2.9/debian/patches/series	2021-01-10 23:58:13.000000000 +0100
@@ -1,2 +1,3 @@
 00-fix-readme-bad-import.patch
 00-fix-encoding.patch
+pycryptodome.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to