diff options
Diffstat (limited to 'meta-openstack')
9 files changed, 16 insertions, 76 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-cinder_git.bb b/meta-openstack/recipes-devtools/python/python-cinder_git.bb index acabfa04..31246007 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder_git.bb +++ b/meta-openstack/recipes-devtools/python/python-cinder_git.bb @@ -20,8 +20,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://cinder-builtin-tests-config-location.patch \ " -SRCREV="81259f36f57e91b31009fbd209ea2a07a2ceb213" -PV="2013.2.3+git${SRCPV}" +SRCREV="34179609ed312ba65c8ac7ca78ea8fec39b28987" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d identity default_configs hosts diff --git a/meta-openstack/recipes-devtools/python/python-glance_git.bb b/meta-openstack/recipes-devtools/python/python-glance_git.bb index 1f94939e..a59512f4 100644 --- a/meta-openstack/recipes-devtools/python/python-glance_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glance_git.bb @@ -12,8 +12,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://glance-change-builtin-tests-config-location.patch \ " -SRCREV="396ca82f7e359b430a6cb0a6162d7bc937367705" -PV="2013.2.3+git${SRCPV}" +SRCREV="85584018b27bb08f3f727d4b4dc2a54ba693e375" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-heat_git.bb b/meta-openstack/recipes-devtools/python/python-heat_git.bb index 176cfa1c..82f179ed 100644 --- a/meta-openstack/recipes-devtools/python/python-heat_git.bb +++ b/meta-openstack/recipes-devtools/python/python-heat_git.bb @@ -16,8 +16,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://heat-tests-change-project_dir-path.patch \ " -SRCREV="58de9e6415f5bdabde708c8584b21b59b7e96a88" -PV="2013.2.3+git${SRCPV}" +SRCREV="b8ef3e94e4e6d378a59d64e1585ce3360c870b8c" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" SERVICECREATE_PACKAGES = "${SRCNAME}-setup ${SRCNAME}-templates ${SRCNAME}-cfn" diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index fd246dbe..597f5ab2 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb @@ -41,8 +41,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://horizon-use-full-package-path-to-test-directories.patch \ " -SRCREV="cd1de75ee2a8c246d5564e96ccc48185816c2290" -PV="2013.2.3+git${SRCPV}" +SRCREV="df782fc2b51f5e9d2e38e3e33a4ebdc0705a50b4" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools update-rc.d python-dir default_configs diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb index f2428446..09d78491 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb +++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb @@ -17,8 +17,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://convert_keystone_backend.py \ " -SRCREV="e7c29874e5a0e43f4f0e9970556c701af508152f" -PV="2013.2.3+git${SRCPV}" +SRCREV="7f1feaaf1fa5eca4b1cd541fca4f4203eeaebf8f" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-neutron_git.bb b/meta-openstack/recipes-devtools/python/python-neutron_git.bb index f59d1119..b3b37f76 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron_git.bb +++ b/meta-openstack/recipes-devtools/python/python-neutron_git.bb @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://uuid_wscheck.patch \ file://neutron-test-nec-plugin-extensions-location.patch \ " -SRCREV="a8417d78c2675a2ceb5dbfcee70948a88d69e747" -PV="2013.2.3+git${SRCPV}" +SRCREV="5499b63215c59150a9095736b9c7b2b79489ebf8" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 9903b949..cfa5caad 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb @@ -26,8 +26,8 @@ SRC_URI += "file://nova-all \ file://nova.conf \ file://openrc \ " -SRCREV="a3a955507d9d4b3e2688847fe45f88a26be3e8cc" -PV="2013.2.3+git${SRCPV}" +SRCREV="1d9c57a9845ddb3e386d039742184dc1d3d6b136" +PV="2013.2.4+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openstack/recipes-devtools/python/python-swift/CVE-2014-0006-swift-1265665.patch b/meta-openstack/recipes-devtools/python/python-swift/CVE-2014-0006-swift-1265665.patch deleted file mode 100644 index a284b5bb..00000000 --- a/meta-openstack/recipes-devtools/python/python-swift/CVE-2014-0006-swift-1265665.patch +++ /dev/null @@ -1,59 +0,0 @@ -From b2c61375b3255486adb2900922a894dc7dad3c6d Mon Sep 17 00:00:00 2001 -From: Samuel Merritt <sam@swiftstack.com> -Date: Thu, 16 Jan 2014 13:44:23 +0100 -Subject: Use constant time comparison in tempURL - -Use constant time comparison when evaluating tempURL to avoid timing -attacks (CVE-2014-0006). This is the havana backport of the master -patch. - -Fixes bug 1265665 - -Change-Id: I11e4ad83cc4077e52adf54a0bd0f9749294b2a48 - -diff --git a/swift/common/middleware/tempurl.py b/swift/common/middleware/tempurl.py -index ffc1431..ae2f4a1 100644 ---- a/swift/common/middleware/tempurl.py -+++ b/swift/common/middleware/tempurl.py -@@ -98,7 +98,7 @@ from urlparse import parse_qs - - from swift.proxy.controllers.base import get_account_info - from swift.common.swob import HeaderKeyDict --from swift.common.utils import split_path -+from swift.common.utils import split_path, streq_const_time - - - #: Default headers to remove from incoming requests. Simply a whitespace -@@ -267,17 +267,20 @@ class TempURL(object): - if not keys: - return self._invalid(env, start_response) - if env['REQUEST_METHOD'] == 'HEAD': -- hmac_vals = self._get_hmacs(env, temp_url_expires, keys, -- request_method='GET') -- if temp_url_sig not in hmac_vals: -- hmac_vals = self._get_hmacs(env, temp_url_expires, keys, -- request_method='PUT') -- if temp_url_sig not in hmac_vals: -- return self._invalid(env, start_response) -+ hmac_vals = (self._get_hmacs(env, temp_url_expires, keys, -+ request_method='GET') + -+ self._get_hmacs(env, temp_url_expires, keys, -+ request_method='PUT')) - else: - hmac_vals = self._get_hmacs(env, temp_url_expires, keys) -- if temp_url_sig not in hmac_vals: -- return self._invalid(env, start_response) -+ -+ # While it's true that any() will short-circuit, this doesn't affect -+ # the timing-attack resistance since the only way this will -+ # short-circuit is when a valid signature is passed in. -+ is_valid_hmac = any(streq_const_time(temp_url_sig, h) -+ for h in hmac_vals) -+ if not is_valid_hmac: -+ return self._invalid(env, start_response) - self._clean_incoming_headers(env) - env['swift.authorize'] = lambda req: None - env['swift.authorize_override'] = True --- -cgit v0.10.1 - diff --git a/meta-openstack/recipes-devtools/python/python-swift_git.bb b/meta-openstack/recipes-devtools/python/python-swift_git.bb index 43ba8dd1..fe5fa029 100644 --- a/meta-openstack/recipes-devtools/python/python-swift_git.bb +++ b/meta-openstack/recipes-devtools/python/python-swift_git.bb @@ -14,11 +14,10 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \ file://swift.init \ file://swift_setup.sh \ file://cluster.conf \ - file://CVE-2014-0006-swift-1265665.patch \ " -SRCREV="2f3526c559fe53ce904b735a81dee6de46127176" -PV="2013.2.2+git${SRCPV}" +SRCREV="f9c44df6e2d32edf663814670c21ef552bef37db" +PV="1.10.0+git${SRCPV}" S = "${WORKDIR}/git" inherit setuptools python-dir update-rc.d hosts identity |