dev-python/pycryptodome: Bump to 3.10.1

Signed-off-by: Michał Górny <mgorny@gentoo.org>

4 files changed, 127 insertions, 0 deletions

diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index 5c3a1ea1a6e4..4ac5d9710079 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1 +1,2 @@
+DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
new file mode 100644
index 000000000000..3b8f503bb290
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-parallel-make.patch
@@ -0,0 +1,22 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py	2021-02-09 13:46:16.138626317 +0100
++++ b/setup.py	2021-02-09 13:46:51.116065599 +0100
+@@ -360,7 +360,7 @@ ext_modules = [
+     Extension("Crypto.Cipher._raw_eksblowfish",
+         include_dirs=['src/'],
+         define_macros=[('EKS',None),],
+-        sources=["src/blowfish.c"],
++        sources=["src/blowfish_eks.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._raw_cast",
+         include_dirs=['src/'],
+@@ -442,7 +442,8 @@ ext_modules = [
+     # Math
+     Extension("Crypto.Math._modexp",
+         include_dirs=['src/'],
+-        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c', 'src/mont.c'],
++        sources=['src/modexp.c', 'src/siphash.c', 'src/modexp_utils.c',
++                 'src/mont_math.c'],
+         py_limited_api=True,
+         ),
+ ]
diff --git a/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
new file mode 100644
index 000000000000..51a5766c15f3
--- /dev/null
+++ b/dev-python/pycryptodome/files/pycryptodome-3.10.1-system-libtomcrypt.patch
@@ -0,0 +1,50 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py	2021-02-09 13:49:46.356455141 +0100
++++ b/setup.py	2021-02-09 13:50:49.351076275 +0100
+@@ -367,13 +367,15 @@ ext_modules = [
+         sources=["src/CAST.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._raw_des",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/DES.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._raw_des3",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/DES3.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Util._cpuid_c",
+         include_dirs=['src/'],
+         sources=['src/cpuid.c'],
+@@ -410,9 +412,10 @@ ext_modules = [
+         sources=["src/ARC4.c"],
+         py_limited_api=True),
+     Extension("Crypto.Cipher._Salsa20",
+-        include_dirs=['src/', 'src/libtom/'],
++        include_dirs=['src/'],
+         sources=["src/Salsa20.c"],
+-        py_limited_api=True),
++        py_limited_api=True,
++        extra_link_args=["-ltomcrypt"]),
+     Extension("Crypto.Cipher._chacha20",
+         include_dirs=['src/'],
+         sources=["src/chacha20.c"],
+Only in b: setup.py.orig
+Only in b: setup.py.rej
+diff -dupr a/src/DES.c b/src/DES.c
+--- a/src/DES.c	2021-02-09 13:49:46.336454729 +0100
++++ b/src/DES.c	2021-02-09 13:50:02.640123617 +0100
+@@ -39,7 +39,7 @@ FAKE_INIT(raw_des3)
+ 
+ /* Include the actial DES implementation */
+ #define LTC_NO_PROTOTYPES
+-#include "libtom/tomcrypt_des.c"
++#include <tomcrypt.h>
+ 
+ struct block_state {
+     symmetric_key sk;
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
new file mode 100644
index 000000000000..2e000e816eea
--- /dev/null
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A self-contained cryptographic library for Python"
+HOMEPAGE="https://www.pycryptodome.org/
+	https://github.com/Legrandin/pycryptodome/
+	https://pypi.org/project/pycryptodome/"
+SRC_URI="
+	https://github.com/Legrandin/pycryptodome/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2 Unlicense"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+DEPEND="
+	dev-libs/gmp:0=
+	>=dev-libs/libtomcrypt-1.18.2-r1:="
+BDEPEND="
+	virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}
+	!dev-python/pycrypto"
+
+PATCHES=(
+	"${FILESDIR}/pycryptodome-3.10.1-parallel-make.patch"
+	"${FILESDIR}/pycryptodome-3.10.1-system-libtomcrypt.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	# parallel make fixes
+	#  Multiple targets were compiling the same file, setuptools doesn't
+	#  understand this and you get race conditions where a file gets
+	#  overwritten while it's linking. This makes the files look like separate
+	#  files so this race won't happen
+	ln src/blowfish.c src/blowfish_eks.c || die
+	ln src/mont.c src/mont_math.c || die
+
+	# make sure we're unbundling it correctly
+	rm -r src/libtom || die
+
+	distutils-r1_python_prepare_all
+}