Removes now applied upstream CVE-2013-6384 patch, refreshes removes-sqlalchemy-restri...

Change-Id: I9bbc9d33c1144a8838fab739ead4557c6a2c7339

Rewritten-From: 3a3b80dd6ab6143377bc4e4f50b1372ea6d4226e

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index fa710257f5858cca29b29c0041dabad74aab360a..6422cc7e8b7c2be26dd15a1e4913b50a0540ae62 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,6 +1,8 @@
 ceilometer (2014.1~b1-1) experimental; urgency=low
 
   * New upstream release (Icehouse beta 1).
+  * Removes now applied upstream CVE-2013-6384 patch, refreshes
+    removes-sqlalchemy-restriction.patch
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 09 Dec 2013 17:09:32 +0800
 

diff --git a/xenial/debian/patches/CVE-2013-6384_mongodb_db2_do_not_print_full_URL_in_logs.patch b/xenial/debian/patches/CVE-2013-6384_mongodb_db2_do_not_print_full_URL_in_logs.patch
deleted file mode 100644 (file)
index 50b0fa0..0000000
--- a/xenial/debian/patches/CVE-2013-6384_mongodb_db2_do_not_print_full_URL_in_logs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: mongodb, db2: do not print full URL in logs
- The full URL used to connect to MongoDB or DB2 might contains sensitive
- information such as username and password, so it's better to not print it at
- all. Instead, just print the hosts that are being connected to.
-Author: Julien Danjou <julien@danjou.info>
-Date: Wed, 30 Oct 2013 14:49:33 +0000 (+0100)
-Origin: upstream, https://review.openstack.org/#/c/56396/
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fceilometer.git;a=commitdiff_plain;h=ef6c659588feff646343fd80ba3d420d9c06404b
-Bug-Ubuntu: Bug-Ubuntu: https://launchpad.net/bugs/1244476
-Bug-Debian: Bug-Debian: http://bugs.debian.org/730227
-
-diff --git a/ceilometer/storage/impl_db2.py b/ceilometer/storage/impl_db2.py
-index b44f424..5a72c1c 100644
---- a/ceilometer/storage/impl_db2.py
-+++ b/ceilometer/storage/impl_db2.py
-@@ -153,7 +153,8 @@ class ConnectionPool(object):
-             client = self._pool.get(pool_key)()
-             if client:
-                 return client
--        LOG.info('connecting to MongoDB on %s', url)
-+        LOG.info(_('Connecting to DB2 on %s'),
-+                 connection_options['nodelist'])
-         client = pymongo.MongoClient(
-             url,
-             safe=True)
-diff --git a/ceilometer/storage/impl_mongodb.py b/ceilometer/storage/impl_mongodb.py
-index 9ca881c..9640ebe 100644
---- a/ceilometer/storage/impl_mongodb.py
-+++ b/ceilometer/storage/impl_mongodb.py
-@@ -155,7 +155,8 @@ class ConnectionPool(object):
-             client = self._pool.get(pool_key)()
-             if client:
-                 return client
--        LOG.info('connecting to MongoDB on %s', url)
-+        LOG.info(_('Connecting to MongoDB on %s'),
-+                 connection_options['nodelist'])
-         client = pymongo.MongoClient(
-             url,
-             safe=True)

diff --git a/xenial/debian/patches/removes-sqlalchemy-restriction.patch b/xenial/debian/patches/removes-sqlalchemy-restriction.patch
index 4651c4eae91bd024195969931ce292f5c80f2b16..d2a18238c3916bd4d00ef801ffd3975ca81773ba 100644 (file)
--- a/xenial/debian/patches/removes-sqlalchemy-restriction.patch
+++ b/xenial/debian/patches/removes-sqlalchemy-restriction.patch
@@ -1,16 +1,16 @@
-Description: Requirement is wrong
+Description: Removes SQLAlchemy restriction
 Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2013-09-22
+Forwarded: not-needed
+Last-Update: 2013-12-09
 
---- ceilometer-2013.2~b3.orig/requirements.txt
-+++ ceilometer-2013.2~b3/requirements.txt
-@@ -3,7 +3,7 @@ WebOb>=1.2.3,<1.3
- kombu>=2.4.8
- iso8601>=0.1.4
- argparse
+--- ceilometer-2014.1~b1.orig/requirements.txt
++++ ceilometer-2014.1~b1/requirements.txt
+@@ -23,7 +23,7 @@ python-swiftclient>=1.5
+ PyYAML>=3.1.0
+ requests>=1.1
+ six>=1.4.1
 -SQLAlchemy>=0.7.8,<=0.7.99
 +SQLAlchemy>=0.7.8
- sqlalchemy-migrate>=0.7.2
- alembic>=0.4.1
- netaddr
+ sqlalchemy-migrate>=0.8.2
+ stevedore>=0.12
+ WebOb>=1.2.3,<1.3

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 4edfc30b56772907a276481699b6f540968f8d7a..31b8fb8193ce160eb2e74e71ab1cc813f4ed3dbb 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,2 +1 @@
 removes-sqlalchemy-restriction.patch
-CVE-2013-6384_mongodb_db2_do_not_print_full_URL_in_logs.patch