Bug#774638: unblock: ceilometer/2014.1.3-5
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear release team,
Version 2014.1.3-5 of Ceilometer removes the use of ssl.PROTOCOL_SSLv3
(which is removed from Debian), and build-depends on openstack-pkg-tools
>= 21 to make sure systemd and sysv-rc fixes are in.
Please unblock ceilometer/2014.1.3-5 (debdiff attached).
Thomas Goirand (zigo)
diff -Nru ceilometer-2014.1.3/debian/changelog ceilometer-2014.1.3/debian/changelog
--- ceilometer-2014.1.3/debian/changelog 2014-10-25 16:48:31.000000000 +0000
+++ ceilometer-2014.1.3/debian/changelog 2015-01-05 16:11:50.000000000 +0000
@@ -1,3 +1,11 @@
+ceilometer (2014.1.3-5) unstable; urgency=medium
+
+ * Now depends on openstack-pkg-tools (>= 21~).
+ * Patches sslutils.py to remove ssl.PROTOCOL_SSLv3 which isn't defined in
+ Debian anymore.
+
+ -- Thomas Goirand <zigo@debian.org> Mon, 22 Dec 2014 18:39:35 +0800
+
ceilometer (2014.1.3-4) unstable; urgency=medium
* Added nl.po debconf translation thanks to Frans Spiesschaert
diff -Nru ceilometer-2014.1.3/debian/control ceilometer-2014.1.3/debian/control
--- ceilometer-2014.1.3/debian/control 2014-10-25 16:48:31.000000000 +0000
+++ ceilometer-2014.1.3/debian/control 2015-01-05 16:11:50.000000000 +0000
@@ -7,7 +7,7 @@
Mehdi Abaakouk <sileht@sileht.net>
Build-Depends: debhelper (>= 9),
dh-systemd,
- openstack-pkg-tools (>= 14~),
+ openstack-pkg-tools (>= 21~),
po-debconf,
python-all (>= 2.6.6-3~),
python-pbr (>= 0.6),
diff -Nru ceilometer-2014.1.3/debian/patches/no-PROTOCOL_SSLv3.patch ceilometer-2014.1.3/debian/patches/no-PROTOCOL_SSLv3.patch
--- ceilometer-2014.1.3/debian/patches/no-PROTOCOL_SSLv3.patch 1970-01-01 00:00:00.000000000 +0000
+++ ceilometer-2014.1.3/debian/patches/no-PROTOCOL_SSLv3.patch 2015-01-05 16:11:50.000000000 +0000
@@ -0,0 +1,19 @@
+Description: No ssl.PROTOCOL_SSLv3
+ This patch is needed since there's no ssl.PROTOCOL_SSLv3 support in Debian
+ anymore, and otherwise, this breaks unit tests.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2015-01-05
+
+--- ceilometer-2014.1.3.orig/ceilometer/openstack/common/sslutils.py
++++ ceilometer-2014.1.3/ceilometer/openstack/common/sslutils.py
+@@ -80,8 +80,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 ceilometer-2014.1.3/debian/patches/series ceilometer-2014.1.3/debian/patches/series
--- ceilometer-2014.1.3/debian/patches/series 2014-10-25 16:48:31.000000000 +0000
+++ ceilometer-2014.1.3/debian/patches/series 2015-01-05 16:11:50.000000000 +0000
@@ -4,3 +4,4 @@
0003_Opencontrail_Handle_non-ascii_character_in_meter_name.patch
0004_Opencontrail_transformer_Add_aggregator_transformer.patch
disable-test_bin.py.patch
+no-PROTOCOL_SSLv3.patch
Reply to: