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

[Adam Gandelman]

[lp:~gandelman-a/ubuntu/quantal/keystone/2012.2.1]

155. By Adam Gandelman on 2012-12-03

Merge 2012.2.1 changes.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-31 16:34:40 +0000
+++ debian/changelog	2012-12-01 04:25:22 +0000
@@ -1,11 +1,47 @@
-keystone (2012.2-0ubuntu1.1) UNRELEASED; urgency=low
+keystone (2012.2.1-0ubuntu1) UNRELEASED; urgency=low
 
   * Ubuntu updates:
     - debian/control: Ensure keystoneclient is upgraded with keystone,
       require python-keystoneclient >= 1:0.1.3. (LP: #1073273)
+    - Dropped patches, applied upsteram:
+      - debian/patches/CVE-2012-5563.patch
+      - debian/patches/CVE-2012-5571.patch
+      - debian/patches/fix-ssl-tests-lp1068851.patch
+  * Resynchronize with stable/folsom (7869c3ec) (LP: #1085255):
+    - [f9d4766] token expires time incorrect for auth by one token
+      (LP: #1079216)
+    - [80d63c8] keystone throws error when removing user from tenant.
+      (LP: #1078497)
+    - [37308dd] Removing user from a tenant isn't invalidating user access to
+      tenant (LP: #1064914)
+    - [bec9b68] Redo part of bp/sql-identiy-pam undone by bug 968519
+      (LP: #1068674)
+    - [ee645e6] Jenkins jobs fail because of incompatibility between sqlalchemy-
+      migrate and the newest sqlalchemy-0.8.0b1 (LP: #1073569)
+    - [094c494] Non PKI Tokens longer than 32 characters can never be valid
+      (LP: #1060389)
+    - [3cd343b] Openssl tests rely on expired certificate (LP: #1068851)
+    - [2f9807e] Set defaultbranch in .gitreview to stable/folsom
 
  -- Adam Gandelman <[e-mail]>  Wed, 31 Oct 2012 13:43:11 +0100
 
+keystone (2012.2-0ubuntu1.2) quantal-security; urgency=low
+
+  * SECURITY UPDATE: fix for EC2-style credentials invalidation
+    - debian/patches/CVE-2012-5571.patch: adjust contrib/ec2/core.py to verify
+      that the user is in at least one valid role for the tenant
+    - CVE-2012-5571
+    - LP: #1064914
+  * debian/patches/fix-ssl-tests-lp1068851.patch: update certificates for
+    SSL tests
+  * SECURITY UPDATE: fix for token expiration
+    - debian/patches/CVE-2012-5563.patch: ensure token expiration is
+      maintained
+    - CVE-2012-5563
+    - LP: #1079216
+
+ -- Jamie Strandboge <[e-mail]>  Wed, 28 Nov 2012 11:29:47 -0600
+
 keystone (2012.2-0ubuntu1) quantal; urgency=low
 
   * New upstream release.
@@ -281,7 +317,6 @@
 
  -- Chuck Short <[e-mail]>  Fri, 16 Dec 2011 15:38:05 -0500
 
-
 keystone (2012.1~e2~20111209.1405-0ubuntu1) precise; urgency=low
 
   * New upstream release.