diff -Nru nova-2012.1.3+stable-20130423-e52e6912/debian/changelog nova-2012.1.3+stable-20130423-e52e6912/debian/changelog --- nova-2012.1.3+stable-20130423-e52e6912/debian/changelog 2014-05-09 19:00:32.000000000 +0000 +++ nova-2012.1.3+stable-20130423-e52e6912/debian/changelog 2014-05-14 20:15:13.000000000 +0000 @@ -1,4 +1,4 @@ -nova (2012.1.3+stable-20130423-e52e6912-0ubuntu1.3) precise-security; urgency=medium +nova (2012.1.3+stable-20130423-e52e6912-0ubuntu1.4) precise-security; urgency=medium * SECURITY UPDATE: ssl not enforced when qpid_protocol is set to ssl - debian/patches/CVE-2013-6491.patch: set the right parameter in @@ -18,7 +18,7 @@ - CVE-2013-4463 - CVE-2013-4469 - -- Jamie Strandboge Fri, 09 May 2014 14:00:28 -0500 + -- Jamie Strandboge Wed, 14 May 2014 15:14:36 -0500 nova (2012.1.3+stable-20130423-e52e6912-0ubuntu1.2) precise-security; urgency=low diff -Nru nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-446x.patch nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-446x.patch --- nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-446x.patch 2014-05-09 19:53:27.000000000 +0000 +++ nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-446x.patch 2014-05-14 20:13:39.000000000 +0000 @@ -4,9 +4,9 @@ Index: nova-2012.1.3+stable-20130423-e52e6912/nova/tests/test_libvirt.py =================================================================== ---- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/tests/test_libvirt.py 2014-05-09 14:52:18.271644492 -0500 -+++ nova-2012.1.3+stable-20130423-e52e6912/nova/tests/test_libvirt.py 2014-05-09 14:52:18.263644361 -0500 -@@ -2373,7 +2373,8 @@ +--- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/tests/test_libvirt.py 2014-05-14 15:13:33.411850206 -0500 ++++ nova-2012.1.3+stable-20130423-e52e6912/nova/tests/test_libvirt.py 2014-05-14 15:13:33.403850077 -0500 +@@ -2372,7 +2372,8 @@ image_id = '4' user_id = 'fake' project_id = 'fake' @@ -18,8 +18,8 @@ libvirt_utils.fetch_image(context, target, image_id, Index: nova-2012.1.3+stable-20130423-e52e6912/nova/virt/images.py =================================================================== ---- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/images.py 2014-05-09 14:52:18.271644492 -0500 -+++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/images.py 2014-05-09 14:52:18.267644427 -0500 +--- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/images.py 2014-05-14 15:13:33.411850206 -0500 ++++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/images.py 2014-05-14 15:13:33.403850077 -0500 @@ -44,7 +44,7 @@ FLAGS.register_opts(image_opts) @@ -68,8 +68,8 @@ LOG.debug("%s was %s, converting to raw" % (image_href, fmt)) Index: nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/utils.py =================================================================== ---- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/libvirt/utils.py 2014-05-09 14:52:18.271644492 -0500 -+++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/utils.py 2014-05-09 14:52:18.267644427 -0500 +--- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/libvirt/utils.py 2014-05-14 15:13:33.411850206 -0500 ++++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/utils.py 2014-05-14 15:13:33.407850142 -0500 @@ -291,6 +291,7 @@ 'used': used} @@ -82,8 +82,8 @@ + max_size=max_size) Index: nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/connection.py =================================================================== ---- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/libvirt/connection.py 2014-05-09 14:52:18.271644492 -0500 -+++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/connection.py 2014-05-09 14:52:18.267644427 -0500 +--- nova-2012.1.3+stable-20130423-e52e6912.orig/nova/virt/libvirt/connection.py 2014-05-14 15:13:33.411850206 -0500 ++++ nova-2012.1.3+stable-20130423-e52e6912/nova/virt/libvirt/connection.py 2014-05-14 15:13:33.407850142 -0500 @@ -1154,21 +1154,27 @@ @utils.synchronized(base) diff -Nru nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-7130.patch nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-7130.patch --- nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-7130.patch 2014-05-09 20:21:01.000000000 +0000 +++ nova-2012.1.3+stable-20130423-e52e6912/debian/patches/CVE-2013-7130.patch 2014-05-14 20:13:21.000000000 +0000 @@ -167,11 +167,3 @@ def test_pre_live_migration_works_correctly(self): """Confirms pre_block_migration works correctly.""" # Creating testdata -@@ -1284,6 +1353,7 @@ - self.assertEquals(info[1]['path'], '/test/disk.local') - self.assertEquals(info[1]['virt_disk_size'], 21474836480) - self.assertEquals(info[1]['backing_file'], "file") -+ open("/tmp/bar", 'w').write("JAMIE\n%s\n" % info) - - db.instance_destroy(self.context, instance_ref['id']) -