summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2020-05-13 13:50:18 +0200
committerAlexis Ballier <aballier@gentoo.org>2020-05-13 16:07:14 +0200
commit45c24721664094157d82c66ef1f0a7453361342a (patch)
tree39d211f43ea8999acb4169e1a03f24a9ded00d31
parentdev-ros/roslaunch: remove patch merged upstream (diff)
downloadgentoo-45c24721664094157d82c66ef1f0a7453361342a.tar.gz
gentoo-45c24721664094157d82c66ef1f0a7453361342a.tar.bz2
gentoo-45c24721664094157d82c66ef1f0a7453361342a.zip
dev-ros/rosbag: use proper cryptodome import
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alexis Ballier <aballier@gentoo.org>
-rw-r--r--dev-ros/rosbag/files/pycrypto.patch15
-rw-r--r--dev-ros/rosbag/rosbag-1.15.4.ebuild1
-rw-r--r--dev-ros/rosbag/rosbag-9999.ebuild1
3 files changed, 17 insertions, 0 deletions
diff --git a/dev-ros/rosbag/files/pycrypto.patch b/dev-ros/rosbag/files/pycrypto.patch
new file mode 100644
index 000000000000..c221d1bc086b
--- /dev/null
+++ b/dev-ros/rosbag/files/pycrypto.patch
@@ -0,0 +1,15 @@
+Index: rosbag/src/rosbag/bag.py
+===================================================================
+--- rosbag.orig/src/rosbag/bag.py
++++ rosbag/src/rosbag/bag.py
+@@ -50,8 +50,8 @@ import threading
+ import time
+ import yaml
+
+-from Cryptodome.Cipher import AES
+-from Cryptodome.Random import get_random_bytes
++from Crypto.Cipher import AES
++from Crypto.Random import get_random_bytes
+
+ import gnupg
+
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.4.ebuild
index 7d776ac0c2aa..8616e5bd170a 100644
--- a/dev-ros/rosbag/rosbag-1.15.4.ebuild
+++ b/dev-ros/rosbag/rosbag-1.15.4.ebuild
@@ -34,3 +34,4 @@ RDEPEND="
DEPEND="${RDEPEND}"
RDEPEND="${RDEPEND}
lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index 7d776ac0c2aa..8616e5bd170a 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -34,3 +34,4 @@ RDEPEND="
DEPEND="${RDEPEND}"
RDEPEND="${RDEPEND}
lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )