summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-07-23 02:01:38 +0200
committerBenjamin Chrétien2015-06-20 02:25:13 +0900
commitab0db9f28b2fb91476eb7b324dcb27556234f8ed (patch)
treefaa90d330a649493861b5a925164ad5a8054736d
parenta60a6ab763c3f9626a154054d1badb43cc2f19a6 (diff)
downloadaur-ab0db9f28b2fb91476eb7b324dcb27556234f8ed.tar.gz
import_catkin_packages.py: verify HTTPS requests.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD5
-rwxr-xr-ximport_catkin_packages.py13
3 files changed, 19 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0d084299ff3f..147c4086890c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
pkgbase = ros-build-tools
pkgdesc = Utilities for building arch packages for ROS stacks.
pkgver = 0.1.0
- pkgrel = 2
+ pkgrel = 3
url = http://www.ros.org
arch = i686
arch = x86_64
license = BSD
optdepends = python2: package generation
optdepends = python2-catkin_pkg: package generation
+ optdepends = python2-certifi: package generation
optdepends = python2-termcolor: package generation
optdepends = python2-urllib3: package generation
optdepends = python2-yaml: package generation
@@ -27,7 +28,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = 124ab9384456c840d9962dc9dd154f87
+ md5sums = 02c47940a12ad713ee220978635ef117
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 8b0b6fbaa232..941c10b5dec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,13 @@ url=http://www.ros.org
pkgname='ros-build-tools'
pkgver='0.1.0'
arch=('i686' 'x86_64')
-pkgrel=2
+pkgrel=3
license=('BSD')
makedepends=()
depends=()
optdepends=('python2: package generation'
'python2-catkin_pkg: package generation'
+ 'python2-certifi: package generation'
'python2-termcolor: package generation'
'python2-urllib3: package generation'
'python2-yaml: package generation')
@@ -47,5 +48,5 @@ md5sums=('ed01573e0ecc0f7ca451d7e2849cc5ee'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- '124ab9384456c840d9962dc9dd154f87'
+ '02c47940a12ad713ee220978635ef117'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index 16381f4002ca..5a1a2e113d85 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -20,6 +20,19 @@ updated_packages_file = os.path.join(updates_packages_dir,
"updated_packages_%(distro)s.dump")
http = urllib3.PoolManager()
+try:
+ import certifi
+
+ # Make verified HTTPS requests
+ http = urllib3.PoolManager(
+ cert_reqs='CERT_REQUIRED', # Force certificate check.
+ ca_certs=certifi.where(), # Path to the Certifi bundle.
+ )
+except ImportError as e:
+ # HTTPS requests will not be verified
+ pass
+
+
class PackageBase(object):
def __init__(self, distro, repository_url, name, version, version_patch):