Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Dear release team,

My last upload of openstack-trove fixed a crash in the purge
(bug #771873, which was due to a bad copy/past from nova),
and also patches openstack common sslutils.py which still had
an instance of PROTOCOL_SSLv3 (which symbol was removed from
Python recently) that was causing an FTBFS.

Please unblock openstack-trove/2014.1.3-4.

Cheers,

Thomas Goirand
diff -Nru openstack-trove-2014.1.3/debian/changelog openstack-trove-2014.1.3/debian/changelog
--- openstack-trove-2014.1.3/debian/changelog	2014-11-12 10:24:11.000000000 +0000
+++ openstack-trove-2014.1.3/debian/changelog	2014-12-03 12:51:53.000000000 +0000
@@ -1,3 +1,10 @@
+openstack-trove (2014.1.3-4) unstable; urgency=medium
+
+  * Fixed ucfr call to use trove-common and not nova-common (Closes: #771873).
+  * Removed PROTOCOL_SSLv3 which was removed upstream.
+
+ -- Thomas Goirand <z...@debian.org>  Wed, 03 Dec 2014 19:04:32 +0800
+
 openstack-trove (2014.1.3-3) unstable; urgency=medium
 
   * Added nl.po debconf translation (Closes: #767422).
diff -Nru openstack-trove-2014.1.3/debian/patches/do-not-use-PROTOCOL_SSLv3.patch openstack-trove-2014.1.3/debian/patches/do-not-use-PROTOCOL_SSLv3.patch
--- openstack-trove-2014.1.3/debian/patches/do-not-use-PROTOCOL_SSLv3.patch	1970-01-01 00:00:00.000000000 +0000
+++ openstack-trove-2014.1.3/debian/patches/do-not-use-PROTOCOL_SSLv3.patch	2014-12-03 12:51:53.000000000 +0000
@@ -0,0 +1,17 @@
+Description: PROTOCOL_SSLv3 is removed from Debian
+Author: Thomas Goirand <z...@debian.org>
+Forwarded: no
+Last-Update: 2014-12-03
+
+--- openstack-trove-2014.1.3.orig/trove/openstack/common/sslutils.py
++++ openstack-trove-2014.1.3/trove/openstack/common/sslutils.py
+@@ -82,8 +82,7 @@ def wrap(sock):
+ 
+ _SSL_PROTOCOLS = {
+     "tlsv1": ssl.PROTOCOL_TLSv1,
+-    "sslv23": ssl.PROTOCOL_SSLv23,
+-    "sslv3": ssl.PROTOCOL_SSLv3
++    "sslv23": ssl.PROTOCOL_SSLv23
+ }
+ 
+ try:
diff -Nru openstack-trove-2014.1.3/debian/patches/series openstack-trove-2014.1.3/debian/patches/series
--- openstack-trove-2014.1.3/debian/patches/series	2014-11-12 10:24:11.000000000 +0000
+++ openstack-trove-2014.1.3/debian/patches/series	2014-12-03 12:51:53.000000000 +0000
@@ -2,3 +2,4 @@
 fixes-filter-authtoken-config-file.patch
 do-not-use-network-when-building-docs.patch
 Isolate_unit_tests_from_integration_tests_data.patch
+do-not-use-PROTOCOL_SSLv3.patch
diff -Nru openstack-trove-2014.1.3/debian/trove-common.postrm openstack-trove-2014.1.3/debian/trove-common.postrm
--- openstack-trove-2014.1.3/debian/trove-common.postrm	2014-11-12 10:24:11.000000000 +0000
+++ openstack-trove-2014.1.3/debian/trove-common.postrm	2014-12-03 12:51:53.000000000 +0000
@@ -14,7 +14,7 @@
 				rm -f /etc/dbconfig-common/trove-common.conf
 				if which ucf >/dev/null 2>&1; then
 					ucf --purge /etc/dbconfig-common/trove-common.conf
-					ucfr --purge nova-common /etc/dbconfig-common/trove-common.conf
+					ucfr --purge trove-common /etc/dbconfig-common/trove-common.conf
 				fi
 			fi
 		fi

Reply via email to