Version in base suite: 18.12.1-2

Base version: print-manager_18.12.1-2
Target version: print-manager_18.12.1-2+deb10u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/print-manager/print-manager_18.12.1-2.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/p/print-manager/print-manager_18.12.1-2+deb10u1.dsc

 changelog                                                        |    9 +
 patches/fix_crash_when_cups_returns_jobs_with_duplicate_id.patch |   83 ++++++++++
 patches/series                                                   |    1 
 3 files changed, 93 insertions(+)

diff -Nru print-manager-18.12.1/debian/changelog print-manager-18.12.1/debian/changelog
--- print-manager-18.12.1/debian/changelog	2019-02-01 18:27:55.000000000 +0000
+++ print-manager-18.12.1/debian/changelog	2020-01-25 19:08:59.000000000 +0000
@@ -1,3 +1,12 @@
+print-manager (4:18.12.1-2+deb10u1) buster; urgency=medium
+
+  * Team upload.
+  * Backport fix_crash_when_cups_returns_jobs_with_duplicate_id.patch. This
+    fixes a longstanding bug when multiple print job IDs are given the same
+    ID, and so it was not easy to reproduce (Closes: #910879).
+
+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sat, 25 Jan 2020 16:08:59 -0300
+
 print-manager (4:18.12.1-2) unstable; urgency=medium
 
   * New revision
diff -Nru print-manager-18.12.1/debian/patches/fix_crash_when_cups_returns_jobs_with_duplicate_id.patch print-manager-18.12.1/debian/patches/fix_crash_when_cups_returns_jobs_with_duplicate_id.patch
--- print-manager-18.12.1/debian/patches/fix_crash_when_cups_returns_jobs_with_duplicate_id.patch	1970-01-01 00:00:00.000000000 +0000
+++ print-manager-18.12.1/debian/patches/fix_crash_when_cups_returns_jobs_with_duplicate_id.patch	2020-01-25 18:49:03.000000000 +0000
@@ -0,0 +1,83 @@
+From c93f2f16c30d10fbd0f4bfb4c0bf0cec07a4c93b Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Mon, 2 Dec 2019 23:04:42 +0100
+Subject: Fix crash when cups returns jobs with duplicate id
+
+Summary:
+For some reason my cups was giving me two withheld jobs with id 33 and two with id 40
+
+That made the JobModel code crash, because it went like this
+
+ * First job with id 33 found
+ * insertRow with 0 called
+ * Row 0 inserted
+ * Job at row 0 updated (from inside insertRow)
+ * Second job with id 33 found
+ * The "oh i already have this job code triggers", updates the job, then takesRow 0 and inserts at row 1. QStandardItemModel doesn't like getting a row add at 1 inserted when empty
+ * First job with id 40 found
+ * insertRow with 2 called
+ * Row 2 inserted, it fails, QStandardItemModel doesn't like getting a row add at 2 when empty
+ * Job at row 2 updated (from iniside insertRow)
+ * Crash because there's no row 2 in the model
+
+BUGS: 326289
+
+Test Plan: Doesn't crash anymore with my weird cups list of pending jobs
+
+Reviewers: dantti
+
+Reviewed By: dantti
+
+Subscribers: ngraham, marcelm, fvogt, broulik, nicolasfella, kmaterka, kde-utils-devel
+
+Differential Revision: https://phabricator.kde.org/D25623
+---
+ libkcups/JobModel.cpp |   23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+--- a/libkcups/JobModel.cpp
++++ b/libkcups/JobModel.cpp
+@@ -172,6 +172,25 @@ void JobModel::getJobs()
+     m_processingJob.clear();
+ }
+ 
++static KCupsJobs sanitizeJobs(KCupsJobs jobs)
++{
++    // For some reason sometimes cups has broken job queues with jobs with duplicated id
++    // our model doesn't like that at all so sanitize the job list before processing it
++    QVector<int> seenIds;
++    int i = 0;
++    while (i < jobs.count()) {
++        const int jobId = jobs.at(i).id();
++        if (seenIds.contains(jobId)) {
++            qCWarning(LIBKCUPS) << "Found job with duplicated id" << jobId;
++            jobs.removeAt(i);
++        } else {
++            seenIds << jobId;
++            ++i;
++        }
++    }
++    return jobs;
++}
++
+ void JobModel::getJobFinished(KCupsRequest *request)
+ {
+     if (request) {
+@@ -179,7 +198,7 @@ void JobModel::getJobFinished(KCupsReque
+             // clear the model after so that the proper widget can be shown
+             clear();
+         } else {
+-            const KCupsJobs jobs = request->jobs();
++            const KCupsJobs jobs = sanitizeJobs(request->jobs());
+             qCDebug(LIBKCUPS) << jobs.size();
+             for (int i = 0; i < jobs.size(); ++i) {
+                 const KCupsJob job = jobs.at(i);
+@@ -205,7 +224,7 @@ void JobModel::getJobFinished(KCupsReque
+                 }
+             }
+ 
+-            // remove old printers
++            // remove old jobs
+             // The above code starts from 0 and make sure
+             // dest == modelIndex(x) and if it's not the
+             // case it either inserts or moves it.
diff -Nru print-manager-18.12.1/debian/patches/series print-manager-18.12.1/debian/patches/series
--- print-manager-18.12.1/debian/patches/series	2019-02-01 18:27:55.000000000 +0000
+++ print-manager-18.12.1/debian/patches/series	2020-01-25 18:48:52.000000000 +0000
@@ -1,3 +1,4 @@
+fix_crash_when_cups_returns_jobs_with_duplicate_id.patch
 kubuntu_ignore_scp_dbus_failures.diff
 activate_password_dialog
 Show-more-information-on-CUPS-auth-dialog.patch