Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2012-01-31 10:21:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openstack-nova", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2012-01-17 16:12:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2012-01-31 10:21:25.000000000 +0100 @@ -1,0 +2,33 @@ +Mon Jan 30 13:21:37 UTC 2012 - prusnak@opensuse.org + +- drop aoetools from Requires, not needed + +------------------------------------------------------------------- +Wed Jan 25 10:37:41 UTC 2012 - bwiedemann@suse.com + +- Require lowercase python names to compile for older versions +- openstack-nova-network requires dnsmasq + +------------------------------------------------------------------- +Mon Jan 16 16:11:41 UTC 2012 - prusnak@opensuse.org + +- fix initscript scriptlets + +------------------------------------------------------------------- +Wed Jan 11 14:11:17 UTC 2012 - bwiedemann@suse.com + +- add patch for authentication bug (bnc#740183) + +------------------------------------------------------------------- +Tue Jan 10 13:38:58 UTC 2012 - bwiedemann@suse.com + +- use spdx.org License name Apache-2.0 + +------------------------------------------------------------------- +Mon Jan 9 16:01:45 UTC 2012 - bwiedemann@suse.com + +- update upstream stable/diablo patches + omitting 0075-Sanitize-EC2-manifests-and-image-tarballs.patch + because it contains binary, which is not supported by patch + +------------------------------------------------------------------- New: ---- bug-740183_vuln.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova.spec ++++++ --- /var/tmp/diff_new_pack.PWR2U1/_old 2012-01-31 10:21:26.000000000 +0100 +++ /var/tmp/diff_new_pack.PWR2U1/_new 2012-01-31 10:21:26.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-nova # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -16,7 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# options to forcefully build with/without vcs + %bcond_with from_vcs %bcond_with no_from_vcs @@ -46,13 +46,13 @@ Name: openstack-nova Version: 2011.3 +Release: 0 %if 0%{?BUILD_FROM_VCS} %define _version git-master %else %define _version %{version} %endif -Release: 0 -License: ASL 2.0 +License: Apache-2.0 Summary: OpenStack Compute (nova), %{summary_release} Url: http://openstack.org/projects/compute/ Group: System/Management @@ -64,6 +64,7 @@ Source5: stable.tar.gz Source6: noVNC.tar.gz Patch0: nova-2011.3-create_lock_dir.patch +Patch1: bug-740183_vuln.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # don't use noarch because of SLE :-/ # BuildArch: noarch @@ -72,7 +73,7 @@ BuildRequires: fdupes BuildRequires: intltool -BuildRequires: python-Paste +BuildRequires: python-paste BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: python-distutils-extra @@ -87,7 +88,6 @@ Recommends: python-mysql Requires: /usr/bin/truncate -Requires: aoetools Requires: euca2ools Requires: logrotate Requires: python-glance @@ -124,8 +124,8 @@ Requires: curl Requires: ebtables -Requires: python-M2Crypto -Requires: python-Twisted +Requires: python-m2crypto +Requires: python-twisted Requires: python-boto Requires: python-carrot Requires: python-cheetah @@ -180,6 +180,7 @@ Summary: OpenStack nova network, %{summary_release} Group: Development/Languages/Python Requires: %{name} +Requires: dnsmasq %description network This package contains the network services for OpenStack. @@ -227,9 +228,9 @@ Summary: Documentation for %{name}, %{summary_release} Group: Documentation -BuildRequires: python-M2Crypto -BuildRequires: python-Sphinx -BuildRequires: python-Twisted +BuildRequires: python-m2crypto +BuildRequires: python-sphinx +BuildRequires: python-twisted BuildRequires: python-boto BuildRequires: python-carrot BuildRequires: python-cheetah @@ -265,77 +266,78 @@ patch -p1 < $patch done %patch0 -p1 +%patch1 -p1 %endif %post api %{fillup_and_insserv -f -y openstack-nova-api} +%restart_on_update openstack-nova-api %preun api %stop_on_removal openstack-nova-api %postun api -%restart_on_update openstack-nova-api -%insserv_cleanup openstack-nova-api +%insserv_cleanup %post compute %{fillup_and_insserv -f -y openstack-nova-compute} +%restart_on_update openstack-nova-compute %preun compute %stop_on_removal openstack-nova-compute %postun compute -%restart_on_update openstack-nova-compute -%insserv_cleanup openstack-nova-compute +%insserv_cleanup %post network %{fillup_and_insserv -f -y openstack-nova-network} +%restart_on_update openstack-nova-network %preun network %stop_on_removal openstack-nova-network %postun network -%restart_on_update openstack-nova-network -%insserv_cleanup openstack-nova-network +%insserv_cleanup %post vncproxy %{fillup_and_insserv -f -y openstack-nova-vncproxy} +%restart_on_update openstack-nova-vncproxy %preun vncproxy %stop_on_removal openstack-nova-vncproxy %postun vncproxy -%restart_on_update openstack-nova-vncproxy -%insserv_cleanup openstack-nova-vncproxy +%insserv_cleanup %post objectstore %{fillup_and_insserv -f -y openstack-nova-objectstore} +%restart_on_update openstack-nova-objectstore %preun objectstore %stop_on_removal openstack-nova-objectstore %postun objectstore -%restart_on_update openstack-nova-objectstore -%insserv_cleanup openstack-nova-objectstore +%insserv_cleanup %post scheduler %{fillup_and_insserv -f -y openstack-nova-scheduler} +%restart_on_update openstack-nova-scheduler %preun scheduler %stop_on_removal openstack-nova-scheduler %postun scheduler -%restart_on_update openstack-nova-scheduler -%insserv_cleanup openstack-nova-scheduler +%insserv_cleanup %post volume %{fillup_and_insserv -f -y openstack-nova-volume} +%restart_on_update openstack-nova-volume %preun volume %stop_on_removal openstack-nova-volume %postun volume -%restart_on_update openstack-nova-volume -%insserv_cleanup openstack-nova-volume +%insserv_cleanup %build python setup.py build ++++++ bug-740183_vuln.patch ++++++ diff --git a/nova/test.py b/nova/test.py index 1fc47f5..961594c 100644 --- a/nova/test.py +++ b/nova/test.py @@ -49,6 +49,7 @@ flags.DEFINE_bool('fake_tests', True, 'should we use everything for testing') LOG = log.getLogger('nova.tests') +TESTING = False class skip_test(object): @@ -128,6 +129,8 @@ class TestCase(unittest.TestCase): self.injected = [] self._services = [] self._original_flags = FLAGS.FlagValuesDict() + global TESTING + TESTING = True def tearDown(self): """Runs after each test method to tear down test environment.""" --- a/nova/api/openstack/wsgi.py.orig 2011-09-22 13:57:02.000000000 +0200 +++ b/nova/api/openstack/wsgi.py 2012-01-09 13:43:58.000000000 +0100 @@ -7,6 +7,7 @@ import faults from nova import exception from nova import log as logging +from nova import test from nova import utils from nova import wsgi @@ -487,8 +488,13 @@ return faults.Fault(webob.exc.HTTPBadRequest(explanation=msg)) project_id = args.pop("project_id", None) - if 'nova.context' in request.environ and project_id: - request.environ['nova.context'].project_id = project_id + if test.TESTING: + if 'nova.context' in request.environ and project_id: + request.environ['nova.context'].project_id = project_id + elif ('nova.context' in request.environ and project_id + and project_id != request.environ['nova.context'].project_id): + msg = _("Malformed request url") + return Fault(webob.exc.HTTPBadRequest(explanation=msg)) try: action_result = self.dispatch(request, action, args) ++++++ stable.tar.gz ++++++ ++++ 4640 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org