Merge lp:~gandelman-a/ubuntu/quantal/glance/2012.2.1 into lp:~openstack-ubuntu-testing/glance/folsom

[Adam Gandelman]

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-12 14:47:14 +0000
+++ debian/changelog	2012-11-30 23:41:49 +0000
@@ -1,3 +1,55 @@
+glance (2012.2.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Dropped patches, applied upstream:
+    - debian/patches/CVE-2012-4573.patch
+    - debian/patches/CVE-2012-4573b.patch
+  * Resynchronize with stable/folsom (199783ce) (LP: #1085255):
+    - [49408e9] Glance image-delete HTTPInternalServerError HTTP 500
+      (LP: #1075580)
+    - [91aaa48] Image fails to upload to swift: TypeError: object of type
+      'CooperativeReader' has no len( (LP: #1057322)
+    - [a296a5b] Return 403 when admin deletes a deleted image (LP: #1060944)
+    - [3e58a6a] Disallow updating deleted images. (LP: #1060930)
+    - [26c8085] admins can see deleted images in v2 api (LP: #1071446)
+    - [8321ca6] No exclude option to skip tests in run_tests.sh (LP: #1065758)
+    - [c3bea11] Badly named stable/folsom Glance tarballs (LP: #1059634)
+    - [fc0ee76] Non-admin users can cause public glance images to be deleted
+      from the backend storage repository in the v2 api (LP: #1076506)
+    - [90bcdc5] Non-admin users can cause public glance images to be deleted
+      from the backend storage repository (LP: #1065187)
+    - [7841cc9] FakeAuth not always admin
+    - [ddad275] Jenkins jobs fail because of incompatibility between sqlalchemy-
+      migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
+    - [1d5c651] nosetest options cause no such option errors (LP: #1056420)
+    - [ac223e2] Set defaultbranch in .gitreview to stable/folsom
+
+ -- Adam Gandelman <[e-mail]>  Fri, 30 Nov 2012 12:22:50 -0400
+
+glance (2012.2-0ubuntu2.3) quantal-security; urgency=low
+
+  * SECURITY UPDATE: deletion of arbitrary public and shared images via
+    authenticated user
+    - debian/patches/CVE-2012-4573b.patch: previous patch was incomplete.
+      Make corresponding change to glance/api/v2/images.py
+    - CVE-2012-4573
+  * debian/control: add Build-Depends-Indep on python-chardet. This is needed
+    by python-requests to do encoding detection which otherwise fails in the
+    new tests introduced in CVE-2012-4573b.patch.
+
+ -- Jamie Strandboge <[e-mail]>  Fri, 09 Nov 2012 06:53:44 -0600
+
+glance (2012.2-0ubuntu2.2) quantal-security; urgency=low
+
+  * SECURITY UPDATE: deletion of arbitrary public and shared images via
+    authenticated user
+    - debian/patches/CVE-2012-4573.patch: adjust glance/api/v1/images.py to
+      ensure image is owned by user before delayed_deletion
+    - CVE-2012-4573
+  * debian/patches/fakeauth-not-always-admin.patch: add required testsuite
+    patch in support of the testsuite changes in CVE-2012-4573.patch
+
+ -- Jamie Strandboge <[e-mail]>  Thu, 08 Nov 2012 07:41:02 -0600
+
 glance (2012.2-0ubuntu2) quantal-proposed; urgency=low
 
   * Glance should suggest python-ceph, not ceph-common (LP: #1065903):
@@ -295,7 +347,6 @@
 
  -- Matthias Klose <[e-mail]>  Mon, 02 Jan 2012 13:02:24 +0100
 
-
 glance (2012.1~e2-0ubuntu2) precise; urgency=low
 
   * debian/glance-registry.postinst: Fix typo in postinst.
@@ -583,3 +634,4 @@
   * Initial upload.
 
  -- Soren Hansen <[e-mail]>  Wed, 19 Jan 2011 12:01:32 +0100
+

=== modified file 'debian/control'
--- debian/control	2012-10-12 10:09:43 +0000
+++ debian/control	2012-11-30 23:41:49 +0000
@@ -33,7 +33,8 @@
  python-glanceclient,
  python-xattr,
  curl,
- pep8
+ pep8,
+ python-chardet
 Standards-Version: 3.9.3
 XS-Python-Version: >= 2.6
 Homepage: http://launchpad.net/glance