gentoo resync : 15.12.2019

4 files changed, 59 insertions, 4 deletions

diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index 218f0036d998..ccd4b50712b9 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,4 +1,5 @@
+AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosbag-1.14.3-r1.ebuild 870 BLAKE2B 0bba05e2e8f023b50eb237ff6f36d6ee7040986467739f876289250c78f24d2a8fce798662b21c2ada4260b8d54faf0ee3c6086e821551b25abcfc0ce29ebe68 SHA512 aeba9668e694a03cb6405e5a8446c3785619a94e2726cd3135a9929d30a7373cac65aac047c2a506b39e4546077fc4827437d6d55741e47b7cc66e230ee953ba
-EBUILD rosbag-9999.ebuild 870 BLAKE2B 0bba05e2e8f023b50eb237ff6f36d6ee7040986467739f876289250c78f24d2a8fce798662b21c2ada4260b8d54faf0ee3c6086e821551b25abcfc0ce29ebe68 SHA512 aeba9668e694a03cb6405e5a8446c3785619a94e2726cd3135a9929d30a7373cac65aac047c2a506b39e4546077fc4827437d6d55741e47b7cc66e230ee953ba
+EBUILD rosbag-1.14.3-r3.ebuild 911 BLAKE2B de87eaebff18c2a72accd257ed44270fae079b8035f0355f0216fbe7222c9df3199fa2f7491416a6e0decfe32a62769d638c49086bbdbfc8cdf96aa6f3559f5a SHA512 5ae601041118b5275d30f3138e591ef22f1174d77e6e870f2995cca06bcd0b58bc6fbd6dd308f88863cf47b7e5f776599c59bb5d644e85fb1b9b7fc4fe83651a
+EBUILD rosbag-9999.ebuild 874 BLAKE2B c1d41aaa13cd380d567130ed9d883fc32410ecc7a8f955016d9b5f197112ebb81af87ed83c794233e206eebd2d5366e7e2ab3bf9f70e8979ca66ebc074217fdf SHA512 615c22f1ba5a370a7068ca05abc6dbd1d28f4fbb32ed486625004a51f85c3892310387e3b00f4404c5d2cf09629ac2f14f5445f777a23197e7f7850afe222886
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/yaml.patch b/dev-ros/rosbag/files/yaml.patch
new file mode 100644
index 000000000000..aea89788c1ea
--- /dev/null
+++ b/dev-ros/rosbag/files/yaml.patch
@@ -0,0 +1,53 @@
+From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
+From: Martijn Buijs <Martijn.buijs@gmail.com>
+Date: Tue, 23 Apr 2019 18:20:12 +0200
+Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+ (#1688)
+
+* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
+
+* Change all usages of yaml.load to yaml.safe_load
+
+* Extend PyYAML's SafeLoader and use it with `yaml.load`
+
+Also added convenience functions for using this loader for reuse in
+`roslaunch`
+
+* fix typo in rosparam.yaml_load_all
+
+* Modify Loader and SafeLoader in yaml module directly
+
+* Revert whitespace change
+
+* Revert unrelated change to import through global variable construction
+---
+ clients/rospy/src/rospy/client.py             |  2 +-
+ .../test/test_roslib_message.py               |  2 +-
+ .../client_verification/test_slave_api.py     |  2 +-
+ test/test_rosparam/test/check_rosparam.py     |  8 ++---
+ .../check_rosparam_command_line_online.py     |  2 +-
+ .../check_rosservice_command_line_online.py   |  4 +--
+ test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
+ tools/rosbag/src/rosbag/bag.py                |  2 +-
+ tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
+ tools/roslaunch/src/roslaunch/loader.py       |  4 +--
+ .../test/unit/test_roslaunch_dump_params.py   |  4 +--
+ tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
+ tools/rosservice/src/rosservice/__init__.py   |  4 +--
+ tools/rostopic/src/rostopic/__init__.py       |  6 ++--
+ tools/topic_tools/scripts/relay_field         |  2 +-
+ 15 files changed, 43 insertions(+), 38 deletions(-)
+
+diff --git a/tools/rosbag/src/rosbag/bag.py b/tools/rosbag/src/rosbag/bag.py
+index 0578aed91..9bdcb693d 100644
+--- a/tools/rosbag/src/rosbag/bag.py
++++ b/tools/rosbag/src/rosbag/bag.py
+@@ -1250,7 +1250,7 @@ def __init__(self, d):
+                         else:
+                            setattr(self, a, DictObject(b) if isinstance(b, dict) else b)
+ 
+-            obj = DictObject(yaml.load(s))
++            obj = DictObject(yaml.safe_load(s))
+             try:
+                 val = eval('obj.' + key)
+             except Exception as ex:
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
index f36222bd8660..85bf4e8aee9a 100644
--- a/dev-ros/rosbag/rosbag-1.14.3-r1.ebuild
+++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
@@ -28,9 +28,10 @@ RDEPEND="
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-libs/console_bridge:=
-	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/python-gnupg[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
 	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/yaml.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index f36222bd8660..e4ca9d626aae 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-ros/genpy[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-libs/console_bridge:=
-	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
 	dev-python/python-gnupg[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"