| 1 |
commit: 45c24721664094157d82c66ef1f0a7453361342a |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 13 11:50:18 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 13 14:07:14 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c24721 |
| 7 |
|
| 8 |
dev-ros/rosbag: use proper cryptodome import |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ros/rosbag/files/pycrypto.patch | 15 +++++++++++++++ |
| 14 |
dev-ros/rosbag/rosbag-1.15.4.ebuild | 1 + |
| 15 |
dev-ros/rosbag/rosbag-9999.ebuild | 1 + |
| 16 |
3 files changed, 17 insertions(+) |
| 17 |
|
| 18 |
diff --git a/dev-ros/rosbag/files/pycrypto.patch b/dev-ros/rosbag/files/pycrypto.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c221d1bc086 |
| 21 |
--- /dev/null |
| 22 |
+++ b/dev-ros/rosbag/files/pycrypto.patch |
| 23 |
@@ -0,0 +1,15 @@ |
| 24 |
+Index: rosbag/src/rosbag/bag.py |
| 25 |
+=================================================================== |
| 26 |
+--- rosbag.orig/src/rosbag/bag.py |
| 27 |
++++ rosbag/src/rosbag/bag.py |
| 28 |
+@@ -50,8 +50,8 @@ import threading |
| 29 |
+ import time |
| 30 |
+ import yaml |
| 31 |
+ |
| 32 |
+-from Cryptodome.Cipher import AES |
| 33 |
+-from Cryptodome.Random import get_random_bytes |
| 34 |
++from Crypto.Cipher import AES |
| 35 |
++from Crypto.Random import get_random_bytes |
| 36 |
+ |
| 37 |
+ import gnupg |
| 38 |
+ |
| 39 |
|
| 40 |
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.4.ebuild |
| 41 |
index 7d776ac0c2a..8616e5bd170 100644 |
| 42 |
--- a/dev-ros/rosbag/rosbag-1.15.4.ebuild |
| 43 |
+++ b/dev-ros/rosbag/rosbag-1.15.4.ebuild |
| 44 |
@@ -34,3 +34,4 @@ RDEPEND=" |
| 45 |
DEPEND="${RDEPEND}" |
| 46 |
RDEPEND="${RDEPEND} |
| 47 |
lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )" |
| 48 |
+PATCHES=( "${FILESDIR}/pycrypto.patch" ) |
| 49 |
|
| 50 |
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild |
| 51 |
index 7d776ac0c2a..8616e5bd170 100644 |
| 52 |
--- a/dev-ros/rosbag/rosbag-9999.ebuild |
| 53 |
+++ b/dev-ros/rosbag/rosbag-9999.ebuild |
| 54 |
@@ -34,3 +34,4 @@ RDEPEND=" |
| 55 |
DEPEND="${RDEPEND}" |
| 56 |
RDEPEND="${RDEPEND} |
| 57 |
lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )" |
| 58 |
+PATCHES=( "${FILESDIR}/pycrypto.patch" ) |
Archives