Your message dated Sat, 07 Sep 2019 14:34:49 +0100 with message-id <[🔎] f49e2985d8466065c49c03185c24465a32228fb5.camel@adam-barratt.org.uk> and subject line Closing bugs for fixes including in 10.1 point release has caused the Debian Bug report #931608, regarding buster-pu: package cloudkitty/8.0.0-4+deb10u1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 931608: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=931608 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: buster-pu: package cloudkitty/8.0.0-4
- From: Thomas Goirand <zigo@debian.org>
- Date: Mon, 08 Jul 2019 10:30:40 +0200
- Message-id: <156257464033.19931.1816335840507995123.reportbug@buzig2.debian.org>
Package: release.debian.org Severity: normal Tags: buster User: release.debian.org@packages.debian.org Usertags: pu Hi, The attached debdiff fixes the FTBS. Details are in the relevant bugs (as per the debian/changelog). Please allow me to upload the fix to Buster. Cheers, Thomas Goirand (zigo)diff -Nru cloudkitty-8.0.0/debian/changelog cloudkitty-8.0.0/debian/changelog --- cloudkitty-8.0.0/debian/changelog 2019-01-24 14:45:39.000000000 +0100 +++ cloudkitty-8.0.0/debian/changelog 2019-06-28 15:01:45.000000000 +0200 @@ -1,3 +1,11 @@ +cloudkitty (8.0.0-4+deb10u1) buster; urgency=medium + + * Add upstream patch to fix FTBFS after we updated SQLAlchemy to fix + CVE-2019-7164 CVE-2019-7548 (SQL injection) (see debian bug 922669 and + 929321 for more info) (Closes: #930996). + + -- Thomas Goirand <zigo@debian.org> Fri, 28 Jun 2019 15:01:45 +0200 + cloudkitty (8.0.0-4) unstable; urgency=medium * Correct default path to metrics.yml in [collect]/metrics_conf. diff -Nru cloudkitty-8.0.0/debian/patches/Fix_sqlalchemy_grouping_on_v1_storage.patch cloudkitty-8.0.0/debian/patches/Fix_sqlalchemy_grouping_on_v1_storage.patch --- cloudkitty-8.0.0/debian/patches/Fix_sqlalchemy_grouping_on_v1_storage.patch 1970-01-01 01:00:00.000000000 +0100 +++ cloudkitty-8.0.0/debian/patches/Fix_sqlalchemy_grouping_on_v1_storage.patch 2019-06-28 15:01:45.000000000 +0200 @@ -0,0 +1,39 @@ +Description: Fix sqlalchemy grouping on v1 storage (Fixes FTBFS in Buster) + This fixes "CompileError: Can't resolve label reference for + ORDER BY / GROUP BY." error messages raised by sqlalchemy when the groupby + expression includes a comma. +Author: Luka Peschke <luka.peschke@objectif-libre.com> +Date: Tue, 4 Jun 2019 15:21:05 +0200 +Change-Id: Ia253175b45b8222aaee415ea535fa4102312be5a +Bug-Debian: https://bugs.debian.org/930996 +Origin: upstream, https://review.opendev.org/668120 +Last-Update: 2019-06-28 + +diff --git a/cloudkitty/storage/v1/sqlalchemy/__init__.py b/cloudkitty/storage/v1/sqlalchemy/__init__.py +index 77403e3..7b56da6 100644 +--- a/cloudkitty/storage/v1/sqlalchemy/__init__.py ++++ b/cloudkitty/storage/v1/sqlalchemy/__init__.py +@@ -127,7 +127,7 @@ class SQLAlchemyStorage(storage.BaseStorage): + self.frame_model.end <= end, + self.frame_model.res_type != '_NO_DATA_') + if groupby: +- q = q.group_by(groupby) ++ q = q.group_by(sqlalchemy.sql.text(groupby)) + + # Order by sum(rate) + q = q.order_by(sqlalchemy.func.sum(self.frame_model.rate)) +diff --git a/releasenotes/notes/fix-v1-storage-groupby-e865d1315bd390cb.yaml b/releasenotes/notes/fix-v1-storage-groupby-e865d1315bd390cb.yaml +new file mode 100644 +index 0000000..02c1e4d +--- /dev/null ++++ b/releasenotes/notes/fix-v1-storage-groupby-e865d1315bd390cb.yaml +@@ -0,0 +1,6 @@ ++--- ++fixes: ++ - | ++ ``CompileError: Can't resolve label reference for ORDER BY / GROUP BY.`` ++ errors that were sometimes raised by SQLAlchemy when using the v1 storage ++ backend and grouping on ``tenant_id`` and ``res_type`` have been fixed. +-- +2.7.4 + diff -Nru cloudkitty-8.0.0/debian/patches/series cloudkitty-8.0.0/debian/patches/series --- cloudkitty-8.0.0/debian/patches/series 2019-01-24 14:45:39.000000000 +0100 +++ cloudkitty-8.0.0/debian/patches/series 2019-06-28 15:01:45.000000000 +0200 @@ -1,3 +1,4 @@ allow-any-sqla-version.patch missing-files.patch remove-mathjax-extention-from-sphinx-doc.patch +Fix_sqlalchemy_grouping_on_v1_storage.patch
--- End Message ---
--- Begin Message ---
- To: 930795-done@bugs.debian.org, 931126-done@bugs.debian.org, 931198-done@bugs.debian.org, 931199-done@bugs.debian.org, 931358-done@bugs.debian.org, 931596-done@bugs.debian.org, 931608-done@bugs.debian.org, 931615-done@bugs.debian.org, 931616-done@bugs.debian.org, 931724-done@bugs.debian.org, 931817-done@bugs.debian.org, 931967-done@bugs.debian.org, 932009-done@bugs.debian.org, 932030-done@bugs.debian.org, 932069-done@bugs.debian.org, 932111-done@bugs.debian.org, 932193-done@bugs.debian.org, 932318-done@bugs.debian.org, 932335-done@bugs.debian.org, 932441-done@bugs.debian.org, 932448-done@bugs.debian.org, 932518-done@bugs.debian.org, 932522-done@bugs.debian.org, 932588-done@bugs.debian.org, 932606-done@bugs.debian.org, 932684-done@bugs.debian.org, 932790-done@bugs.debian.org, 932945-done@bugs.debian.org, 933036-done@bugs.debian.org, 933125-done@bugs.debian.org, 933147-done@bugs.debian.org, 933175-done@bugs.debian.org, 933369-done@bugs.debian.org, 933379-done@bugs.debian.org, 933392-done@bugs.debian.org, 933535-done@bugs.debian.org, 933754-done@bugs.debian.org, 933764-done@bugs.debian.org, 933769-done@bugs.debian.org, 933787-done@bugs.debian.org, 933899-done@bugs.debian.org, 933911-done@bugs.debian.org, 933976-done@bugs.debian.org, 934094-done@bugs.debian.org, 934163-done@bugs.debian.org, 934183-done@bugs.debian.org, 934308-done@bugs.debian.org, 934311-done@bugs.debian.org, 934329-done@bugs.debian.org, 934343-done@bugs.debian.org, 934345-done@bugs.debian.org, 934507-done@bugs.debian.org, 934537-done@bugs.debian.org, 934650-done@bugs.debian.org, 934689-done@bugs.debian.org, 934704-done@bugs.debian.org, 934826-done@bugs.debian.org, 934827-done@bugs.debian.org, 934928-done@bugs.debian.org, 934934-done@bugs.debian.org, 934956-done@bugs.debian.org, 935137-done@bugs.debian.org, 935165-done@bugs.debian.org, 935200-done@bugs.debian.org, 935253-done@bugs.debian.org, 935261-done@bugs.debian.org, 935265-done@bugs.debian.org, 935308-done@bugs.debian.org, 935370-done@bugs.debian.org, 935386-done@bugs.debian.org, 935411-done@bugs.debian.org, 935465-done@bugs.debian.org, 935474-done@bugs.debian.org, 935479-done@bugs.debian.org, 935480-done@bugs.debian.org, 935576-done@bugs.debian.org, 935583-done@bugs.debian.org, 935704-done@bugs.debian.org, 935707-done@bugs.debian.org, 935719-done@bugs.debian.org, 935746-done@bugs.debian.org, 935770-done@bugs.debian.org, 935776-done@bugs.debian.org, 935809-done@bugs.debian.org, 935815-done@bugs.debian.org, 935827-done@bugs.debian.org, 935888-done@bugs.debian.org, 935957-done@bugs.debian.org, 935988-done@bugs.debian.org, 936022-done@bugs.debian.org, 936056-done@bugs.debian.org, 938954-done@bugs.debian.org, 938975-done@bugs.debian.org, 939019-done@bugs.debian.org
- Cc: 935588@bugs.debian.org
- Subject: Closing bugs for fixes including in 10.1 point release
- From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
- Date: Sat, 07 Sep 2019 14:34:49 +0100
- Message-id: <[🔎] f49e2985d8466065c49c03185c24465a32228fb5.camel@adam-barratt.org.uk>
Version: 10.1 Hi, The fixes referenced by each of these bugs were included in today's buster point release. Regards, Adam
--- End Message ---