CVS commit: pkgsrc/filesystems/tahoe-lafs

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Mar 19 14:30:23 UTC 2021

Modified Files:
        pkgsrc/filesystems/tahoe-lafs: Makefile distinfo
Added Files:
        pkgsrc/filesystems/tahoe-lafs/patches:
            patch-src_allmydata___auto__deps.py

Log Message:
tahoe-lafs: Complete move from py-crypto to py-crytodome


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/filesystems/tahoe-lafs/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/filesystems/tahoe-lafs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/filesystems/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/tahoe-lafs/Makefile
diff -u pkgsrc/filesystems/tahoe-lafs/Makefile:1.50 pkgsrc/filesystems/tahoe-lafs/Makefile:1.51
--- pkgsrc/filesystems/tahoe-lafs/Makefile:1.50 Fri Mar 19 13:17:06 2021
+++ pkgsrc/filesystems/tahoe-lafs/Makefile      Fri Mar 19 14:30:23 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2021/03/19 13:17:06 adam Exp $
+# $NetBSD: Makefile,v 1.51 2021/03/19 14:30:23 gdt Exp $
 
 DISTNAME=      tahoe-lafs-1.12.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    filesystems
 MASTER_SITES=  https://tahoe-lafs.org/source/tahoe-lafs/tarballs/
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/filesystems/tahoe-lafs/distinfo
diff -u pkgsrc/filesystems/tahoe-lafs/distinfo:1.16 pkgsrc/filesystems/tahoe-lafs/distinfo:1.17
--- pkgsrc/filesystems/tahoe-lafs/distinfo:1.16 Fri Mar 19 12:56:36 2021
+++ pkgsrc/filesystems/tahoe-lafs/distinfo      Fri Mar 19 14:30:23 2021
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/03/19 12:56:36 gdt Exp $
+$NetBSD: distinfo,v 1.17 2021/03/19 14:30:23 gdt Exp $
 
 SHA1 (tahoe-lafs-1.12.1.tar.bz2) = cc9c86eecd232fde73bb7078f8c6c4a48536f303
 RMD160 (tahoe-lafs-1.12.1.tar.bz2) = f8fc325c24f3d9c471d2eb1939db661775611388
 SHA512 (tahoe-lafs-1.12.1.tar.bz2) = b1017119164d9a7522d8fc0b1405b0634cb6c0386735847d7261e02cb4d08fdb5af13f6feccec73b789efa5bea6f91008f93368514fcb073638aca686086e3ab
 Size (tahoe-lafs-1.12.1.tar.bz2) = 1387606 bytes
+SHA1 (patch-src_allmydata___auto__deps.py) = 29c1e5d876d46d97a41c64427216338cfeb858ca

Added files:

Index: pkgsrc/filesystems/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py
diff -u /dev/null pkgsrc/filesystems/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py:1.1
--- /dev/null   Fri Mar 19 14:30:23 2021
+++ pkgsrc/filesystems/tahoe-lafs/patches/patch-src_allmydata___auto__deps.py   Fri Mar 19 14:30:23 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_allmydata___auto__deps.py,v 1.1 2021/03/19 14:30:23 gdt Exp $
+
+Adjust dependency from crypto to cryptodome
+
+--- src/allmydata/_auto_deps.py.orig   2017-01-19 00:58:01.000000000 +0000
++++ src/allmydata/_auto_deps.py
+@@ -48,7 +48,7 @@ install_requires = [
+     # Needed for SFTP.
+     # pycrypto 2.2 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/620253>
+     # pycrypto 2.4 doesn't work due to <https://bugs.launchpad.net/pycrypto/+bug/881130>
+-    "pycrypto >= 2.1.0, != 2.2, != 2.4",
++    "pycryptodome >= 3.10.1",
+ 
+     # pycryptopp-0.6.0 includes ed25519
+     "pycryptopp >= 0.6.0",